From 097a2d70083c7b41fe1dcaabb570aaabf1c6bfb7 Mon Sep 17 00:00:00 2001 From: Penelope Haze Date: Sun, 26 Jan 2025 15:43:34 -0500 Subject: [PATCH 1/8] Improve descriptions for atmos machinery --- code/game/machinery/atmoalter/meter.dm | 2 +- code/game/machinery/igniter.dm | 2 +- .../atmospherics/components/binary_devices/pump.dm | 2 +- .../components/binary_devices/volume_pump.dm | 2 +- .../atmospherics/components/omni_devices/filter.dm | 1 + .../atmospherics/components/omni_devices/mixer.dm | 1 + .../atmospherics/components/portables_connector.dm | 4 ++-- code/modules/atmospherics/components/tvalve.dm | 4 ++-- .../atmospherics/components/unary/thermal_plate.dm | 6 ++++-- .../atmospherics/components/unary/vent_pump.dm | 5 +++-- code/modules/atmospherics/components/valve.dm | 4 ++-- code/modules/atmospherics/pipes.dm | 14 +++++++------- 12 files changed, 26 insertions(+), 21 deletions(-) diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index 4dd3caeb6fd..3b0ef569f60 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -1,6 +1,6 @@ /obj/machinery/meter name = "meter" - desc = "A gas flow meter." + desc = "A meter that monitors gas composition, pressure, and temperature in the attached pipe." icon = 'icons/obj/meter.dmi' icon_state = "meterX" var/atom/target = null //A pipe for the base type diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 47f7eab5211..26a071ea6ae 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -1,6 +1,6 @@ /obj/machinery/igniter name = "igniter" - desc = "It's useful for igniting flammable items." + desc = "A device that ignites flammable items and gases nearby when activated." icon = 'icons/obj/machines/igniter.dmi' icon_state = "igniter1" var/on = 0 diff --git a/code/modules/atmospherics/components/binary_devices/pump.dm b/code/modules/atmospherics/components/binary_devices/pump.dm index 156e19f2f39..858f44da07a 100644 --- a/code/modules/atmospherics/components/binary_devices/pump.dm +++ b/code/modules/atmospherics/components/binary_devices/pump.dm @@ -18,7 +18,7 @@ Thus, the two variables affect pump operation are set in New(): level = LEVEL_BELOW_PLATING name = "gas pump" - desc = "A pump." + desc = "A pump that can pressurize gas and restrict flow to one direction." var/target_pressure = ONE_ATMOSPHERE diff --git a/code/modules/atmospherics/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/components/binary_devices/volume_pump.dm index 88dfdd3675e..f3946500490 100644 --- a/code/modules/atmospherics/components/binary_devices/volume_pump.dm +++ b/code/modules/atmospherics/components/binary_devices/volume_pump.dm @@ -4,7 +4,7 @@ level = LEVEL_BELOW_PLATING name = "high power gas pump" - desc = "A pump. Has double the power rating of the standard gas pump." + desc = "A pump that can pressurize gas and restrict flow to one direction. Has double the power rating of the standard gas pump." idle_power_usage = 450 // oversized pumps means oversized idle use power_rating = 45000 // 45000 W ~ 60 HP diff --git a/code/modules/atmospherics/components/omni_devices/filter.dm b/code/modules/atmospherics/components/omni_devices/filter.dm index 434e0f8f5bd..ae66c0bddcf 100644 --- a/code/modules/atmospherics/components/omni_devices/filter.dm +++ b/code/modules/atmospherics/components/omni_devices/filter.dm @@ -3,6 +3,7 @@ //-------------------------------------------- /obj/machinery/atmospherics/omni/filter name = "omni gas filter" + desc = "A device that can separate components of a gas mixture and redirect them to different pipes." icon_state = "map_filter" core_icon = "filter" diff --git a/code/modules/atmospherics/components/omni_devices/mixer.dm b/code/modules/atmospherics/components/omni_devices/mixer.dm index 51cc1b4be45..a7bca1ad61d 100644 --- a/code/modules/atmospherics/components/omni_devices/mixer.dm +++ b/code/modules/atmospherics/components/omni_devices/mixer.dm @@ -3,6 +3,7 @@ //-------------------------------------------- /obj/machinery/atmospherics/omni/mixer name = "omni gas mixer" + desc = "A device that combines two or more gases to produce a mix with a specific ratio." icon_state = "map_mixer" core_icon = "mixer" diff --git a/code/modules/atmospherics/components/portables_connector.dm b/code/modules/atmospherics/components/portables_connector.dm index d0260640403..d6898b12987 100644 --- a/code/modules/atmospherics/components/portables_connector.dm +++ b/code/modules/atmospherics/components/portables_connector.dm @@ -3,7 +3,7 @@ icon_state = "map_connector" name = "connector port" - desc = "For connecting portable devices related to atmospherics control." + desc = "A connector port with a flexible tube that can be attached to portable atmospherics devices using a wrench." dir = SOUTH initialize_directions = SOUTH @@ -69,7 +69,7 @@ /obj/machinery/atmospherics/portables_connector/cannot_transition_to(state_path, mob/user) if(state_path == /decl/machine_construction/default/deconstructed) if (connected_device) - return SPAN_WARNING("You cannot unwrench \the [src], dettach \the [connected_device] first.") + return SPAN_WARNING("You cannot unwrench \the [src], detach \the [connected_device] first.") if (locate(/obj/machinery/portable_atmospherics, src.loc)) return MCS_BLOCK return ..() \ No newline at end of file diff --git a/code/modules/atmospherics/components/tvalve.dm b/code/modules/atmospherics/components/tvalve.dm index 326dfddbe77..cb27953dca6 100644 --- a/code/modules/atmospherics/components/tvalve.dm +++ b/code/modules/atmospherics/components/tvalve.dm @@ -4,7 +4,7 @@ var/base_icon_state = "tvalve" name = "manual switching valve" - desc = "A pipe valve." + desc = "A pipe valve that switches gas flow between two branches, and must be operated by hand." level = LEVEL_BELOW_PLATING dir = SOUTH @@ -176,7 +176,7 @@ /obj/machinery/atmospherics/tvalve/digital // can be controlled by AI name = "digital switching valve" - desc = "A digitally controlled valve." + desc = "A digitally-controlled pipe valve that switches gas flow between two branches." icon = 'icons/atmos/digital_tvalve.dmi' icon_state = "map_tvalve0" diff --git a/code/modules/atmospherics/components/unary/thermal_plate.dm b/code/modules/atmospherics/components/unary/thermal_plate.dm index 9f07a26b3b4..6619e07e85d 100644 --- a/code/modules/atmospherics/components/unary/thermal_plate.dm +++ b/code/modules/atmospherics/components/unary/thermal_plate.dm @@ -1,6 +1,8 @@ #define RADIATION_CAPACITY 30000 //Radiation isn't particularly effective (TODO BALANCE) +// LMAO? This should probably be removed. +// Check Q2 2025 if this is gone yet or not. /obj/machinery/atmospherics/unary/thermal_plate //Based off Heat Reservoir and Space Heater //Transfers heat between a pipe system and environment, based on which has a greater thermal energy concentration @@ -8,8 +10,8 @@ icon = 'icons/obj/atmospherics/cold_sink.dmi' icon_state = "intact_off" - name = "Thermal Transfer Plate" - desc = "Transfers heat to and from an area" + name = "thermal transfer plate" + desc = "A device that transfers heat to and from an area." uncreated_component_parts = null frame_type = /obj/item/pipe construct_state = /decl/machine_construction/pipe diff --git a/code/modules/atmospherics/components/unary/vent_pump.dm b/code/modules/atmospherics/components/unary/vent_pump.dm index 1ddb358e0ec..ab70259be36 100644 --- a/code/modules/atmospherics/components/unary/vent_pump.dm +++ b/code/modules/atmospherics/components/unary/vent_pump.dm @@ -11,8 +11,8 @@ icon = 'icons/atmos/vent_pump.dmi' icon_state = "map_vent" - name = "Air Vent" - desc = "Has a valve and pump attached to it." + name = "air vent" + desc = "A vent that moves air into or out of the attached pipe system, and uses a valve and pump to prevent backflow." use_power = POWER_USE_OFF idle_power_usage = 150 //internal circuitry, friction losses and stuff power_rating = 30000 // 30000 W ~ 40 HP @@ -160,6 +160,7 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume name = "large air vent" + desc = "A high-volume vent that moves lots of air into or out of the attached pipe system, and uses a valve and pump to prevent backflow." power_channel = EQUIP power_rating = 45000 base_type = /obj/machinery/atmospherics/unary/vent_pump/high_volume/buildable diff --git a/code/modules/atmospherics/components/valve.dm b/code/modules/atmospherics/components/valve.dm index ccf203513a2..a34f64ae001 100644 --- a/code/modules/atmospherics/components/valve.dm +++ b/code/modules/atmospherics/components/valve.dm @@ -3,7 +3,7 @@ icon_state = "map_valve0" name = "manual valve" - desc = "A pipe valve." + desc = "A valve that controls flow through a pipe network, and must be operated by hand." level = LEVEL_BELOW_PLATING dir = SOUTH @@ -150,7 +150,7 @@ /obj/machinery/atmospherics/valve/digital // can be controlled by AI name = "digital valve" - desc = "A digitally controlled valve." + desc = "A digitally-controlled valve that controls flow through a pipe network." icon = 'icons/atmos/digital_valve.dmi' uncreated_component_parts = list( /obj/item/stock_parts/radio/receiver/buildable, diff --git a/code/modules/atmospherics/pipes.dm b/code/modules/atmospherics/pipes.dm index 832e0186318..2840d64ba68 100644 --- a/code/modules/atmospherics/pipes.dm +++ b/code/modules/atmospherics/pipes.dm @@ -416,7 +416,7 @@ level = LEVEL_ABOVE_PLATING /obj/machinery/atmospherics/pipe/manifold/visible/scrubbers - name="Scrubbers pipe manifold" + name = "scrubbers pipe manifold" desc = "A manifold composed of scrubbers pipes." icon_state = "map-scrubbers" connect_types = CONNECT_TYPE_SCRUBBER @@ -424,7 +424,7 @@ color = PIPE_COLOR_RED /obj/machinery/atmospherics/pipe/manifold/visible/supply - name="Air supply pipe manifold" + name = "air supply pipe manifold" desc = "A manifold composed of supply pipes." icon_state = "map-supply" connect_types = CONNECT_TYPE_SUPPLY @@ -463,7 +463,7 @@ alpha = 128 //set for the benefit of mapping - this is reset to opaque when the pipe is spawned in game /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers - name="Scrubbers pipe manifold" + name = "scrubbers pipe manifold" desc = "A manifold composed of scrubbers pipes." icon_state = "map-scrubbers" connect_types = CONNECT_TYPE_SCRUBBER @@ -471,7 +471,7 @@ color = PIPE_COLOR_RED /obj/machinery/atmospherics/pipe/manifold/hidden/supply - name="Air supply pipe manifold" + name = "air supply pipe manifold" desc = "A manifold composed of supply pipes." icon_state = "map-supply" connect_types = CONNECT_TYPE_SUPPLY @@ -699,7 +699,7 @@ connect_types = CONNECT_TYPE_FUEL /obj/machinery/atmospherics/pipe/simple/visible/universal - name="Universal pipe adapter" + name = "universal pipe adapter" desc = "An adapter for regular, supply, scrubbers, and fuel pipes." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_SUPPLY|CONNECT_TYPE_SCRUBBER|CONNECT_TYPE_FUEL|CONNECT_TYPE_HE icon_state = "map_universal" @@ -717,8 +717,8 @@ universal_underlays(direction) /obj/machinery/atmospherics/pipe/simple/hidden/universal - name="Universal pipe adapter" - desc = "An adapter for regular, supply and scrubbers pipes." + name = "universal pipe adapter" + desc = "An adapter for regular, supply, scrubbers, and fuel pipes." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_SUPPLY|CONNECT_TYPE_SCRUBBER|CONNECT_TYPE_FUEL|CONNECT_TYPE_HE icon_state = "map_universal" build_icon_state = "universal" From db803fb11902bdcd900ac67d74631255c3d46b3a Mon Sep 17 00:00:00 2001 From: Penelope Haze Date: Sun, 26 Jan 2025 15:43:40 -0500 Subject: [PATCH 2/8] Improve descriptions for disposals machinery --- code/modules/recycling/disposalpipe.dm | 7 ++++++- code/modules/recycling/sortingmachinery.dm | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/recycling/disposalpipe.dm b/code/modules/recycling/disposalpipe.dm index 88e11fbbdc6..6727ee5fbfa 100644 --- a/code/modules/recycling/disposalpipe.dm +++ b/code/modules/recycling/disposalpipe.dm @@ -236,6 +236,7 @@ // a straight or bent segment /obj/structure/disposalpipe/segment + desc = "A linear segment of disposal piping that simply moves things from one end to the other." icon_state = "pipe-s" // Sadly this var stores state. "pipe-c" is corner. Should be changed, but requires huge map diff. turn = DISPOSAL_FLIP_FLIP @@ -364,6 +365,7 @@ //a three-way junction with dir being the dominant direction /obj/structure/disposalpipe/junction + desc = "A three-way segment of disposal piping that merges two incoming directions into a third outgoing one." icon_state = "pipe-j1" turn = DISPOSAL_FLIP_RIGHT|DISPOSAL_FLIP_FLIP flipped_state = /obj/structure/disposalpipe/junction/mirrored @@ -413,6 +415,7 @@ /obj/structure/disposalpipe/tagger name = "package tagger" + desc = "A pipe that tags things passing through it with a sorting tag." icon_state = "pipe-tagger" var/sort_tag = "" var/partial = 0 @@ -459,6 +462,7 @@ /obj/structure/disposalpipe/tagger/partial //needs two passes to tag name = "partial package tagger" + desc = "A pipe that tags things passing through it with a sorting tag... but only the second time around." icon_state = "pipe-tagger-partial" partial = 1 turn = DISPOSAL_FLIP_FLIP @@ -480,7 +484,7 @@ /obj/structure/disposalpipe/diversion_junction/proc/updatedesc() desc = initial(desc) if(sort_type) - desc += "\nIt's currently [active ? "" : "un"]active!" + desc += "\nIt's currently [active ? "" : "in"]active!" /obj/structure/disposalpipe/diversion_junction/proc/updatedir() inactive_dir = dir @@ -687,6 +691,7 @@ //a trunk joining to a disposal bin or outlet on the same turf /obj/structure/disposalpipe/trunk + desc = "A section of pneumatic piping made to connect to a bin or outlet." icon_state = "pipe-t" var/obj/linked // the linked obj/machinery/disposal or obj/disposaloutlet diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 76e6c440ec3..274c5aec259 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -1,6 +1,6 @@ /obj/machinery/disposal/deliveryChute name = "delivery chute" - desc = "A chute for big and small packages alike!" + desc = "A chute to put things into a disposal network. Takes big and small packages alike!" density = TRUE icon = 'icons/obj/pipes/disposal_chute.dmi' icon_state = "chute" From 76e40ebca0855ffed5e59ccdc9ebd772a2bcd5f7 Mon Sep 17 00:00:00 2001 From: Penelope Haze Date: Sun, 26 Jan 2025 15:45:15 -0500 Subject: [PATCH 3/8] Improve descriptions for pipe/atmospherics fabricator recipes --- .../designs/pipe/device_pipe_datums.dm | 25 -------- .../designs/pipe/disposal_pipe_datums.dm | 20 ------- .../designs/pipe/pipe_datum_base.dm | 6 ++ .../fabrication/designs/pipe/pipe_datums.dm | 58 +++++++++---------- 4 files changed, 35 insertions(+), 74 deletions(-) diff --git a/code/modules/fabrication/designs/pipe/device_pipe_datums.dm b/code/modules/fabrication/designs/pipe/device_pipe_datums.dm index 82969909689..87d1753cbe2 100644 --- a/code/modules/fabrication/designs/pipe/device_pipe_datums.dm +++ b/code/modules/fabrication/designs/pipe/device_pipe_datums.dm @@ -4,7 +4,6 @@ pipe_color = PIPE_COLOR_WHITE name = "connector" - desc = "a connector for canisters." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL build_icon_state = "connector" constructed_path = /obj/machinery/atmospherics/portables_connector @@ -13,7 +12,6 @@ /datum/fabricator_recipe/pipe/device/adapter name = "universal pipe adapter" - desc = "an adapter designed to fit any type of pipe." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_SUPPLY|CONNECT_TYPE_SCRUBBER|CONNECT_TYPE_FUEL|CONNECT_TYPE_HE build_icon_state = "universal" constructed_path = /obj/machinery/atmospherics/pipe/simple/hidden/universal @@ -22,7 +20,6 @@ /datum/fabricator_recipe/pipe/device/unaryvent name = "unary vent" - desc = "a unary vent" connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_SUPPLY|CONNECT_TYPE_FUEL build_icon_state = "uvent" constructed_path = /obj/machinery/atmospherics/unary/vent_pump @@ -30,12 +27,10 @@ /datum/fabricator_recipe/pipe/device/unaryvent/large name = "high volume unary vent" - desc = "a high volume unary vent" constructed_path = /obj/machinery/atmospherics/unary/vent_pump/high_volume /datum/fabricator_recipe/pipe/device/gaspump name = "gas pump" - desc = "a pump. For gasses." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL build_icon_state = "pump" constructed_path = /obj/machinery/atmospherics/binary/pump @@ -43,7 +38,6 @@ /datum/fabricator_recipe/pipe/device/pressureregulator name = "pressure regulator" - desc = "a device that regulates pressure." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL build_icon_state = "passivegate" constructed_path = /obj/machinery/atmospherics/binary/passive_gate @@ -51,7 +45,6 @@ /datum/fabricator_recipe/pipe/device/hpgaspump name = "high powered gas pump" - desc = "a high powered pump. For gasses." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL build_icon_state = "volumepump" constructed_path = /obj/machinery/atmospherics/binary/pump/high_power @@ -59,7 +52,6 @@ /datum/fabricator_recipe/pipe/device/scrubber name = "scrubber" - desc = "scrubs out undesirable gasses" connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_SCRUBBER build_icon_state = "scrubber" constructed_path = /obj/machinery/atmospherics/unary/vent_scrubber @@ -67,7 +59,6 @@ /datum/fabricator_recipe/pipe/device/meter name = "meter" - desc = "a meter that monitors pressure and temperature on the attached pipe." path = /obj/item/machine_chassis/pipe_meter pipe_color = null connect_types = null @@ -78,7 +69,6 @@ /datum/fabricator_recipe/pipe/device/omnimixer name = "omni gas mixer" - desc = "a device that takes in two or three gasses and mixes them into a precise output." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL build_icon_state = "omni_mixer" constructed_path = /obj/machinery/atmospherics/omni/mixer @@ -86,7 +76,6 @@ /datum/fabricator_recipe/pipe/device/omnifilter name = "omni gas filter" - desc = "a device that filters out undesireable elements" connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL build_icon_state = "omni_filter" constructed_path = /obj/machinery/atmospherics/omni/filter @@ -94,7 +83,6 @@ /datum/fabricator_recipe/pipe/device/manualvalve name = "manual valve" - desc = "a valve that has to be manipulated by hand" build_icon_state = "mvalve" constructed_path = /obj/machinery/atmospherics/valve pipe_class = PIPE_CLASS_BINARY @@ -103,7 +91,6 @@ /datum/fabricator_recipe/pipe/device/digitalvalve name = "digital valve" - desc = "a valve controlled electronically" build_icon_state = "dvalve" constructed_path = /obj/machinery/atmospherics/valve/digital pipe_class = PIPE_CLASS_BINARY @@ -112,7 +99,6 @@ /datum/fabricator_recipe/pipe/device/autoshutoff name = "automatic shutoff valve" - desc = "a valve that can automatically shut itself off" build_icon_state = "svalve" constructed_path = /obj/machinery/atmospherics/valve/shutoff pipe_class = PIPE_CLASS_BINARY @@ -121,7 +107,6 @@ /datum/fabricator_recipe/pipe/device/mtvalve name = "manual t-valve" - desc = "a three-way valve. T-shaped." build_icon_state = "mtvalve" constructed_path = /obj/machinery/atmospherics/tvalve pipe_class = PIPE_CLASS_TRINARY @@ -129,7 +114,6 @@ /datum/fabricator_recipe/pipe/device/mtvalvem name = "manual t-valve (mirrored)" - desc = "a three-way valve. T-shaped." build_icon_state = "mtvalvem" constructed_path = /obj/machinery/atmospherics/tvalve/mirrored pipe_class = PIPE_CLASS_TRINARY @@ -137,7 +121,6 @@ /datum/fabricator_recipe/pipe/device/dtvalve name = "digital t-valve" - desc = "a three-way valve. T-shaped. This one can be controlled electronically." build_icon = 'icons/atmos/digital_tvalve.dmi' build_icon_state = "map_tvalve0" constructed_path = /obj/machinery/atmospherics/tvalve/digital @@ -146,7 +129,6 @@ /datum/fabricator_recipe/pipe/device/dtvalvem name = "digital t-valve (mirrored)" - desc = "a three-way valve. T-shaped. This one can be controlled electronically." build_icon = 'icons/atmos/digital_tvalve.dmi' build_icon_state = "map_tvalvem0" constructed_path = /obj/machinery/atmospherics/tvalve/mirrored/digital @@ -155,7 +137,6 @@ /datum/fabricator_recipe/pipe/device/air_sensor name = "gas sensor" - desc = "a sensor. It detects gasses." path = /obj/item/machine_chassis/air_sensor build_icon_state = "gsensor1" build_icon = 'icons/obj/machines/gas_sensor.dmi' @@ -167,7 +148,6 @@ /datum/fabricator_recipe/pipe/device/outlet_injector name = "injector outlet" - desc = "Passively injects gas into its surroundings. Has a valve attached to it that can control flow rate." build_icon = 'icons/atmos/injector.dmi' build_icon_state = "map_injector" connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL @@ -178,7 +158,6 @@ /datum/fabricator_recipe/pipe/device/drain name = "gutter" - desc = "You probably can't get sucked down the plughole." build_icon = 'icons/obj/drain.dmi' build_icon_state = "drain" path = /obj/item/drain @@ -190,7 +169,6 @@ /datum/fabricator_recipe/pipe/device/drain/bath name = "sealable gutter" - desc = "You probably can't get sucked down the plughole. Specially not when it's closed!" build_icon = 'icons/obj/drain.dmi' build_icon_state = "drain_bath" path = /obj/item/drain/bath @@ -202,7 +180,6 @@ /datum/fabricator_recipe/pipe/device/tank name = "pressure tank" - desc = "A large vessel containing pressurized gas." build_icon = 'icons/atmos/tank.dmi' build_icon_state = "air" path = /obj/item/pipe/tank @@ -213,7 +190,6 @@ /datum/fabricator_recipe/pipe/device/plate name = "thermal plate" - desc = "A device which transfers heat to and from an area." build_icon = 'icons/obj/atmospherics/cold_sink.dmi' build_icon_state = "exposed" path = /obj/item/pipe @@ -223,7 +199,6 @@ /datum/fabricator_recipe/pipe/device/igniter name = "igniter" - desc = "A device which will ignite surrounding gasses." build_icon = 'icons/obj/machines/igniter.dmi' build_icon_state = "igniter1" path = /obj/item/machine_chassis/igniter diff --git a/code/modules/fabrication/designs/pipe/disposal_pipe_datums.dm b/code/modules/fabrication/designs/pipe/disposal_pipe_datums.dm index 0340a6c60f4..57c4aa6220f 100644 --- a/code/modules/fabrication/designs/pipe/disposal_pipe_datums.dm +++ b/code/modules/fabrication/designs/pipe/disposal_pipe_datums.dm @@ -7,7 +7,6 @@ var/turn = DISPOSAL_FLIP_FLIP name = "disposal pipe segment" - desc = "A huge pipe segment used for constructing disposal systems." build_icon = 'icons/obj/pipes/disposal_pipe.dmi' build_icon_state = "pipe-s" path = /obj/structure/disposalconstruct @@ -17,56 +16,48 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/bent name = "bent disposal pipe segment" - desc = "A huge pipe segment used for constructing disposal systems." build_icon_state = "pipe-c" turn = DISPOSAL_FLIP_RIGHT constructed_path = /obj/structure/disposalpipe/segment/bent /datum/fabricator_recipe/pipe/disposal_dispenser/junction name = "disposal pipe junction" - desc = "A huge pipe segment used for constructing disposal systems." build_icon_state = "pipe-j1" turn = DISPOSAL_FLIP_RIGHT|DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/junction /datum/fabricator_recipe/pipe/disposal_dispenser/junctionm name = "disposal pipe junction (mirrored)" - desc = "A huge pipe segment used for constructing disposal systems." build_icon_state = "pipe-j2" turn = DISPOSAL_FLIP_LEFT|DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/junction/mirrored /datum/fabricator_recipe/pipe/disposal_dispenser/yjunction name = "disposal pipe y-junction" - desc = "A huge pipe segment used for constructing disposal systems." build_icon_state = "pipe-y" turn = DISPOSAL_FLIP_LEFT|DISPOSAL_FLIP_RIGHT constructed_path = /obj/structure/disposalpipe/junction /datum/fabricator_recipe/pipe/disposal_dispenser/trunk name = "disposal pipe trunk" - desc = "A huge pipe segment used for constructing disposal systems." build_icon_state = "pipe-t" constructed_path = /obj/structure/disposalpipe/trunk turn = DISPOSAL_FLIP_NONE /datum/fabricator_recipe/pipe/disposal_dispenser/up name = "disposal pipe upwards segment" - desc = "A huge pipe segment used for constructing disposal systems." build_icon_state = "pipe-u" constructed_path = /obj/structure/disposalpipe/up turn = DISPOSAL_FLIP_NONE /datum/fabricator_recipe/pipe/disposal_dispenser/down name = "disposal pipe downwards segment" - desc = "A huge pipe segment used for constructing disposal systems." build_icon_state = "pipe-d" constructed_path = /obj/structure/disposalpipe/down turn = DISPOSAL_FLIP_NONE /datum/fabricator_recipe/pipe/disposal_dispenser/device name = "disposal bin" - desc = "A bin used to dispose of trash." build_icon = 'icons/obj/pipes/disposal_bin.dmi' build_icon_state = "disposal" path = /obj/structure/disposalconstruct/machine @@ -75,7 +66,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/outlet name = "disposal outlet" - desc = "an outlet that ejects things from a disposal network." build_icon = 'icons/obj/pipes/disposal_outlet.dmi' build_icon_state = "outlet" path = /obj/structure/disposalconstruct/machine/outlet @@ -83,7 +73,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/chute name = "disposal chute" - desc = "A chute to put things into a disposal network." build_icon = 'icons/obj/pipes/disposal_chute.dmi' build_icon_state = "chute" constructed_path = /obj/machinery/disposal/deliveryChute @@ -91,7 +80,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/sorting name = "disposal sorter" - desc = "Sorts things in a disposal system" build_icon_state = "pipe-j1s" turn = DISPOSAL_FLIP_RIGHT|DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/sortjunction @@ -99,7 +87,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/sorting/wildcard name = "wildcard disposal sorter" - desc = "Sorts things in a disposal system" build_icon_state = "pipe-j1s" turn = DISPOSAL_FLIP_RIGHT|DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/sortjunction/wildcard @@ -107,7 +94,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/sorting/untagged name = "untagged disposal sorter" - desc = "Sorts things in a disposal system" build_icon_state = "pipe-j1s" turn = DISPOSAL_FLIP_RIGHT|DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/sortjunction/untagged @@ -115,7 +101,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/sortingm name = "disposal sorter (mirrored)" - desc = "Sorts things in a disposal system" build_icon_state = "pipe-j2s" turn = DISPOSAL_FLIP_LEFT|DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/sortjunction/flipped @@ -123,7 +108,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/sorting/wildcardm name = "wildcard disposal sorter (mirrored)" - desc = "Sorts things in a disposal system" build_icon_state = "pipe-j2s" turn = DISPOSAL_FLIP_LEFT|DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/sortjunction/wildcard/flipped @@ -131,7 +115,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/sorting/untaggedm name = "untagged disposal sorter (mirrored)" - desc = "Sorts things in a disposal system" build_icon_state = "pipe-j2s" turn = DISPOSAL_FLIP_LEFT|DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/sortjunction/untagged/flipped @@ -139,7 +122,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/tagger name = "disposal tagger" - desc = "It tags things." build_icon_state = "pipe-tagger" turn = DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/tagger @@ -147,7 +129,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/tagger/partial name = "disposal partial tagger" - desc = "It tags things." build_icon_state = "pipe-tagger-partial" turn = DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/tagger/partial @@ -155,7 +136,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/diversion name = "disposal diverter" - desc = "A huge pipe segment used for constructing disposal systems." build_icon_state = "pipe-j1s" turn = DISPOSAL_FLIP_FLIP | DISPOSAL_FLIP_RIGHT constructed_path = /obj/structure/disposalpipe/diversion_junction diff --git a/code/modules/fabrication/designs/pipe/pipe_datum_base.dm b/code/modules/fabrication/designs/pipe/pipe_datum_base.dm index 8d3c48485e8..75c5b9e1773 100644 --- a/code/modules/fabrication/designs/pipe/pipe_datum_base.dm +++ b/code/modules/fabrication/designs/pipe/pipe_datum_base.dm @@ -18,6 +18,12 @@ ) max_amount = 10 +/datum/fabricator_recipe/pipe/New() + . = ..() + if(isnull(desc) && ispath(constructed_path)) + var/obj/constructed_obj = constructed_path + desc = initial(constructed_obj.desc) + /datum/fabricator_recipe/pipe/get_resources() resources = list() var/list/building_cost = atom_info_repository.get_matter_for(constructed_path) diff --git a/code/modules/fabrication/designs/pipe/pipe_datums.dm b/code/modules/fabrication/designs/pipe/pipe_datums.dm index 58ca5c3bde8..b9aea3517c4 100644 --- a/code/modules/fabrication/designs/pipe/pipe_datums.dm +++ b/code/modules/fabrication/designs/pipe/pipe_datums.dm @@ -2,19 +2,19 @@ #define PIPE_BENT 5 /datum/fabricator_recipe/pipe - name = "a pipe fitting" - desc = "a straight pipe segment." + name = "pipe fitting" + desc = "A straight pipe segment." rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/bent name = "bent pipe fitting" - desc = "a bent pipe segment" + desc = "A bent pipe segment." dir = PIPE_BENT rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/manifold name = "pipe manifold fitting" - desc = "a pipe manifold segment" + desc = "A pipe manifold segment." build_icon_state = "manifold" constructed_path = /obj/machinery/atmospherics/pipe/manifold/hidden pipe_class = PIPE_CLASS_TRINARY @@ -22,7 +22,7 @@ /datum/fabricator_recipe/pipe/manifold4w name = "four-way pipe manifold fitting" - desc = "a four-way pipe manifold segment" + desc = "A four-way pipe manifold segment." build_icon_state = "manifold4w" constructed_path = /obj/machinery/atmospherics/pipe/manifold4w/hidden pipe_class = PIPE_CLASS_QUATERNARY @@ -30,7 +30,7 @@ /datum/fabricator_recipe/pipe/cap name = "pipe cap fitting" - desc = "a pipe cap for a regular pipe." + desc = "A pipe cap for a regular pipe." build_icon_state = "cap" constructed_path = /obj/machinery/atmospherics/pipe/cap/hidden pipe_class = PIPE_CLASS_UNARY @@ -46,7 +46,7 @@ /datum/fabricator_recipe/pipe/down name = "downward pipe fitting" - desc = "a downward pipe." + desc = "A downward pipe." build_icon_state = "down" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/down rotate_class = PIPE_ROTATE_STANDARD @@ -61,18 +61,18 @@ pipe_class = PIPE_CLASS_BINARY name = "supply pipe fitting" - desc = "a straight supply pipe segment." + desc = "A straight supply pipe segment." rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/supply/bent name = "bent supply pipe fitting" - desc = "a bent supply pipe segment" + desc = "A bent supply pipe segment." dir = PIPE_BENT rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/supply/manifold name = "supply pipe manifold fitting" - desc = "a supply pipe manifold segment" + desc = "A supply pipe manifold segment." build_icon_state = "manifold" constructed_path = /obj/machinery/atmospherics/pipe/manifold/hidden/supply pipe_class = PIPE_CLASS_TRINARY @@ -80,7 +80,7 @@ /datum/fabricator_recipe/pipe/supply/manifold4w name = "four-way supply pipe manifold fitting" - desc = "a four-way supply pipe manifold segment" + desc = "A four-way supply pipe manifold segment." build_icon_state = "manifold4w" constructed_path = /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply pipe_class = PIPE_CLASS_QUATERNARY @@ -88,7 +88,7 @@ /datum/fabricator_recipe/pipe/supply/cap name = "supply pipe cap fitting" - desc = "a pipe cap for a regular pipe." + desc = "A pipe cap for a regular pipe." build_icon_state = "cap" constructed_path = /obj/machinery/atmospherics/pipe/cap/hidden/supply pipe_class = PIPE_CLASS_UNARY @@ -103,7 +103,7 @@ /datum/fabricator_recipe/pipe/supply/down name = "downward supply pipe fitting" - desc = "a downward supply pipe segment." + desc = "A downward supply pipe segment." build_icon_state = "down" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/down/supply rotate_class = PIPE_ROTATE_STANDARD @@ -117,18 +117,18 @@ pipe_class = PIPE_CLASS_BINARY name = "scrubber pipe fitting" - desc = "a straight scrubber pipe segment" + desc = "A straight scrubber pipe segment." rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/scrubber/bent name = "bent scrubber pipe fitting" - desc = "a bent scrubber pipe segment" + desc = "A bent scrubber pipe segment." rotate_class = PIPE_ROTATE_TWODIR dir = PIPE_BENT /datum/fabricator_recipe/pipe/scrubber/manifold name = "scrubber pipe manifold fitting" - desc = "a scrubber pipe manifold segment" + desc = "A scrubber pipe manifold segment." build_icon_state = "manifold" constructed_path = /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers pipe_class = PIPE_CLASS_TRINARY @@ -136,7 +136,7 @@ /datum/fabricator_recipe/pipe/scrubber/manifold4w name = "four-way scrubber pipe manifold fitting" - desc = "a four-way scrubber pipe manifold segment" + desc = "A four-way scrubber pipe manifold segment." build_icon_state = "manifold4w" constructed_path = /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers pipe_class = PIPE_CLASS_QUATERNARY @@ -144,7 +144,7 @@ /datum/fabricator_recipe/pipe/scrubber/cap name = "scrubber pipe cap fitting" - desc = "a pipe cap for a scrubber pipe." + desc = "A pipe cap for a scrubber pipe." build_icon_state = "cap" constructed_path = /obj/machinery/atmospherics/pipe/cap/hidden/scrubbers pipe_class = PIPE_CLASS_UNARY @@ -159,7 +159,7 @@ /datum/fabricator_recipe/pipe/scrubber/down name = "downward scrubber pipe fitting" - desc = "a downward scrubber pipe segment." + desc = "A downward scrubber pipe segment." build_icon_state = "down" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers rotate_class = PIPE_ROTATE_STANDARD @@ -173,18 +173,18 @@ pipe_class = PIPE_CLASS_BINARY name = "fuel pipe fitting" - desc = "a striaght fuel pipe segment" + desc = "A straight fuel pipe segment." rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/fuel/bent name = "bent fuel pipe fitting" - desc = "a bent fuel pipe segment" + desc = "A bent fuel pipe segment." rotate_class = PIPE_ROTATE_TWODIR dir = PIPE_BENT /datum/fabricator_recipe/pipe/fuel/manifold name = "fuel pipe manifold fitting" - desc = "a fuel pipe manifold segment" + desc = "A fuel pipe manifold segment." build_icon_state = "manifold" constructed_path = /obj/machinery/atmospherics/pipe/manifold/hidden/fuel pipe_class = PIPE_CLASS_TRINARY @@ -192,7 +192,7 @@ /datum/fabricator_recipe/pipe/fuel/manifold4w name = "four-way supply pipe manifold fitting" - desc = "a four-way fuel pipe manifold segment" + desc = "A four-way fuel pipe manifold segment." build_icon_state = "manifold4w" constructed_path = /obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel pipe_class = PIPE_CLASS_QUATERNARY @@ -200,7 +200,7 @@ /datum/fabricator_recipe/pipe/fuel/cap name = "fuel pipe cap fitting" - desc = "a pipe cap for a fuel pipe." + desc = "A pipe cap for a fuel pipe." build_icon_state = "cap" constructed_path = /obj/machinery/atmospherics/pipe/cap/hidden/fuel pipe_class = PIPE_CLASS_UNARY @@ -215,7 +215,7 @@ /datum/fabricator_recipe/pipe/fuel/down name = "downward fuel pipe fitting" - desc = "a downward fuel pipe segment." + desc = "A downward fuel pipe segment." build_icon_state = "down" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/down/fuel rotate_class = PIPE_ROTATE_STANDARD @@ -229,13 +229,13 @@ pipe_class = PIPE_CLASS_BINARY name = "heat exchanger pipe fitting" - desc = "a heat exchanger pipe segment" + desc = "A heat exchanger pipe segment." build_icon_state = "he" rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/he/bent name = "bent heat exchanger pipe fitting" - desc = "a bent heat exchanger pipe segment" + desc = "A bent heat exchanger pipe segment." connect_types = CONNECT_TYPE_HE rotate_class = PIPE_ROTATE_TWODIR build_icon_state = "he" @@ -243,7 +243,7 @@ /datum/fabricator_recipe/pipe/he/junction name = "heat exchanger junction" - desc = "a heat exchanger junction" + desc = "A heat exchanger junction." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_HE|CONNECT_TYPE_FUEL build_icon_state = "junction" constructed_path = /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction @@ -251,7 +251,7 @@ /datum/fabricator_recipe/pipe/he/exchanger name = "heat exchanger" - desc = "a heat exchanger" + desc = "A heat exchanger." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL build_icon_state = "heunary" constructed_path = /obj/machinery/atmospherics/unary/heat_exchanger From 25a1734535f54581b818be64d81fe3b748b343ae Mon Sep 17 00:00:00 2001 From: Penelope Haze Date: Sun, 26 Jan 2025 16:30:30 -0500 Subject: [PATCH 4/8] Fix grammar issues in a handful of descriptions --- code/datums/extensions/storage/subtypes_mre.dm | 2 +- code/game/machinery/doors/airlock_electronics.dm | 2 +- code/game/machinery/embedded_controller/tin_can.dm | 2 +- code/game/objects/items/blueprints.dm | 8 ++++---- code/game/objects/items/devices/gps.dm | 2 +- code/game/objects/items/trash.dm | 2 +- code/game/objects/items/weapons/gift_wrappaper.dm | 2 +- code/game/objects/items/weapons/implants/implantpad.dm | 2 +- .../objects/items/weapons/implants/implants/translator.dm | 2 +- code/game/objects/items/weapons/material/misc.dm | 2 +- code/game/objects/items/weapons/storage/backpack.dm | 2 +- code/modules/clothing/head/collectable.dm | 2 +- code/modules/clothing/pants/misc.dm | 2 +- code/modules/clothing/spacesuits/rig/suits/light.dm | 2 +- code/modules/events/meteors.dm | 2 +- code/modules/integrated_electronics/subtypes/access.dm | 2 +- .../modules/integrated_electronics/subtypes/converters.dm | 2 ++ code/modules/locks/lock_construct.dm | 2 +- code/modules/mob/living/simple_animal/crow/crow.dm | 2 +- .../simple_animal/hostile/commanded/nanomachines.dm | 2 +- code/modules/reagents/reagent_containers/drinks/bottle.dm | 2 +- code/modules/reagents/reagent_containers/drinks/cans.dm | 2 +- code/modules/reagents/reagent_containers/food/rotten.dm | 3 +-- 23 files changed, 27 insertions(+), 26 deletions(-) diff --git a/code/datums/extensions/storage/subtypes_mre.dm b/code/datums/extensions/storage/subtypes_mre.dm index b5045c1fc1b..696f0343718 100644 --- a/code/datums/extensions/storage/subtypes_mre.dm +++ b/code/datums/extensions/storage/subtypes_mre.dm @@ -20,7 +20,7 @@ /datum/storage/mrebag/open(mob/user) if(!opened) - to_chat(user, "The pouch heats up as you break the vaccum seal.") + to_chat(user, "The pouch heats up as you break the vacuum seal.") . = ..() /datum/storage/mrebag/dessert diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 6533978f852..dbca57d4ca7 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -17,7 +17,7 @@ var/secure = 0 //if set, then wires will be randomized and bolts will drop if the door is broken /obj/item/stock_parts/circuitboard/airlock_electronics/secure name = "secure airlock electronics" - desc = "designed to be somewhat more resistant to hacking than standard electronics." + desc = "Airlock control electronics, designed to be somewhat more resistant to hacking than standard electronics." origin_tech = @'{"programming":2}' secure = TRUE diff --git a/code/game/machinery/embedded_controller/tin_can.dm b/code/game/machinery/embedded_controller/tin_can.dm index d2cada82a3d..895f15cbaf7 100644 --- a/code/game/machinery/embedded_controller/tin_can.dm +++ b/code/game/machinery/embedded_controller/tin_can.dm @@ -54,7 +54,7 @@ return state = STATE_EVACUATE toggleDoor(memory["exterior_status"], tag_exterior_door, door_safety, "close") - signalPump(tag_pump_out_internal, 1, 0, 0) // Interior pump, target is a vaccum + signalPump(tag_pump_out_internal, 1, 0, 0) // Interior pump, target is a vacuum signalPump(tag_pump_out_external, 1, 1, 10000) // Exterior pump, target is infinite if("fill_atmos") if(state == STATE_FILL) diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 5a082bb9180..8d9e6d3d06b 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -55,7 +55,7 @@ if(istype(T) && length(global.using_map.overmap_ids)) var/obj/effect/overmap/visitable/sector/S = global.overmap_sectors[num2text(T.z)] if(!S) // The blueprints are useless now, but keep them around for fluff. - desc = "Some dusty old blueprints. The markings are old, and seem entirely irrelevant for your wherabouts." + desc = "Some dusty old blueprints. The markings are old, and seem entirely irrelevant for your whereabouts." return FALSE name += " - [S.name]" @@ -91,7 +91,7 @@ for(var/obj/effect/overmap/visitable/sector/planetoid/E in map) valid_z_levels |= E.map_z return TRUE - desc = "Some dusty old blueprints. The markings are old, and seem entirely irrelevant for your wherabouts." + desc = "Some dusty old blueprints. The markings are old, and seem entirely irrelevant for your whereabouts." return FALSE //For use on /obj/effect/overmap/visitable/ship/landable ships. @@ -111,7 +111,7 @@ area_prefix = S.name return TRUE // The blueprints are useless now, but keep them around for fluff. - desc = "Some dusty old blueprints. The markings are old, and seem entirely irrelevant for your wherabouts." + desc = "Some dusty old blueprints. The markings are old, and seem entirely irrelevant for your whereabouts." return FALSE /obj/item/blueprints/shuttle/proc/update_linked_name(atom/namee, old_name, new_name) @@ -122,7 +122,7 @@ events_repository.unregister(/decl/observ/name_set, destroyed, src, PROC_REF(update_linked_name)) events_repository.unregister(/decl/observ/destroyed, destroyed, src, PROC_REF(on_shuttle_destroy)) name = initial(name) - desc = "Some dusty old blueprints. The markings are old, and seem entirely irrelevant for your wherabouts." + desc = "Some dusty old blueprints. The markings are old, and seem entirely irrelevant for your whereabouts." valid_z_levels = list() area_prefix = null diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm index 4508758e19d..7704fb75550 100644 --- a/code/game/objects/items/devices/gps.dm +++ b/code/game/objects/items/devices/gps.dm @@ -1,7 +1,7 @@ var/global/list/all_gps_units = list() /obj/item/gps name = "global coordinate system" - desc = "A handheld relay used to triangulates the approximate co-ordinates of the device." + desc = "A handheld relay used to triangulate the approximate coordinates of the device in spacetime." icon = 'icons/obj/items/device/locator.dmi' icon_state = ICON_STATE_WORLD origin_tech = @'{"materials":2,"programming":2,"wormholes":2}' diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 8c88b8edc0d..e41bd958bf2 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -166,7 +166,7 @@ /obj/item/trash/stick name = "stick" - desc = "a stick from some snack food item or a lollipop, not even useful as crafting material." + desc = "A stick from some snack food item or a lollipop, not even useful as crafting material." icon_state = "stick" /obj/item/trash/use_on_mob(mob/living/target, mob/living/user, animate = TRUE) diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index a59f5ec44ba..62f1c7e3fe4 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -9,7 +9,7 @@ */ /obj/item/a_gift name = "gift" - desc = "PRESENTS!!!! eek!" + desc = "PRESENTS!!!! Eek!" icon = 'icons/obj/items/gift_wrapped.dmi' icon_state = "gift" item_state = "gift" diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm index 7f1226b1eae..a2b1afb11fb 100644 --- a/code/game/objects/items/weapons/implants/implantpad.dm +++ b/code/game/objects/items/weapons/implants/implantpad.dm @@ -1,6 +1,6 @@ /obj/item/implantpad name = "implant pad" - desc = "Used to reprogramm implants." + desc = "Used to reprogram implants." icon = 'icons/obj/items/implant/implantpad.dmi' icon_state = ICON_STATE_WORLD w_class = ITEM_SIZE_SMALL diff --git a/code/game/objects/items/weapons/implants/implants/translator.dm b/code/game/objects/items/weapons/implants/implants/translator.dm index 90220204ae8..f4c540ddb7d 100644 --- a/code/game/objects/items/weapons/implants/implants/translator.dm +++ b/code/game/objects/items/weapons/implants/implants/translator.dm @@ -41,7 +41,7 @@ /obj/item/implant/translator/natural name = "lingophagic node" - desc = "A chunk of what could be discolored crystalized brain matter. It seems to pulse occasionally." + desc = "A chunk of what could be discolored crystallized brain matter. It seems to pulse occasionally." icon_state = "implant_melted" origin_tech = @'{"biotech":5}' learning_threshold = 10 diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm index 8040747110e..3715ccf13ea 100644 --- a/code/game/objects/items/weapons/material/misc.dm +++ b/code/game/objects/items/weapons/material/misc.dm @@ -37,7 +37,7 @@ /obj/item/harpoon/bomb/proc/handle_afterbomb() spent = TRUE SetName("broken harpoon") - desc = "A short spear with just a barb - if it once had a spearhead, it doesn't any more." + desc = "A short spear with just a barb; if it once had a spearhead, it doesn't anymore." icon_state = "harpoon_bomb_spent" sharp = FALSE edge = FALSE diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index fb4d2bb6756..7a234732c98 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -410,7 +410,7 @@ /obj/item/backpack/messenger/chem name = "pharmacy messenger bag" - desc = "A serile backpack worn over one shoulder. This one is in Chemistry colors." + desc = "A sterile backpack worn over one shoulder. This one is in Chemistry colors." icon = 'icons/obj/items/storage/backpack/messenger_chem.dmi' /obj/item/backpack/messenger/med diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index 4c51dbe3bb9..c14e8d495da 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -8,7 +8,7 @@ /obj/item/clothing/head/collectable/petehat name = "ultra rare hat" - desc = "an ultra rare hat. It commands a certain respect." + desc = "An ultra rare hat. It commands a certain respect." icon = 'icons/clothing/head/pete.dmi' /obj/item/clothing/head/collectable/xenom diff --git a/code/modules/clothing/pants/misc.dm b/code/modules/clothing/pants/misc.dm index 76652282660..9fa43b93a09 100644 --- a/code/modules/clothing/pants/misc.dm +++ b/code/modules/clothing/pants/misc.dm @@ -1,6 +1,6 @@ /obj/item/clothing/pants/fire_overpants name = "fire overpants" - desc = "some overpants made of fire-resistant synthetic fibers. To be worn over the uniform." + desc = "Some overpants made of fire-resistant synthetic fibers, worn over one's uniform." icon = 'icons/clothing/pants/overpants.dmi' gas_transfer_coefficient = 0.90 permeability_coefficient = 0.50 diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm index 61612dc84e6..7d705a242a1 100644 --- a/code/modules/clothing/spacesuits/rig/suits/light.dm +++ b/code/modules/clothing/spacesuits/rig/suits/light.dm @@ -47,7 +47,7 @@ icon = 'icons/clothing/rigs/rig_hacker.dmi' req_access = list(access_hacked) airtight = 0 - seal_delay = 5 //not being vaccum-proof has an upside I guess + seal_delay = 5 //not being vacuum-proof has an upside I guess helmet = /obj/item/clothing/head/lightrig/hacker chest = /obj/item/clothing/suit/lightrig/hacker diff --git a/code/modules/events/meteors.dm b/code/modules/events/meteors.dm index 73966699606..521a4bbb2f2 100644 --- a/code/modules/events/meteors.dm +++ b/code/modules/events/meteors.dm @@ -431,7 +431,7 @@ var/global/list/meteors_major = list( //Missiles, for events and so on /obj/effect/meteor/destroyer/missile name = "photon torpedo" - desc = "An advanded warhead designed to tactically destroy space installations." + desc = "An advanced warhead designed to tactically destroy space installations." icon = 'icons/obj/missile.dmi' icon_state = "photon" meteordrop = null diff --git a/code/modules/integrated_electronics/subtypes/access.dm b/code/modules/integrated_electronics/subtypes/access.dm index ef601575bd9..11e008e93df 100644 --- a/code/modules/integrated_electronics/subtypes/access.dm +++ b/code/modules/integrated_electronics/subtypes/access.dm @@ -43,7 +43,7 @@ /obj/item/integrated_circuit/output/access_displayer name = "access circuit" - desc = "broadcasts access for your assembly via a passkey." + desc = "A circuit that broadcasts access for your assembly via a passkey." extended_desc = "Useful for moving drones through airlocks." complexity = 4 diff --git a/code/modules/integrated_electronics/subtypes/converters.dm b/code/modules/integrated_electronics/subtypes/converters.dm index 1d125d29c24..a6049076789 100644 --- a/code/modules/integrated_electronics/subtypes/converters.dm +++ b/code/modules/integrated_electronics/subtypes/converters.dm @@ -109,6 +109,7 @@ /obj/item/integrated_circuit/converter/lowercase name = "lowercase string converter" + // i'm not fixing the capitalization here to fit style guides because it's funny actually desc = "this circuit will cause a string to come out in all lowercase." icon_state = "lowercase" inputs = list("input" = IC_PINTYPE_STRING) @@ -128,6 +129,7 @@ /obj/item/integrated_circuit/converter/uppercase name = "uppercase string converter" + // see capitalization note above desc = "THIS WILL CAUSE A STRING TO COME OUT IN ALL UPPERCASE." icon_state = "uppercase" inputs = list("input" = IC_PINTYPE_STRING) diff --git a/code/modules/locks/lock_construct.dm b/code/modules/locks/lock_construct.dm index a1060c0063d..0a27464efde 100644 --- a/code/modules/locks/lock_construct.dm +++ b/code/modules/locks/lock_construct.dm @@ -1,6 +1,6 @@ /obj/item/lock_construct name = "lock" - desc = "a simple tumbler lock and bolt, suitable for affixing to a door or closet." + desc = "A simple tumbler lock and bolt, suitable for affixing to a door or closet." icon = 'icons/obj/items/doorlock.dmi' icon_state = "lock_construct" w_class = ITEM_SIZE_TINY diff --git a/code/modules/mob/living/simple_animal/crow/crow.dm b/code/modules/mob/living/simple_animal/crow/crow.dm index 66428209454..1c780c3299a 100644 --- a/code/modules/mob/living/simple_animal/crow/crow.dm +++ b/code/modules/mob/living/simple_animal/crow/crow.dm @@ -80,7 +80,7 @@ /mob/living/simple_animal/crow/cyber name = "cybercrow" - desc = "A large cybercrow. k4w k4w." + desc = "A large cybercrow. K4w k4w." speak_emote = list("beeps") /mob/living/simple_animal/crow/cyber/on_update_icon() diff --git a/code/modules/mob/living/simple_animal/hostile/commanded/nanomachines.dm b/code/modules/mob/living/simple_animal/hostile/commanded/nanomachines.dm index 1145b90b6e8..330f1afffc4 100644 --- a/code/modules/mob/living/simple_animal/hostile/commanded/nanomachines.dm +++ b/code/modules/mob/living/simple_animal/hostile/commanded/nanomachines.dm @@ -1,6 +1,6 @@ /mob/living/simple_animal/hostile/commanded/nanomachine name = "swarm" - desc = "a cloud of tiny, tiny robots." + desc = "A cloud of tiny, tiny robots." icon = 'icons/mob/simple_animal/nanomachines.dmi' natural_weapon = /obj/item/natural_weapon/nanomachine max_health = 10 diff --git a/code/modules/reagents/reagent_containers/drinks/bottle.dm b/code/modules/reagents/reagent_containers/drinks/bottle.dm index 56e5f6b4720..54d4516579a 100644 --- a/code/modules/reagents/reagent_containers/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/drinks/bottle.dm @@ -409,7 +409,7 @@ /obj/item/chems/drinks/bottle/cola name = "\improper Space Cola" - desc = "Cola. in space." + desc = "Cola... in space." icon_state = "colabottle" center_of_mass = @'{"x":16,"y":6}' diff --git a/code/modules/reagents/reagent_containers/drinks/cans.dm b/code/modules/reagents/reagent_containers/drinks/cans.dm index 7c2dbb14dd6..3b0974dd6e3 100644 --- a/code/modules/reagents/reagent_containers/drinks/cans.dm +++ b/code/modules/reagents/reagent_containers/drinks/cans.dm @@ -12,7 +12,7 @@ /obj/item/chems/drinks/cans/cola name = "\improper Space Cola" - desc = "Cola. in space." + desc = "Cola... in space." icon_state = "cola" center_of_mass = @'{"x":16,"y":10}' diff --git a/code/modules/reagents/reagent_containers/food/rotten.dm b/code/modules/reagents/reagent_containers/food/rotten.dm index 22e15e4dea1..4115b5d05de 100644 --- a/code/modules/reagents/reagent_containers/food/rotten.dm +++ b/code/modules/reagents/reagent_containers/food/rotten.dm @@ -1,8 +1,7 @@ //inedible old vendor food - +//filled with inedible and possibly dangerous chemicals /obj/item/food/old name = "master old-food" - desc = "they're all inedible and potentially dangerous items" center_of_mass = @'{"x":15,"y":12}' nutriment_desc = list("rot" = 5, "mold" = 5) nutriment_amt = 10 From f55c4268c00b6f1ca7f8f8a5151e4868d11b6ae7 Mon Sep 17 00:00:00 2001 From: Penelope Haze Date: Sun, 26 Jan 2025 16:33:16 -0500 Subject: [PATCH 5/8] Replace 'recieve' with 'receive' and 'reciept' with 'receipt' --- code/__defines/bodytype.dm | 2 +- code/_helpers/unsorted.dm | 2 +- code/_onclick/click.dm | 2 +- code/_onclick/drag_drop.dm | 2 +- code/controllers/communications.dm | 6 +++--- code/controllers/subsystems/vote.dm | 2 +- code/datums/config/config_types/config_client.dm | 2 +- .../datums/extensions/storage/subtypes_sheets.dm | 2 +- code/datums/wires/radio.dm | 2 +- code/game/antagonist/antagonist_objectives.dm | 2 +- .../stock_parts/network_receiver.dm | 2 +- .../stock_parts/radio/stock_parts_radio.dm | 2 +- .../stock_parts/stock_parts_interface.dm | 2 +- .../embedded_controller/docking_program.dm | 2 +- code/game/machinery/supplybeacon.dm | 2 +- code/modules/admin/verbs/adminpm.dm | 16 ++++++++-------- code/modules/events/money_lotto.dm | 2 +- code/modules/mob/skills/skill_verbs.dm | 2 +- .../file_system/programs/generic/supply.dm | 2 +- .../file_system/reports/report.dm | 2 +- code/modules/nano/nanoui.dm | 4 ++-- code/modules/paperwork/adminpaper.dm | 2 +- code/modules/power/solar.dm | 4 ++-- code/modules/shuttles/shuttle_console.dm | 2 +- code/modules/shuttles/shuttle_emergency.dm | 2 +- code/modules/shuttles/shuttle_log.dm | 2 +- code/modules/species/species.dm | 2 +- maps/away/unishi/unishi.dm | 2 +- maps/exodus/exodus-2.dmm | 2 +- mods/content/supermatter/datums/sm_codex.dm | 2 +- mods/content/xenobiology/slime/items.dm | 2 +- mods/gamemodes/cult/structures.dm | 2 +- mods/gamemodes/ninja/objects/rigsuit.dm | 2 +- nano/templates/request_console.tmpl | 2 +- 34 files changed, 45 insertions(+), 45 deletions(-) diff --git a/code/__defines/bodytype.dm b/code/__defines/bodytype.dm index a44b77cc47f..ca9dccfe608 100644 --- a/code/__defines/bodytype.dm +++ b/code/__defines/bodytype.dm @@ -18,7 +18,7 @@ // Bodytype feature flags /// Does not create DNA. Replaces SPECIES_FLAG_NO_SCAN. #define BODY_FLAG_NO_DNA BITFLAG(0) -/// Cannot suffer halloss/recieves deceptive health indicator. +/// Cannot suffer halloss/receives deceptive health indicator. #define BODY_FLAG_NO_PAIN BITFLAG(1) /// Cannot eat food/drink drinks even if a stomach organ is present. #define BODY_FLAG_NO_EAT BITFLAG(2) diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm index 88f8f402528..02c769ae10a 100644 --- a/code/_helpers/unsorted.dm +++ b/code/_helpers/unsorted.dm @@ -275,7 +275,7 @@ Turf and target are seperate in case you want to teleport some distance from a t return 0 return 1 -//Ensure the frequency is within bounds of what it should be sending/recieving at +//Ensure the frequency is within bounds of what it should be sending/receiving at /proc/sanitize_frequency(var/f, var/low = PUBLIC_LOW_FREQ, var/high = PUBLIC_HIGH_FREQ) return clamp(round(f), low, high) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 90653cccc97..372ede052d3 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -41,7 +41,7 @@ After that, mostly just check your state, check whether you're holding an item, check whether you're adjacent to the target, then pass off the click to whoever - is recieving it. + is receiving it. The most common are: * mob/UnarmedAttack(atom,adjacent) - used here only when adjacent, with no item in hand; in the case of humans, checks gloves * atom/attackby(item,user) - used only when adjacent diff --git a/code/_onclick/drag_drop.dm b/code/_onclick/drag_drop.dm index ec0965a969f..9102b1b0e88 100644 --- a/code/_onclick/drag_drop.dm +++ b/code/_onclick/drag_drop.dm @@ -1,6 +1,6 @@ /* The below procs are called on the atom you're dragging. In a lot of circumstances we want to use the - recieving object instead, so that's the default action. This allows you to drag + receiving object instead, so that's the default action. This allows you to drag almost anything into a trash can. */ diff --git a/code/controllers/communications.dm b/code/controllers/communications.dm index d91f03f89ee..05694e4565d 100644 --- a/code/controllers/communications.dm +++ b/code/controllers/communications.dm @@ -94,13 +94,13 @@ var/global/const/EXTERNAL_AIR_FREQ = 1381 // Used by some external airlocks. //Other devices can then choose to send signals to only those devices that belong to a particular filter. //This is done for performance, so we don't send signals to lots of machines unnecessarily. -//This filter is special because devices belonging to default also recieve signals sent to any other filter. +//This filter is special because devices belonging to default also receive signals sent to any other filter. var/global/const/RADIO_DEFAULT = "radio_default" -//This filter is special because devices belonging to it do not recieve any signals at all. Useful for devices which only transmit. +//This filter is special because devices belonging to it do not receive any signals at all. Useful for devices which only transmit. var/global/const/RADIO_NULL = "radio_null" var/global/const/RADIO_TO_AIRALARM = "radio_airalarm" //air alarms -var/global/const/RADIO_FROM_AIRALARM = "radio_airalarm_rcvr" //devices interested in recieving signals from air alarms +var/global/const/RADIO_FROM_AIRALARM = "radio_airalarm_rcvr" //devices interested in receiving signals from air alarms var/global/const/RADIO_CHAT = "radio_telecoms" var/global/const/RADIO_ATMOSIA = "radio_atmos" var/global/const/RADIO_NAVBEACONS = "radio_navbeacon" diff --git a/code/controllers/subsystems/vote.dm b/code/controllers/subsystems/vote.dm index fb2a258791c..5acccf7afe0 100644 --- a/code/controllers/subsystems/vote.dm +++ b/code/controllers/subsystems/vote.dm @@ -12,7 +12,7 @@ SUBSYSTEM_DEF(vote) var/list/old_votes //Stores completed votes for reference. var/queued_auto_vote //Used if a vote queues another vote to happen after it. - var/list/voting = list() //Clients recieving UI updates. + var/list/voting = list() //Clients receiving UI updates. var/list/vote_prototypes //To run checks on whether they are available. /datum/controller/subsystem/vote/Initialize() diff --git a/code/datums/config/config_types/config_client.dm b/code/datums/config/config_types/config_client.dm index 7219bc3189f..ed8a0224daf 100644 --- a/code/datums/config/config_types/config_client.dm +++ b/code/datums/config/config_types/config_client.dm @@ -51,7 +51,7 @@ /decl/config/toggle/popup_admin_pm uid = "popup_admin_pm" desc = list( - "Remove the # to show a popup 'reply to' window to every non-admin that recieves an adminPM.", + "Remove the # to show a popup 'reply to' window to every non-admin that receives an adminPM.", "The intention is to make adminPMs more visible. (although I fnd popups annoying so this defaults to off)." ) diff --git a/code/datums/extensions/storage/subtypes_sheets.dm b/code/datums/extensions/storage/subtypes_sheets.dm index a72c49ab856..578282c8d4b 100644 --- a/code/datums/extensions/storage/subtypes_sheets.dm +++ b/code/datums/extensions/storage/subtypes_sheets.dm @@ -77,7 +77,7 @@ return FALSE //I would prefer to drop a new stack, but the item/attack_hand code - // that calls this can't recieve a different object than you clicked on. + // that calls this can't receive a different object than you clicked on. //Therefore, make a new stack internally that has the remainder. // -Sayu diff --git a/code/datums/wires/radio.dm b/code/datums/wires/radio.dm index 22b951263c5..d2d868a4a7d 100644 --- a/code/datums/wires/radio.dm +++ b/code/datums/wires/radio.dm @@ -3,7 +3,7 @@ wire_count = 3 descriptions = list( new /datum/wire_description(WIRE_SIGNAL, "This wire connects several radio components."), - new /datum/wire_description(WIRE_RECEIVE, "This wire runs to the radio reciever.", SKILL_EXPERT), + new /datum/wire_description(WIRE_RECEIVE, "This wire runs to the radio receiver.", SKILL_EXPERT), new /datum/wire_description(WIRE_TRANSMIT, "This wire runs to the radio transmitter.") ) diff --git a/code/game/antagonist/antagonist_objectives.dm b/code/game/antagonist/antagonist_objectives.dm index 5e0f27068cf..51caf655579 100644 --- a/code/game/antagonist/antagonist_objectives.dm +++ b/code/game/antagonist/antagonist_objectives.dm @@ -17,7 +17,7 @@ /mob/proc/add_objectives() set name = "Get Objectives" - set desc = "Recieve optional objectives." + set desc = "Receive optional objectives." set category = "OOC" src.verbs -= /mob/proc/add_objectives diff --git a/code/game/machinery/_machines_base/stock_parts/network_receiver.dm b/code/game/machinery/_machines_base/stock_parts/network_receiver.dm index 644941d02cd..1b09080e57c 100644 --- a/code/game/machinery/_machines_base/stock_parts/network_receiver.dm +++ b/code/game/machinery/_machines_base/stock_parts/network_receiver.dm @@ -1,4 +1,4 @@ -// A reciever that allows for non-network machines to have public vars and methods interacted with by networks +// A receiver that allows for non-network machines to have public vars and methods interacted with by networks /obj/item/stock_parts/network_receiver name = "network receiver" diff --git a/code/game/machinery/_machines_base/stock_parts/radio/stock_parts_radio.dm b/code/game/machinery/_machines_base/stock_parts/radio/stock_parts_radio.dm index e1a96719417..9cca4b1b98a 100644 --- a/code/game/machinery/_machines_base/stock_parts/radio/stock_parts_radio.dm +++ b/code/game/machinery/_machines_base/stock_parts/radio/stock_parts_radio.dm @@ -24,7 +24,7 @@ id_tag = new_tag set_frequency(frequency, filter) -/obj/item/stock_parts/radio/proc/get_receive_filter() // what filter should we register with to recieve updates on? +/obj/item/stock_parts/radio/proc/get_receive_filter() // what filter should we register with to receive updates on? return RADIO_NULL /obj/item/stock_parts/radio/proc/set_frequency(new_frequency, new_filter) diff --git a/code/game/machinery/_machines_base/stock_parts/stock_parts_interface.dm b/code/game/machinery/_machines_base/stock_parts/stock_parts_interface.dm index e56703abc15..bd43db38d6c 100644 --- a/code/game/machinery/_machines_base/stock_parts/stock_parts_interface.dm +++ b/code/game/machinery/_machines_base/stock_parts/stock_parts_interface.dm @@ -20,7 +20,7 @@ /obj/item/stock_parts/keyboard name = "input controller" - desc = "A standard part required by many machines to recieve user input." + desc = "A standard part required by many machines to receive user input." icon_state = "input" origin_tech = @'{"materials":1}' material = /decl/material/solid/organic/plastic diff --git a/code/game/machinery/embedded_controller/docking_program.dm b/code/game/machinery/embedded_controller/docking_program.dm index 5a8dbad94e8..8bea52eb025 100644 --- a/code/game/machinery/embedded_controller/docking_program.dm +++ b/code/game/machinery/embedded_controller/docking_program.dm @@ -57,7 +57,7 @@ var/response_sent = 0 //so we don't spam confirmation messages var/override_enabled = 0 //when enabled, do not open/close doors or cycle airlocks and wait for the player to do it manually - var/received_confirm = 0 //for undocking, whether the server has recieved a confirmation from the client + var/received_confirm = 0 //for undocking, whether the server has received a confirmation from the client var/docking_codes //would only allow docking when receiving signal with these, if set var/display_name //how would it show up on docking monitoring program, area name + coordinates if unset diff --git a/code/game/machinery/supplybeacon.dm b/code/game/machinery/supplybeacon.dm index 831363ce53e..b74a93b635d 100644 --- a/code/game/machinery/supplybeacon.dm +++ b/code/game/machinery/supplybeacon.dm @@ -101,7 +101,7 @@ target_drop_time = world.time + drop_delay if(world.time >= target_drop_time) deactivate(permanent = TRUE) - command_announcement.Announce("Nyx Rapid Fabrication priority supply request #[rand(1000,9999)]-[rand(100,999)] recieved. Shipment dispatched via ballistic supply pod for immediate delivery. Have a nice day.", "Thank You For Your Patronage") + command_announcement.Announce("Nyx Rapid Fabrication priority supply request #[rand(1000,9999)]-[rand(100,999)] received. Shipment dispatched via ballistic supply pod for immediate delivery. Have a nice day.", "Thank You For Your Patronage") addtimer(CALLBACK(src, PROC_REF(drop_cargo)), rand(20 SECONDS, 30 SECONDS)) /obj/structure/supply_beacon/proc/drop_cargo(var/drop_x, var/drop_y, var/drop_z) diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 7371ff70873..2ec60c912eb 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -46,12 +46,12 @@ else to_chat(src, "Error: Private-Message: Client not found. They may have lost connection, so please be patient!") return - var/recieve_pm_type = "Player" + var/receive_pm_type = "Player" if(holder) //mod PMs are maroon //PMs sent from admins and mods display their rank if(holder) - recieve_pm_type = holder.rank + receive_pm_type = holder.rank else if(C && !C.holder) to_chat(src, "Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.") @@ -104,12 +104,12 @@ // We are sending this quite early because of a return in the popup code. SSwebhooks.send(WEBHOOK_AHELP_SENT, list("name" = "Reply Sent ([ticket.id]) (Game ID: [game_id])", "body" = "**[sender_lite.key_name(FALSE, FALSE)]** to **[receiver_lite.key_name(FALSE, FALSE)]**: [msg]")) - var/recieve_message + var/receive_message if(holder && !C.holder) - recieve_message = "-- Click the [recieve_pm_type]'s name to reply --\n" + receive_message = "-- Click the [receive_pm_type]'s name to reply --\n" if(C.adminhelped) - to_chat(C, recieve_message) + to_chat(C, receive_message) C.adminhelped = 0 //AdminPM popup for ApocStation and anybody else who wants to use it. @@ -117,7 +117,7 @@ spawn(0) //so we don't hold the caller proc up var/sender = src var/sendername = key - var/reply = sanitize(input(C, msg,"[recieve_pm_type] PM from [sendername]", "") as text|null) //show message and await a reply + var/reply = sanitize(input(C, msg,"[receive_pm_type] PM from [sendername]", "") as text|null) //show message and await a reply if(C && reply) if(sender) C.cmd_admin_pm(sender,reply) //sender is still about, let's reply to them @@ -134,7 +134,7 @@ sender_message += "" to_chat(src, sender_message) - var/receiver_message = "" + create_text_tag("pm_in", "", C) + " \[[recieve_pm_type] PM\] [get_options_bar(src, C.holder ? 1 : 0, C.holder ? 1 : 0, 1)]" + var/receiver_message = "" + create_text_tag("pm_in", "", C) + " \[[receive_pm_type] PM\] [get_options_bar(src, C.holder ? 1 : 0, C.holder ? 1 : 0, 1)]" if(C.holder) receiver_message += " ([(ticket.status == TICKET_OPEN) ? "TAKE" : "JOIN"]) (CLOSE)" receiver_message += ": [generate_ahelp_key_words(C.mob, msg)]" @@ -145,7 +145,7 @@ window_flash(C) - //play the recieving admin the adminhelp sound (if they have them enabled) + //play the receiving admin the adminhelp sound (if they have them enabled) //non-admins shouldn't be able to disable this if(C.get_preference_value(/datum/client_preference/staff/play_adminhelp_ping) == PREF_HEAR) sound_to(C, 'sound/effects/adminhelp.ogg') diff --git a/code/modules/events/money_lotto.dm b/code/modules/events/money_lotto.dm index 0cd4a07d1fb..7760e51327f 100644 --- a/code/modules/events/money_lotto.dm +++ b/code/modules/events/money_lotto.dm @@ -20,7 +20,7 @@ var/channel = "Nyx Daily" var/decl/currency/cur = GET_DECL(winner_account?.currency || global.using_map.default_currency) - var/body = "Nyx Daily wishes to congratulate [winner_name] for recieving the Nyx Stellar Slam Lottery, and receiving the out of this world sum of [cur.format_value(winner_sum)]!" + var/body = "Nyx Daily wishes to congratulate [winner_name] for receiving the Nyx Stellar Slam Lottery, and receiving the out of this world sum of [cur.format_value(winner_sum)]!" if(!deposit_success) body += "
Unfortunately, we were unable to verify the account details provided, so we were unable to transfer the money. In order to have your winnings re-sent, send a cheque containing a processing fee of [cur.format_value(5000)] to the ND 'Stellar Slam' office on the Nyx gateway with your updated details." winner_account = null diff --git a/code/modules/mob/skills/skill_verbs.dm b/code/modules/mob/skills/skill_verbs.dm index 36be6e7adfe..fc051b13959 100644 --- a/code/modules/mob/skills/skill_verbs.dm +++ b/code/modules/mob/skills/skill_verbs.dm @@ -88,7 +88,7 @@ Robots and antags can instruct. return if(target.too_many_buffs(/datum/skill_buff/instruct)) var/decl/pronouns/pronouns = target.get_pronouns(ignore_coverings = TRUE) - to_chat(src, SPAN_WARNING("\The [target] [pronouns.is] exhausted from all the training [pronouns.he] recieved.")) + to_chat(src, SPAN_WARNING("\The [target] [pronouns.is] exhausted from all the training [pronouns.he] received.")) return if(!get_options) diff --git a/code/modules/modular_computers/file_system/programs/generic/supply.dm b/code/modules/modular_computers/file_system/programs/generic/supply.dm index 39f092d64a6..b0f42573415 100644 --- a/code/modules/modular_computers/file_system/programs/generic/supply.dm +++ b/code/modules/modular_computers/file_system/programs/generic/supply.dm @@ -395,7 +395,7 @@ return var/t = "" - t += "

[global.using_map.station_name] Supply Requisition Reciept

" + t += "

[global.using_map.station_name] Supply Requisition Receipt

" t += "INDEX: #[O.ordernum]
" t += "REQUESTED BY: [O.orderedby]
" t += "ASSIGNMENT: [O.orderedrank]
" diff --git a/code/modules/modular_computers/file_system/reports/report.dm b/code/modules/modular_computers/file_system/reports/report.dm index efb782c507f..7d391fbb982 100644 --- a/code/modules/modular_computers/file_system/reports/report.dm +++ b/code/modules/modular_computers/file_system/reports/report.dm @@ -143,7 +143,7 @@ no_html will strip any html, possibly killing useful formatting in the process. if(no_html) . = html2pencode(.) -//recipient reports have a designated recipients field, for recieving submitted reports. +//recipient reports have a designated recipients field, for receiving submitted reports. /datum/computer_file/report/recipient var/datum/report_field/people/list_from_manifest/recipients diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index e315b28c580..f2125ae38e3 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -388,7 +388,7 @@ nanoui is used to open and update nano browser uis diff --git a/code/modules/paperwork/adminpaper.dm b/code/modules/paperwork/adminpaper.dm index a7d1cda991a..d886c4defe1 100644 --- a/code/modules/paperwork/adminpaper.dm +++ b/code/modules/paperwork/adminpaper.dm @@ -57,7 +57,7 @@ text = "
" text += "This transmission is intended only for the addressee and may contain confidential information. Any unauthorized disclosure is strictly prohibited.

" - text += "If this transmission is recieved in error, please notify both the sender and the office of [global.using_map.boss_name] Internal Affairs immediately so that corrective action may be taken." + text += "If this transmission is received in error, please notify both the sender and the office of [global.using_map.boss_name] Internal Affairs immediately so that corrective action may be taken." text += "Failure to comply is a breach of regulation and may be prosecuted to the fullest extent of the law, where applicable." text += "" diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index a941debb006..66f77091a28 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -107,7 +107,7 @@ var/global/list/solars_list = list() set_dir(angle2dir(adir)) return -//calculates the fraction of the sunlight that the panel recieves +//calculates the fraction of the sunlight that the panel receives /obj/machinery/power/solar/proc/update_solar_exposure() var/datum/sun/sun = get_best_sun() @@ -125,7 +125,7 @@ var/global/list/solars_list = list() return sunfrac = cos(p_angle) ** 2 - //isn't the power recieved from the incoming light proportionnal to cos(p_angle) (Lambert's cosine law) rather than cos(p_angle)^2 ? + //isn't the power received from the incoming light proportionnal to cos(p_angle) (Lambert's cosine law) rather than cos(p_angle)^2 ? /obj/machinery/power/solar/Process() if(stat & BROKEN) diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm index 422e33e3f0e..774c5d4bdf0 100644 --- a/code/modules/shuttles/shuttle_console.dm +++ b/code/modules/shuttles/shuttle_console.dm @@ -37,7 +37,7 @@ shuttle_status = "Standing-by at [shuttle.get_location_name()]." if(WAIT_LAUNCH, FORCE_LAUNCH) - shuttle_status = "Shuttle has recieved command and will depart shortly." + shuttle_status = "Shuttle has received command and will depart shortly." if(WAIT_ARRIVE) shuttle_status = "Proceeding to \the [shuttle.get_destination_name()]." if(WAIT_FINISH) diff --git a/code/modules/shuttles/shuttle_emergency.dm b/code/modules/shuttles/shuttle_emergency.dm index f6efaa4a864..f78010c5055 100644 --- a/code/modules/shuttles/shuttle_emergency.dm +++ b/code/modules/shuttles/shuttle_emergency.dm @@ -201,7 +201,7 @@ else shuttle_status = "Standing-by at [global.using_map.dock_name]." if(WAIT_LAUNCH, FORCE_LAUNCH) - shuttle_status = "Shuttle has recieved command and will depart shortly." + shuttle_status = "Shuttle has received command and will depart shortly." if(WAIT_ARRIVE) shuttle_status = "Proceeding to destination." if(WAIT_FINISH) diff --git a/code/modules/shuttles/shuttle_log.dm b/code/modules/shuttles/shuttle_log.dm index 03d6fe0f307..8313873b212 100644 --- a/code/modules/shuttles/shuttle_log.dm +++ b/code/modules/shuttles/shuttle_log.dm @@ -6,7 +6,7 @@ var/list/datum/shuttle_mission/queued_missions = list() //Missions which are queued up, in order ([1] is the next one scheduled). var/datum/shuttle_mission/current_mission //The current mission, planned or ongoing. Will also be in either missions or queued_missions, depending on stage. var/home_base //The landmark tag from which missions originate. - var/list/datum/nano_module/registered = list() //Nanomodules using logs should register to recieve updates. + var/list/datum/nano_module/registered = list() //Nanomodules using logs should register to receive updates. var/last_spam = 0 //Helps with spam control from deck software. /datum/shuttle_log/New(datum/shuttle/given_shuttle) diff --git a/code/modules/species/species.dm b/code/modules/species/species.dm index 6ef37bd2681..89e39cae5f0 100644 --- a/code/modules/species/species.dm +++ b/code/modules/species/species.dm @@ -176,7 +176,7 @@ var/global/const/DEFAULT_SPECIES_HEALTH = 200 var/list/base_auras - var/job_skill_buffs = list() // A list containing jobs (/datum/job), with values the extra points that job recieves. + var/job_skill_buffs = list() // A list containing jobs (/datum/job), with values the extra points that job receives. var/standing_jump_range = 2 var/list/maneuvers = list(/decl/maneuver/leap) diff --git a/maps/away/unishi/unishi.dm b/maps/away/unishi/unishi.dm index de64aad2f44..9883e163758 100644 --- a/maps/away/unishi/unishi.dm +++ b/maps/away/unishi/unishi.dm @@ -92,7 +92,7 @@ /obj/item/paper/prof2 name = "error log" - info = " COMPUTER ID: 15131
Attempting recovery of document directory.
Three files recovered
Printing file (1/2)
Email to iodc@net
To whom it may concern,
I recieved your email today in regards to the research I am conducting. You have no legal right to question our research or attempt to block it. Per article 323, scientific research is protected information, that you have absolutely zero claim to. The compound is secret in composition, but I can fully promise you that it contains absolutely no proprietary molecules, and thus you have no claim whatsoever to it or the technologies to it. Your threats are laughable at best, and have been forwarded to CTI legal. Do not contact me aga!#!41asjw.
Printing file (2/2)
Email from fuckyou@12cmal
We have ways of making you comply. " + info = " COMPUTER ID: 15131
Attempting recovery of document directory.
Three files recovered
Printing file (1/2)
Email to iodc@net
To whom it may concern,
I received your email today in regards to the research I am conducting. You have no legal right to question our research or attempt to block it. Per article 323, scientific research is protected information, that you have absolutely zero claim to. The compound is secret in composition, but I can fully promise you that it contains absolutely no proprietary molecules, and thus you have no claim whatsoever to it or the technologies to it. Your threats are laughable at best, and have been forwarded to CTI legal. Do not contact me aga!#!41asjw.
Printing file (2/2)
Email from fuckyou@12cmal
We have ways of making you comply. " /obj/machinery/computer/log_printer name = "Computer" diff --git a/maps/exodus/exodus-2.dmm b/maps/exodus/exodus-2.dmm index 059f7cec344..365bbc97185 100644 --- a/maps/exodus/exodus-2.dmm +++ b/maps/exodus/exodus-2.dmm @@ -32641,7 +32641,7 @@ tag_door = "cargo_bay_door" }, /obj/machinery/camera/network/civilian_west{ - c_tag = "Cargo Recieving Dock"; + c_tag = "Cargo Receiving Dock"; dir = 4 }, /turf/floor/tiled/steel_grid, diff --git a/mods/content/supermatter/datums/sm_codex.dm b/mods/content/supermatter/datums/sm_codex.dm index c0d5c160fae..72810edb7a4 100644 --- a/mods/content/supermatter/datums/sm_codex.dm +++ b/mods/content/supermatter/datums/sm_codex.dm @@ -15,7 +15,7 @@
\ Touching the supermatter will result in *instant death*, with no corpse left behind! You can drag the supermatter, but anything else will kill you. \ It is advised to obtain a genetic backup before trying to drag it." - antag_text = "Exposing the supermatter to oxygen or vaccum will cause it to start rapidly heating up. Sabotaging the supermatter and making it explode will \ + antag_text = "Exposing the supermatter to oxygen or vacuum will cause it to start rapidly heating up. Sabotaging the supermatter and making it explode will \ cause a period of lag as the explosion is processed by the server, as well as irradiating the entire station and causing hallucinations to happen. \ Wearing radiation equipment will protect you from most of the delamination effects sans explosion." available_to_map_tech_level = MAP_TECH_LEVEL_SPACE \ No newline at end of file diff --git a/mods/content/xenobiology/slime/items.dm b/mods/content/xenobiology/slime/items.dm index 0af184e22c3..da4a21eff12 100644 --- a/mods/content/xenobiology/slime/items.dm +++ b/mods/content/xenobiology/slime/items.dm @@ -61,7 +61,7 @@ /obj/effect/golemrune anchored = TRUE - desc = "a strange rune used to create golems. It glows when it can be activated." + desc = "A strange rune used to create golems. It glows when it can be activated." name = "rune" icon = 'icons/obj/rune.dmi' icon_state = "golem" diff --git a/mods/gamemodes/cult/structures.dm b/mods/gamemodes/cult/structures.dm index 9f39d61522d..38bfdda57c0 100644 --- a/mods/gamemodes/cult/structures.dm +++ b/mods/gamemodes/cult/structures.dm @@ -112,7 +112,7 @@ /obj/structure/grille/cult name = "cult grille" - desc = "A matrice built out of an unknown material, with some sort of force field blocking air around it." + desc = "A matrix built out of an unknown material, with some sort of force field blocking air around it." material = /decl/material/solid/stone/cult /obj/structure/grille/cult/CanPass(atom/movable/mover, turf/target, height = 1.5, air_group = 0) diff --git a/mods/gamemodes/ninja/objects/rigsuit.dm b/mods/gamemodes/ninja/objects/rigsuit.dm index 36b47a9aa1a..7a49651656a 100644 --- a/mods/gamemodes/ninja/objects/rigsuit.dm +++ b/mods/gamemodes/ninja/objects/rigsuit.dm @@ -1,6 +1,6 @@ /obj/item/rig/light/ninja name = "ominous suit control module" - desc = "A unique, vaccum-proof suit of nano-enhanced armor designed specifically for assassins." + desc = "A unique, vacuum-proof suit of nano-enhanced armor designed specifically for assassins." suit_type = "ominous" icon = 'icons/clothing/rigs/rig_ninja.dmi' armor = list( diff --git a/nano/templates/request_console.tmpl b/nano/templates/request_console.tmpl index 82b27de25d5..4465f223e0d 100644 --- a/nano/templates/request_console.tmpl +++ b/nano/templates/request_console.tmpl @@ -73,7 +73,7 @@ Used In File(s): \code\game\machinery\requests_console.dm {{for data.message_log}}
{{:value}}
{{empty}} -
No messages have been recieved.
+
No messages have been received.
{{/for}}
{{:helper.link('Back', 'arrowreturnthick-1-w', { 'setScreen' : 0 })}}
From d4a2a8b8332d60fe8708c49b9359ca0a7568e78e Mon Sep 17 00:00:00 2001 From: Penelope Haze Date: Sun, 26 Jan 2025 18:17:47 -0500 Subject: [PATCH 6/8] Remove redundant pipe fabrication descriptions --- .../fabrication/designs/pipe/pipe_datums.dm | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/code/modules/fabrication/designs/pipe/pipe_datums.dm b/code/modules/fabrication/designs/pipe/pipe_datums.dm index b9aea3517c4..70f0a7c6320 100644 --- a/code/modules/fabrication/designs/pipe/pipe_datums.dm +++ b/code/modules/fabrication/designs/pipe/pipe_datums.dm @@ -3,18 +3,15 @@ /datum/fabricator_recipe/pipe name = "pipe fitting" - desc = "A straight pipe segment." rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/bent name = "bent pipe fitting" - desc = "A bent pipe segment." dir = PIPE_BENT rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/manifold name = "pipe manifold fitting" - desc = "A pipe manifold segment." build_icon_state = "manifold" constructed_path = /obj/machinery/atmospherics/pipe/manifold/hidden pipe_class = PIPE_CLASS_TRINARY @@ -22,7 +19,6 @@ /datum/fabricator_recipe/pipe/manifold4w name = "four-way pipe manifold fitting" - desc = "A four-way pipe manifold segment." build_icon_state = "manifold4w" constructed_path = /obj/machinery/atmospherics/pipe/manifold4w/hidden pipe_class = PIPE_CLASS_QUATERNARY @@ -30,7 +26,6 @@ /datum/fabricator_recipe/pipe/cap name = "pipe cap fitting" - desc = "A pipe cap for a regular pipe." build_icon_state = "cap" constructed_path = /obj/machinery/atmospherics/pipe/cap/hidden pipe_class = PIPE_CLASS_UNARY @@ -38,7 +33,6 @@ /datum/fabricator_recipe/pipe/up name = "upward pipe fitting" - desc = "an upward pipe." build_icon_state = "up" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/up rotate_class = PIPE_ROTATE_STANDARD @@ -46,7 +40,6 @@ /datum/fabricator_recipe/pipe/down name = "downward pipe fitting" - desc = "A downward pipe." build_icon_state = "down" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/down rotate_class = PIPE_ROTATE_STANDARD @@ -61,18 +54,15 @@ pipe_class = PIPE_CLASS_BINARY name = "supply pipe fitting" - desc = "A straight supply pipe segment." rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/supply/bent name = "bent supply pipe fitting" - desc = "A bent supply pipe segment." dir = PIPE_BENT rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/supply/manifold name = "supply pipe manifold fitting" - desc = "A supply pipe manifold segment." build_icon_state = "manifold" constructed_path = /obj/machinery/atmospherics/pipe/manifold/hidden/supply pipe_class = PIPE_CLASS_TRINARY @@ -80,7 +70,6 @@ /datum/fabricator_recipe/pipe/supply/manifold4w name = "four-way supply pipe manifold fitting" - desc = "A four-way supply pipe manifold segment." build_icon_state = "manifold4w" constructed_path = /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply pipe_class = PIPE_CLASS_QUATERNARY @@ -88,7 +77,6 @@ /datum/fabricator_recipe/pipe/supply/cap name = "supply pipe cap fitting" - desc = "A pipe cap for a regular pipe." build_icon_state = "cap" constructed_path = /obj/machinery/atmospherics/pipe/cap/hidden/supply pipe_class = PIPE_CLASS_UNARY @@ -96,14 +84,12 @@ /datum/fabricator_recipe/pipe/supply/up name = "upward supply pipe fitting" - desc = "an upward supply pipe segment." build_icon_state = "up" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/up/supply rotate_class = PIPE_ROTATE_STANDARD /datum/fabricator_recipe/pipe/supply/down name = "downward supply pipe fitting" - desc = "A downward supply pipe segment." build_icon_state = "down" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/down/supply rotate_class = PIPE_ROTATE_STANDARD @@ -117,18 +103,15 @@ pipe_class = PIPE_CLASS_BINARY name = "scrubber pipe fitting" - desc = "A straight scrubber pipe segment." rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/scrubber/bent name = "bent scrubber pipe fitting" - desc = "A bent scrubber pipe segment." rotate_class = PIPE_ROTATE_TWODIR dir = PIPE_BENT /datum/fabricator_recipe/pipe/scrubber/manifold name = "scrubber pipe manifold fitting" - desc = "A scrubber pipe manifold segment." build_icon_state = "manifold" constructed_path = /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers pipe_class = PIPE_CLASS_TRINARY @@ -136,7 +119,6 @@ /datum/fabricator_recipe/pipe/scrubber/manifold4w name = "four-way scrubber pipe manifold fitting" - desc = "A four-way scrubber pipe manifold segment." build_icon_state = "manifold4w" constructed_path = /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers pipe_class = PIPE_CLASS_QUATERNARY @@ -144,7 +126,6 @@ /datum/fabricator_recipe/pipe/scrubber/cap name = "scrubber pipe cap fitting" - desc = "A pipe cap for a scrubber pipe." build_icon_state = "cap" constructed_path = /obj/machinery/atmospherics/pipe/cap/hidden/scrubbers pipe_class = PIPE_CLASS_UNARY @@ -152,14 +133,12 @@ /datum/fabricator_recipe/pipe/scrubber/up name = "upward scrubber pipe fitting" - desc = "an upward scrubber pipe segment." build_icon_state = "up" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers rotate_class = PIPE_ROTATE_STANDARD /datum/fabricator_recipe/pipe/scrubber/down name = "downward scrubber pipe fitting" - desc = "A downward scrubber pipe segment." build_icon_state = "down" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers rotate_class = PIPE_ROTATE_STANDARD @@ -173,18 +152,15 @@ pipe_class = PIPE_CLASS_BINARY name = "fuel pipe fitting" - desc = "A straight fuel pipe segment." rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/fuel/bent name = "bent fuel pipe fitting" - desc = "A bent fuel pipe segment." rotate_class = PIPE_ROTATE_TWODIR dir = PIPE_BENT /datum/fabricator_recipe/pipe/fuel/manifold name = "fuel pipe manifold fitting" - desc = "A fuel pipe manifold segment." build_icon_state = "manifold" constructed_path = /obj/machinery/atmospherics/pipe/manifold/hidden/fuel pipe_class = PIPE_CLASS_TRINARY @@ -192,7 +168,6 @@ /datum/fabricator_recipe/pipe/fuel/manifold4w name = "four-way supply pipe manifold fitting" - desc = "A four-way fuel pipe manifold segment." build_icon_state = "manifold4w" constructed_path = /obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel pipe_class = PIPE_CLASS_QUATERNARY @@ -200,7 +175,6 @@ /datum/fabricator_recipe/pipe/fuel/cap name = "fuel pipe cap fitting" - desc = "A pipe cap for a fuel pipe." build_icon_state = "cap" constructed_path = /obj/machinery/atmospherics/pipe/cap/hidden/fuel pipe_class = PIPE_CLASS_UNARY @@ -208,14 +182,12 @@ /datum/fabricator_recipe/pipe/fuel/up name = "upward fuel pipe fitting" - desc = "an upward fuel pipe segment." build_icon_state = "up" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/up/fuel rotate_class = PIPE_ROTATE_STANDARD /datum/fabricator_recipe/pipe/fuel/down name = "downward fuel pipe fitting" - desc = "A downward fuel pipe segment." build_icon_state = "down" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/down/fuel rotate_class = PIPE_ROTATE_STANDARD @@ -229,13 +201,11 @@ pipe_class = PIPE_CLASS_BINARY name = "heat exchanger pipe fitting" - desc = "A heat exchanger pipe segment." build_icon_state = "he" rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/he/bent name = "bent heat exchanger pipe fitting" - desc = "A bent heat exchanger pipe segment." connect_types = CONNECT_TYPE_HE rotate_class = PIPE_ROTATE_TWODIR build_icon_state = "he" @@ -243,7 +213,6 @@ /datum/fabricator_recipe/pipe/he/junction name = "heat exchanger junction" - desc = "A heat exchanger junction." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_HE|CONNECT_TYPE_FUEL build_icon_state = "junction" constructed_path = /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction @@ -251,7 +220,6 @@ /datum/fabricator_recipe/pipe/he/exchanger name = "heat exchanger" - desc = "A heat exchanger." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL build_icon_state = "heunary" constructed_path = /obj/machinery/atmospherics/unary/heat_exchanger From 6a488d72770066108db8a72267be4db8e9ff6e04 Mon Sep 17 00:00:00 2001 From: Penelope Haze Date: Sun, 26 Jan 2025 20:50:49 -0500 Subject: [PATCH 7/8] Fix miscellaneous spelling and phrasing issues --- code/__defines/MC.dm | 4 +- code/__defines/machinery.dm | 2 +- code/_helpers/text.dm | 2 +- code/controllers/subsystems/machines.dm | 2 +- code/datums/extensions/storage/_storage.dm | 2 +- code/datums/uplink/ammunition.dm | 4 +- code/datums/uplink/badassery.dm | 2 +- code/datums/uplink/devices_and_tools.dm | 2 +- .../highly_visible_and_dangerous_weapons.dm | 10 ++--- code/datums/uplink/implants.dm | 2 +- code/datums/uplink/medical.dm | 2 +- .../stealthy_and_inconspicuous_weapons.dm | 2 +- code/datums/wires/wires.dm | 2 +- .../_machines_base/machinery_public_vars.dm | 2 +- .../stock_parts/legacy_parts.dm | 2 +- code/game/machinery/alarm.dm | 2 +- .../airlock_controllers_dummy.dm | 2 +- code/game/machinery/mech_recharger.dm | 2 +- code/game/machinery/self_destruct_storage.dm | 2 +- code/game/machinery/vending/food.dm | 2 +- code/game/machinery/washing_machine.dm | 2 +- code/game/objects/items/blackout.dm | 2 +- code/game/objects/items/cryobag.dm | 4 +- code/game/objects/items/devices/aicard.dm | 2 +- code/game/objects/items/devices/boombox.dm | 2 +- .../objects/items/devices/personal_shield.dm | 2 +- .../items/devices/radio/headsets_shared.dm | 4 +- .../flame/flame_fuelled_lighter_zippo.dm | 2 +- .../objects/items/flashlights/floodlamp.dm | 2 +- .../objects/items/flashlights/lavalamp.dm | 18 ++++----- code/game/objects/items/lockpicks.dm | 2 +- code/game/objects/items/paintkit.dm | 4 +- code/game/objects/items/rescuebag.dm | 4 +- .../items/stacks/medical/medical_resin.dm | 4 +- .../objects/items/stacks/tiles/tile_types.dm | 4 +- code/game/objects/items/toys.dm | 14 +++---- code/game/objects/items/waterskin.dm | 2 +- code/game/objects/items/weapons/cards_ids.dm | 2 +- .../items/weapons/circuitboards/wall.dm | 2 +- code/game/objects/items/weapons/defib.dm | 4 +- code/game/objects/items/weapons/dice.dm | 14 +++---- code/game/objects/items/weapons/ecigs.dm | 2 +- .../items/weapons/grenades/flashbang.dm | 2 +- .../objects/items/weapons/material/coins.dm | 2 +- .../objects/items/weapons/material/knives.dm | 2 +- .../objects/items/weapons/material/swiss.dm | 2 +- .../objects/items/weapons/storage/basket.dm | 2 +- .../objects/items/weapons/storage/boxes.dm | 6 +-- .../objects/items/weapons/storage/misc.dm | 4 +- .../objects/items/weapons/tanks/jetpack.dm | 4 +- code/game/objects/random/subtypes/tech.dm | 4 +- code/game/objects/random/subtypes/tools.dm | 4 +- .../structures/chemistry/_chemistry.dm | 2 +- .../crates_lockers/closets/job_closets.dm | 2 +- .../structures/crates_lockers/crates.dm | 6 +-- code/game/objects/structures/crematorium.dm | 2 +- .../structures/signs/department_signs.dm | 10 ++--- code/game/objects/structures/watercloset.dm | 2 +- code/modules/ZAS/Fire.dm | 2 +- code/modules/admin/quantum_mechanic.dm | 2 +- code/modules/admin/verbs/SDQL_2/SDQL_2.dm | 2 +- code/modules/admin/verbs/randomverbs.dm | 2 +- code/modules/assembly/mousetrap.dm | 2 +- .../components/binary_devices/pipeturbine.dm | 2 +- .../augment/active/tool/engineering.dm | 4 +- code/modules/augment/passive/boost/muscle.dm | 2 +- code/modules/awaymissions/pamphlet.dm | 2 +- code/modules/bodytype/bodytype_quadruped.dm | 4 +- code/modules/butchery/butchery_products.dm | 2 +- .../butchery/butchery_products_meat.dm | 4 +- code/modules/client/asset_cache.dm | 2 +- code/modules/clothing/chameleon.dm | 2 +- code/modules/clothing/dresses/misc.dm | 6 +-- code/modules/clothing/glasses/glasses.dm | 2 +- code/modules/clothing/glasses/sunglasses.dm | 2 +- code/modules/clothing/head/misc.dm | 6 +-- code/modules/clothing/head/misc_special.dm | 4 +- code/modules/clothing/jumpsuits/job.dm | 2 +- code/modules/clothing/masks/breath.dm | 2 +- code/modules/clothing/masks/chewable.dm | 8 ++-- code/modules/clothing/masks/miscellaneous.dm | 2 +- code/modules/clothing/masks/smokable.dm | 4 +- code/modules/clothing/shirts/sweaters.dm | 4 +- code/modules/clothing/shirts/syndicate.dm | 2 +- code/modules/clothing/shoes/miscellaneous.dm | 2 +- code/modules/clothing/skirts/job.dm | 2 +- .../clothing/spacesuits/rig/modules/combat.dm | 2 +- .../spacesuits/rig/modules/computer.dm | 4 +- .../spacesuits/rig/modules/modules.dm | 2 +- code/modules/clothing/spacesuits/rig/rig.dm | 4 +- code/modules/clothing/suits/bio.dm | 2 +- code/modules/clothing/suits/dashiki.dm | 6 +-- code/modules/clothing/suits/labcoat.dm | 2 +- code/modules/clothing/suits/miscellaneous.dm | 3 +- code/modules/clothing/suits/wizard.dm | 2 +- code/modules/clothing/webbing/misc.dm | 2 +- .../codex/categories/category_surgery.dm | 2 +- code/modules/codex/entries/guides.dm | 2 +- code/modules/codex/entries/medical.dm | 4 +- code/modules/detectivework/tools/crimekit.dm | 2 +- code/modules/fabrication/_fabricator.dm | 2 +- code/modules/food/plates/plate_tray.dm | 4 +- code/modules/games/boardgame.dm | 2 +- code/modules/games/cards.dm | 4 +- code/modules/gemstones/gemstone_cuts.dm | 2 +- .../integrated_electronics/subtypes/access.dm | 2 +- .../subtypes/manipulation.dm | 4 +- .../subtypes/reagents.dm | 2 +- .../integrated_electronics/subtypes/smart.dm | 2 +- .../random_exoplanet/planet_types/shrouded.dm | 2 +- .../random_exoplanet/planetoid_data.dm | 2 +- .../gasses/material_gas_mundane.dm | 4 +- .../liquids/materials_liquid_chemistry.dm | 4 +- .../liquids/materials_liquid_solvents.dm | 2 +- code/modules/mechs/components/armour.dm | 6 +-- code/modules/mechs/equipment/medical.dm | 2 +- code/modules/mechs/mech_wreckage.dm | 2 +- code/modules/mob/language/synthetic.dm | 2 +- code/modules/mob/living/human/human_verbs.dm | 2 +- code/modules/mob/living/human/life.dm | 2 +- code/modules/mob/living/living.dm | 4 +- .../modules/mob/living/silicon/ai/ai_radio.dm | 2 +- code/modules/mob/living/silicon/ai/power.dm | 4 +- .../living/silicon/robot/drone/drone_say.dm | 2 +- .../mob/living/silicon/robot/robot_items.dm | 2 +- .../hostile/retaliate/exoplanet.dm | 2 +- code/modules/mob/mob.dm | 2 +- .../mob/observer/eye/freelook/chunk.dm | 2 +- .../computers/subtypes/dev_holo.dm | 2 +- .../programs/research/ai_restorer.dm | 2 +- .../modular_computers/hardware/ai_slot.dm | 8 ++-- .../hardware/battery_module.dm | 12 +++--- .../hardware/network_card.dm | 2 +- .../hardware/processor_unit.dm | 4 +- .../modular_computers/terminal/terminal.dm | 2 +- code/modules/nano/interaction/default.dm | 4 +- .../modules/organs/internal/brain_computer.dm | 2 +- code/modules/organs/organ.dm | 2 +- .../overmap/ships/computers/sensors.dm | 2 +- .../overmap/ships/machines/fusion_thruster.dm | 2 +- .../overmap/ships/machines/gas_thruster.dm | 2 +- code/modules/power/apc.dm | 2 +- code/modules/power/cell.dm | 6 +-- code/modules/power/gravitygenerator.dm | 2 +- code/modules/power/port_gen.dm | 2 +- code/modules/power/smes_construction.dm | 4 +- .../projectiles/guns/energy/capacitor.dm | 2 +- .../projectiles/guns/launcher/foam_gun.dm | 4 +- .../projectiles/guns/launcher/syringe_gun.dm | 2 +- .../projectiles/guns/projectile/shotgun.dm | 2 +- code/modules/reagents/Chemistry-Holder.dm | 10 ++--- code/modules/reagents/chems/chems_alcohol.dm | 10 ++--- code/modules/reagents/cocktails.dm | 4 +- .../reagents/reagent_containers/borghydro.dm | 2 +- .../reagent_containers/drinks/bottle.dm | 2 +- .../drinks/cocktailshaker.dm | 2 +- .../reagent_containers/food/canned/_canned.dm | 2 +- .../reagent_containers/food/dairy/cheeses.dm | 2 +- .../reagent_containers/food/junkfood.dm | 4 +- .../reagents/reagent_containers/food/pasta.dm | 2 +- .../food/sliceable/cakes.dm | 4 +- .../reagents/reagent_containers/hypospray.dm | 6 +-- .../reagents/reagent_containers/retort.dm | 2 +- code/modules/recycling/conveyor2.dm | 2 +- code/modules/research/research_fields.dm | 2 +- code/modules/sealant_gun/sealant_gun.dm | 2 +- code/modules/shuttles/shuttle.dm | 4 +- code/modules/shuttles/shuttle_ferry.dm | 2 +- code/modules/shuttles/shuttle_log.dm | 10 ++--- code/modules/surgery/crystal.dm | 2 +- .../real_instruments/Trumpet/trumpet.dm | 2 +- code/modules/tools/subtypes/power_tools.dm | 2 +- code/modules/vehicles/cargo_train.dm | 2 +- .../xenoarcheaology/finds/strange_rock.dm | 2 +- maps/away/liberia/liberia_areas.dm | 4 +- maps/away/magshield/magshield.dm | 4 +- maps/away/unishi/unishi_jobs.dm | 4 +- maps/ministation/ministation_antagonists.dm | 2 +- .../exoplanet_ruins/monoliths/monoliths.dm | 2 +- maps/~mapsystem/maps.dm | 4 +- mods/content/corporate/items/medals.dm | 2 +- mods/content/dungeon_loot/subtypes/exosuit.dm | 6 +-- mods/content/fantasy/datum/cultures.dm | 2 +- .../government/away_sites/icarus/icarus.dm | 4 +- mods/content/modern_earth/datum/religions.dm | 2 +- mods/content/pheromones/pheromone_implant.dm | 2 +- mods/content/pheromones/pheromone_mob.dm | 2 +- .../psionics/datum/antagonists/foundation.dm | 2 +- mods/content/supermatter/items/sm_grenade.dm | 2 +- .../supermatter/overrides/sm_meteor.dm | 2 +- .../adherent/organs/organs_internal.dm | 2 +- mods/species/ascent/items/tools.dm | 4 +- mods/species/vox/datum/factions_vox.dm | 2 +- nano/templates/aicard.tmpl | 40 +++++++++---------- nano/templates/camera_settings.tmpl | 4 +- nano/templates/computer_fabricator.tmpl | 2 +- nano/templates/file_browser.tmpl | 2 +- nano/templates/file_manager.tmpl | 6 +-- nano/templates/network_acl.tmpl | 2 +- nano/templates/network_lock.tmpl | 2 +- nano/templates/network_machine_settings.tmpl | 4 +- nano/templates/network_mainframe.tmpl | 6 +-- nano/templates/network_modem.tmpl | 4 +- nano/templates/network_router.tmpl | 2 +- nano/templates/request_console.tmpl | 2 +- nano/templates/song_editor.tmpl | 2 +- 206 files changed, 344 insertions(+), 345 deletions(-) diff --git a/code/__defines/MC.dm b/code/__defines/MC.dm index ddc5a1c7516..f01b2f95428 100644 --- a/code/__defines/MC.dm +++ b/code/__defines/MC.dm @@ -24,7 +24,7 @@ if (Datum.is_processing) {\ if(Datum.is_processing != #Processor)\ {\ - PRINT_STACK_TRACE("Failed to start processing. [log_info_line(Datum)] is already being processed by [Datum.is_processing] but queue attempt occured on [#Processor]."); \ + PRINT_STACK_TRACE("Failed to start processing. [log_info_line(Datum)] is already being processed by [Datum.is_processing] but queue attempt occurred on [#Processor]."); \ }\ } else {\ Datum.is_processing = Processor._internal_name;\ @@ -36,7 +36,7 @@ if(Datum.is_processing) {\ if(Processor.processing.Remove(Datum)) {\ Datum.is_processing = null;\ } else {\ - PRINT_STACK_TRACE("Failed to stop processing. [log_info_line(Datum)] is being processed by [Datum.is_processing] but de-queue attempt occured on [#Processor]."); \ + PRINT_STACK_TRACE("Failed to stop processing. [log_info_line(Datum)] is being processed by [Datum.is_processing] but de-queue attempt occurred on [#Processor]."); \ }\ } diff --git a/code/__defines/machinery.dm b/code/__defines/machinery.dm index d6591b17acf..b7018659403 100644 --- a/code/__defines/machinery.dm +++ b/code/__defines/machinery.dm @@ -155,7 +155,7 @@ var/global/defer_powernet_rebuild = 0 // True if net rebuild will be called #define PART_CARD /obj/item/stock_parts/computer/card_slot // ID Card slot component of this computer. Mostly for HoP modification console that needs ID slot for modification. #define PART_PRINTER /obj/item/stock_parts/computer/nano_printer // Nano Printer component of this computer, for your everyday paperwork needs. #define PART_DRIVE /obj/item/stock_parts/computer/hard_drive/portable // Portable data storage -#define PART_AI /obj/item/stock_parts/computer/ai_slot // AI slot, an intellicard housing that allows modifications of AIs. +#define PART_AI /obj/item/stock_parts/computer/ai_slot // AI slot, an intelliCard housing that allows modifications of AIs. #define PART_TESLA /obj/item/stock_parts/computer/tesla_link // Tesla Link, Allows remote charging from nearest APC. #define PART_SCANNER /obj/item/stock_parts/computer/scanner // One of several optional scanner attachments. #define PART_D_SLOT /obj/item/stock_parts/computer/drive_slot // Portable drive slot. diff --git a/code/_helpers/text.dm b/code/_helpers/text.dm index e25429b8fe5..103e0b49b97 100644 --- a/code/_helpers/text.dm +++ b/code/_helpers/text.dm @@ -84,7 +84,7 @@ //Run sanitize(), but remove <, >, " first to prevent displaying them as > < &34; in some places after html_encode(). //Best used for sanitize object names, window titles. -//If you have a problem with sanitize() in chat, when quotes and >, < are displayed as html entites - +//If you have a problem with sanitize() in chat, when quotes and >, < are displayed as html entities - //this is a problem of double-encode(when & becomes &), use sanitize() with encode=0, but not the sanitize_safe()! /proc/sanitize_safe(input, max_length = MAX_MESSAGE_LEN, encode = TRUE, trim = TRUE, extra = TRUE, ascii_only = FALSE) return sanitize(replace_characters(input, list(">"=" ","<"=" ", "\""="'")), max_length, encode, trim, extra, ascii_only) diff --git a/code/controllers/subsystems/machines.dm b/code/controllers/subsystems/machines.dm index 674ec094cc6..19a5202daa3 100644 --- a/code/controllers/subsystems/machines.dm +++ b/code/controllers/subsystems/machines.dm @@ -7,7 +7,7 @@ if (Datum.is_processing) {\ if(Datum.is_processing != "SSmachines.[#List]")\ {\ - PRINT_STACK_TRACE("Failed to start processing. [log_info_line(Datum)] is already being processed by [Datum.is_processing] but queue attempt occured on SSmachines.[#List]."); \ + PRINT_STACK_TRACE("Failed to start processing. [log_info_line(Datum)] is already being processed by [Datum.is_processing] but queue attempt occurred on SSmachines.[#List]."); \ }\ } else {\ Datum.is_processing = "SSmachines.[#List]";\ diff --git a/code/datums/extensions/storage/_storage.dm b/code/datums/extensions/storage/_storage.dm index 4ff70967e1c..07d0d087152 100644 --- a/code/datums/extensions/storage/_storage.dm +++ b/code/datums/extensions/storage/_storage.dm @@ -380,7 +380,7 @@ var/global/list/_test_storage_items = list() /datum/storage/proc/can_view(mob/viewer) return (holder in viewer.contents) || viewer.Adjacent(holder) -///Overridable sound playback parameters. Since not all sounds are created equal. +///Overrideable sound playback parameters. Since not all sounds are created equal. /datum/storage/proc/play_open_sound(volume = 50) if(!length(open_sound) || !holder) return diff --git a/code/datums/uplink/ammunition.dm b/code/datums/uplink/ammunition.dm index 2ee116a6b7e..4c0f2ba93ab 100644 --- a/code/datums/uplink/ammunition.dm +++ b/code/datums/uplink/ammunition.dm @@ -50,13 +50,13 @@ /datum/uplink_item/item/ammo/shotgun_shells name = "Ammobox of Shotgun Shells" - desc = "An ammobox with 2 sets of shell holders. Contains 8 buckshot shells total." + desc = "An ammo box with 2 sets of shell holders. Contains 8 buckshot shells total." item_cost = 8 path = /obj/item/box/ammo/shotgunshells /datum/uplink_item/item/ammo/shotgun_slugs name = "Ammobox of Shotgun Slugs" - desc = "An ammobox with 2 sets of shell holders. Contains 8 slugs total." + desc = "An ammo box with 2 sets of shell holders. Contains 8 slugs total." item_cost = 8 path = /obj/item/box/ammo/shotgunammo diff --git a/code/datums/uplink/badassery.dm b/code/datums/uplink/badassery.dm index 14954c31afd..43375e941cb 100644 --- a/code/datums/uplink/badassery.dm +++ b/code/datums/uplink/badassery.dm @@ -11,7 +11,7 @@ /datum/uplink_item/item/badassery/balloon/random name = "For showing 'Whatevah~' (Useless Balloon)" - desc = "Randomly selects a ballon for you!" + desc = "Randomly selects a balloon for you!" path = /obj/item/toy/balloon /datum/uplink_item/item/badassery/balloon/random/get_goods(var/obj/item/uplink/U, var/loc) diff --git a/code/datums/uplink/devices_and_tools.dm b/code/datums/uplink/devices_and_tools.dm index a6628ebabef..7536a5d6561 100644 --- a/code/datums/uplink/devices_and_tools.dm +++ b/code/datums/uplink/devices_and_tools.dm @@ -104,7 +104,7 @@ /datum/uplink_item/item/tools/flashdark name = "Flashdark" - desc = "A device similar to a flash light that absorbs the surrounding light, casting a shadowy, black mass." + desc = "A device similar to a flashlight that absorbs the surrounding light, casting a shadowy, black mass." item_cost = 32 path = /obj/item/flashlight/flashdark diff --git a/code/datums/uplink/highly_visible_and_dangerous_weapons.dm b/code/datums/uplink/highly_visible_and_dangerous_weapons.dm index 097666428c6..0d08c3dd7cd 100644 --- a/code/datums/uplink/highly_visible_and_dangerous_weapons.dm +++ b/code/datums/uplink/highly_visible_and_dangerous_weapons.dm @@ -51,7 +51,7 @@ /datum/uplink_item/item/visible_weapons/energy_gun name = "Energy Gun" - desc = "A energy based sidearm with three different lethality settings." + desc = "An energy based sidearm with three different lethality settings." item_cost = 32 path = /obj/item/gun/energy/gun @@ -71,14 +71,14 @@ //These are for traitors (or other antags, perhaps) to have the option of purchasing some merc gear. /datum/uplink_item/item/visible_weapons/smg name = "Standard Submachine Gun" - desc = "A quick-firing weapon with three togglable fire modes." + desc = "A quick-firing weapon with three toggleable fire modes." item_cost = 52 path = /obj/item/gun/projectile/automatic/smg antag_roles = list(/decl/special_role/mercenary) /datum/uplink_item/item/visible_weapons/assaultrifle name = "Assault Rifle" - desc = "A common rifle with three togglable fire modes." + desc = "A common rifle with three toggleable fire modes." item_cost = 60 path = /obj/item/gun/projectile/automatic/assault_rifle antag_roles = list(/decl/special_role/mercenary) @@ -98,7 +98,7 @@ /datum/uplink_item/item/visible_weapons/combat_shotgun name = "Pump Shotgun" - desc = "A high compacity, pump-action shotgun regularly used for repelling boarding parties in close range scenarios." + desc = "A high capacity, pump-action shotgun regularly used for repelling boarding parties in close range scenarios." item_cost = 52 path = /obj/item/gun/projectile/shotgun/pump antag_roles = list(/decl/special_role/mercenary) @@ -111,7 +111,7 @@ /datum/uplink_item/item/visible_weapons/flechetterifle name = "Flechette Rifle" - desc = "A railgun with two togglable fire modes, able to launch flechette ammunition at incredible speeds." + desc = "A railgun with two toggleable fire modes, able to launch flechette ammunition at incredible speeds." item_cost = 60 path = /obj/item/gun/magnetic/railgun/flechette antag_roles = list(/decl/special_role/mercenary) diff --git a/code/datums/uplink/implants.dm b/code/datums/uplink/implants.dm index 94bdff821a2..0495c267c1b 100644 --- a/code/datums/uplink/implants.dm +++ b/code/datums/uplink/implants.dm @@ -6,7 +6,7 @@ /datum/uplink_item/item/implants/imp_freedom name = "Freedom Implant" - desc = "An implant with an emotive trigger that can break you free of restraints. Show Security who has the real upperhand!" + desc = "An implant with an emotive trigger that can break you free of restraints. Show Security who has the real upper hand!" item_cost = 24 path = /obj/item/box/syndie_kit/imp_freedom diff --git a/code/datums/uplink/medical.dm b/code/datums/uplink/medical.dm index 599c0f83f6a..4aef274b938 100644 --- a/code/datums/uplink/medical.dm +++ b/code/datums/uplink/medical.dm @@ -18,7 +18,7 @@ /datum/uplink_item/item/medical/stasis name = "Stasis Bag" - desc = "Reusable bag designed to slow down life functions of occupant, especially useful if short on time or in a hostile enviroment." + desc = "Reusable bag designed to slow down life functions of occupant, especially useful if short on time or in a hostile environment." item_cost = 24 path = /obj/item/bodybag/cryobag diff --git a/code/datums/uplink/stealthy_and_inconspicuous_weapons.dm b/code/datums/uplink/stealthy_and_inconspicuous_weapons.dm index d085b9438d9..45deaffbf37 100644 --- a/code/datums/uplink/stealthy_and_inconspicuous_weapons.dm +++ b/code/datums/uplink/stealthy_and_inconspicuous_weapons.dm @@ -17,7 +17,7 @@ /datum/uplink_item/item/stealthy_weapons/concealed_cane name = "Concealed Cane Sword" - desc = "A cane used by a true gentlemen, especially ones with sharp intentions." + desc = "A cane used by a true gentleman, especially ones with sharp intentions." item_cost = 8 path = /obj/item/cane/fancy/sword diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 56b88e8f986..ea8bcbc016f 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -192,7 +192,7 @@ var/global/list/wireColourNames = list("darkred" = "dark red") usr.unset_machine(holder) // -// Overridable Procs +// Overrideable Procs // // Called when wires cut/mended. diff --git a/code/game/machinery/_machines_base/machinery_public_vars.dm b/code/game/machinery/_machines_base/machinery_public_vars.dm index d1288ef7817..594aa0238e0 100644 --- a/code/game/machinery/_machines_base/machinery_public_vars.dm +++ b/code/game/machinery/_machines_base/machinery_public_vars.dm @@ -17,7 +17,7 @@ Must be implemented by subtypes. // Reads off the var value and returns it /decl/public_access/public_variable/proc/access_var(datum/owner) -// Writes to the var. Returns true if change occured, false otherwise. +// Writes to the var. Returns true if change occurred, false otherwise. // Subtypes shall call parent, and perform the actual write if the return value is true. // If the var has_updates, you must never modify the var except through this proc. /decl/public_access/public_variable/proc/write_var(datum/owner, new_value) diff --git a/code/game/machinery/_machines_base/stock_parts/legacy_parts.dm b/code/game/machinery/_machines_base/stock_parts/legacy_parts.dm index 15cc987b406..82c1e173619 100644 --- a/code/game/machinery/_machines_base/stock_parts/legacy_parts.dm +++ b/code/game/machinery/_machines_base/stock_parts/legacy_parts.dm @@ -169,7 +169,7 @@ /obj/item/stock_parts/subspace/filter name = "hyperwave filter" icon_state = "hyperwave_filter" - desc = "A tiny device capable of filtering and converting super-intense radiowaves." + desc = "A tiny device capable of filtering and converting super-intense radio waves." origin_tech = @'{"programming":4,"magnets":2}' material = /decl/material/solid/metal/steel matter = list(/decl/material/solid/metal/silver = MATTER_AMOUNT_REINFORCEMENT) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 1028e2d4098..11d4e5c9b63 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -667,7 +667,7 @@ var/device_id = href_list["id_tag"] switch(href_list["command"]) if("set_external_pressure") - var/input_pressure = input(user, "What pressure you like the system to mantain?", "Pressure Controls") as num|null + var/input_pressure = input(user, "What pressure you like the system to maintain?", "Pressure Controls") as num|null if(isnum(input_pressure) && CanUseTopic(user, state)) send_signal(device_id, list(href_list["command"] = input_pressure)) return TOPIC_REFRESH diff --git a/code/game/machinery/embedded_controller/airlock_controllers_dummy.dm b/code/game/machinery/embedded_controller/airlock_controllers_dummy.dm index dabbb7680fb..66aa8d5c057 100644 --- a/code/game/machinery/embedded_controller/airlock_controllers_dummy.dm +++ b/code/game/machinery/embedded_controller/airlock_controllers_dummy.dm @@ -1,7 +1,7 @@ ///Provides remote access to a controller (since they must be unique). /obj/machinery/dummy_airlock_controller name = "remote airlock control terminal" - desc = "A secondary airlock control terminal meant to be subordinated to a master airlock control terminal to allow remotely controlling the later from the former." + desc = "A secondary airlock control terminal meant to be subordinated to a master airlock control terminal to allow remotely controlling the latter from the former." icon = 'icons/obj/airlock_machines.dmi' icon_state = "airlock_control_off" layer = ABOVE_OBJ_LAYER diff --git a/code/game/machinery/mech_recharger.dm b/code/game/machinery/mech_recharger.dm index bd9e8be6936..5c2449e37ed 100644 --- a/code/game/machinery/mech_recharger.dm +++ b/code/game/machinery/mech_recharger.dm @@ -1,6 +1,6 @@ /obj/machinery/mech_recharger name = "exosuit dock" - desc = "A exosuit recharger, built into the floor." + desc = "An exosuit recharger, built into the floor." icon = 'icons/mecha/mech_bay.dmi' icon_state = "recharge_floor" density = FALSE diff --git a/code/game/machinery/self_destruct_storage.dm b/code/game/machinery/self_destruct_storage.dm index d8cd3e9d3a0..afaf920ef1d 100644 --- a/code/game/machinery/self_destruct_storage.dm +++ b/code/game/machinery/self_destruct_storage.dm @@ -1,6 +1,6 @@ /obj/machinery/nuclear_cylinder_storage name = "nuclear cylinder storage" - desc = "It's a secure, armored storage unit embeded into the floor for storing the nuclear cylinders." + desc = "It's a secure, armored storage unit embedded into the floor for storing the nuclear cylinders." icon = 'icons/obj/machines/self_destruct_storage.dmi' icon_state = "base" anchored = TRUE diff --git a/code/game/machinery/vending/food.dm b/code/game/machinery/vending/food.dm index 8abc07f5536..2a4fb62f335 100644 --- a/code/game/machinery/vending/food.dm +++ b/code/game/machinery/vending/food.dm @@ -198,7 +198,7 @@ /obj/machinery/vending/cola name = "Robust Softdrinks" - desc = "A softdrink vendor provided by Robust Industries, LLC." + desc = "A soft drinks vendor provided by Robust Industries, LLC." icon = 'icons/obj/machines/vending/drinks.dmi' vend_delay = 11 base_type = /obj/machinery/vending/cola diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index bf5c3741630..6f573835da3 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -9,7 +9,7 @@ /obj/machinery/washing_machine name = "washing machine" - desc = "A commerical washing machine used to wash clothing items and linens. It requires detergent for efficient washing." + desc = "A commercial washing machine used to wash clothing items and linens. It requires detergent for efficient washing." icon = 'icons/obj/machines/washing_machine.dmi' icon_state = "wm_00" density = TRUE diff --git a/code/game/objects/items/blackout.dm b/code/game/objects/items/blackout.dm index d0528dc93ec..4bc3d51b6f4 100644 --- a/code/game/objects/items/blackout.dm +++ b/code/game/objects/items/blackout.dm @@ -9,7 +9,7 @@ /obj/item/blackout name = "blackout pulser" - desc = "A complicated eletronic device of unknown purpose" + desc = "A complicated electronic device of unknown purpose." icon = 'icons/obj/items/blackout.dmi' icon_state = "device_blackout-off" max_health = ITEM_HEALTH_NO_DAMAGE diff --git a/code/game/objects/items/cryobag.dm b/code/game/objects/items/cryobag.dm index b9dd96121a5..b5d5f68a3e0 100644 --- a/code/game/objects/items/cryobag.dm +++ b/code/game/objects/items/cryobag.dm @@ -2,7 +2,7 @@ /obj/item/bodybag/cryobag name = "stasis bag" desc = "A folded, reusable bag designed to prevent additional damage to an occupant, especially useful if short on time or in \ - a hostile enviroment." + a hostile environment." icon = 'icons/obj/closets/cryobag.dmi' icon_state = "bodybag_folded" origin_tech = @'{"biotech":4}' @@ -25,7 +25,7 @@ /obj/structure/closet/body_bag/cryobag name = "stasis bag" desc = "A reusable plastic bag designed to prevent additional damage to an occupant, especially useful if short on time or in \ - a hostile enviroment." + a hostile environment." icon = 'icons/obj/closets/cryobag.dmi' item_path = /obj/item/bodybag/cryobag material = /decl/material/solid/organic/plastic diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index ffd39d55806..9516a2a65a5 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -1,5 +1,5 @@ /obj/item/aicard - name = "inteliCard" + name = "intelliCard" icon = 'icons/obj/items/device/ai_card.dmi' icon_state = ICON_STATE_WORLD w_class = ITEM_SIZE_SMALL diff --git a/code/game/objects/items/devices/boombox.dm b/code/game/objects/items/devices/boombox.dm index aef407430fd..1b9c5ecbc42 100644 --- a/code/game/objects/items/devices/boombox.dm +++ b/code/game/objects/items/devices/boombox.dm @@ -1,6 +1,6 @@ /obj/item/boombox name = "boombox" - desc = "A device used to emit rhythmic sounds, colloquialy refered to as a 'boombox'. It's in a retro style (massive), and absolutely unwieldy." + desc = "A device used to emit rhythmic sounds, colloquially referred to as a 'boombox'. It's in a retro style (massive), and absolutely unwieldy." icon = 'icons/obj/items/device/boombox.dmi' icon_state = "off" item_state = "boombox" diff --git a/code/game/objects/items/devices/personal_shield.dm b/code/game/objects/items/devices/personal_shield.dm index 95be1abc466..c83b7522cc8 100644 --- a/code/game/objects/items/devices/personal_shield.dm +++ b/code/game/objects/items/devices/personal_shield.dm @@ -1,6 +1,6 @@ /obj/item/personal_shield name = "personal shield" - desc = "Truely a life-saver: this device protects its user from being hit by objects moving very, very fast, though only for a few shots." + desc = "Truly a lifesaver: this device protects its user from being hit by objects moving very, very fast, though only for a few shots." icon = 'icons/obj/items/weapon/batterer.dmi' icon_state = ICON_STATE_WORLD material = /decl/material/solid/organic/plastic diff --git a/code/game/objects/items/devices/radio/headsets_shared.dm b/code/game/objects/items/devices/radio/headsets_shared.dm index 6c5551ea983..ead756343e3 100644 --- a/code/game/objects/items/devices/radio/headsets_shared.dm +++ b/code/game/objects/items/devices/radio/headsets_shared.dm @@ -52,7 +52,7 @@ /obj/item/radio/headset/headset_sci name = "science radio headset" - desc = "A sciency headset. Like usual." + desc = "A science-y headset. Like usual." icon = 'icons/obj/items/device/radio/headsets/headset_science.dmi' encryption_keys = list(/obj/item/encryptionkey/sci) @@ -63,7 +63,7 @@ /obj/item/radio/headset/headset_eng name = "engineering radio headset" - desc = "When the engineers wish to gossip like highschoolers." + desc = "When the engineers wish to gossip like high-schoolers." icon = 'icons/obj/items/device/radio/headsets/headset_engineering.dmi' encryption_keys = list(/obj/item/encryptionkey/eng) diff --git a/code/game/objects/items/flame/flame_fuelled_lighter_zippo.dm b/code/game/objects/items/flame/flame_fuelled_lighter_zippo.dm index 6869f3eedd1..50a734b487f 100644 --- a/code/game/objects/items/flame/flame_fuelled_lighter_zippo.dm +++ b/code/game/objects/items/flame/flame_fuelled_lighter_zippo.dm @@ -1,6 +1,6 @@ /obj/item/flame/fuelled/lighter/zippo name = "zippo lighter" - desc = "It's a zippo-styled lighter, using a replacable flint in a fetching steel case. It makes a clicking sound that everyone loves." + desc = "It's a zippo-styled lighter, using a replaceable flint in a fetching steel case. It makes a clicking sound that everyone loves." icon = 'icons/obj/items/flame/zippo.dmi' max_fuel = 10 material = /decl/material/solid/metal/stainlesssteel diff --git a/code/game/objects/items/flashlights/floodlamp.dm b/code/game/objects/items/flashlights/floodlamp.dm index 3c8eb02b88a..c98063000b8 100644 --- a/code/game/objects/items/flashlights/floodlamp.dm +++ b/code/game/objects/items/flashlights/floodlamp.dm @@ -1,7 +1,7 @@ //hand portable floodlights for emergencies. Less bulky than the large ones. But also less light. Unused green variant in the sheet. /obj/item/flashlight/lamp/floodlamp name = "flood lamp" - desc = "A portable emergency flood light with a ultra-bright LED." + desc = "A portable emergency floodlight with a ultra-bright LED." icon = 'icons/obj/lighting/floodlamp.dmi' on = 0 w_class = ITEM_SIZE_LARGE diff --git a/code/game/objects/items/flashlights/lavalamp.dm b/code/game/objects/items/flashlights/lavalamp.dm index 92f434c8852..e5d123aa20a 100644 --- a/code/game/objects/items/flashlights/lavalamp.dm +++ b/code/game/objects/items/flashlights/lavalamp.dm @@ -1,7 +1,7 @@ //Lava Lamps: Because we're already stuck in the 70ies with those fax machines. /obj/item/flashlight/lamp/lava name = "lava lamp" - desc = "A kitchy throwback decorative light. Noir Edition." + desc = "A kitschy throwback decorative light. Noir Edition." icon = 'icons/obj/lighting/lavalamp.dmi' icon_state = "lavalamp" on = 0 @@ -22,32 +22,32 @@ add_overlay(I) /obj/item/flashlight/lamp/lava/red - desc = "A kitchy red decorative light." + desc = "A kitschy red decorative light." light_color = COLOR_RED /obj/item/flashlight/lamp/lava/blue - desc = "A kitchy blue decorative light" + desc = "A kitschy blue decorative light" light_color = COLOR_BLUE /obj/item/flashlight/lamp/lava/cyan - desc = "A kitchy cyan decorative light" + desc = "A kitschy cyan decorative light" light_color = COLOR_CYAN /obj/item/flashlight/lamp/lava/green - desc = "A kitchy green decorative light" + desc = "A kitschy green decorative light" light_color = COLOR_GREEN /obj/item/flashlight/lamp/lava/orange - desc = "A kitchy orange decorative light" + desc = "A kitschy orange decorative light" light_color = COLOR_ORANGE /obj/item/flashlight/lamp/lava/purple - desc = "A kitchy purple decorative light" + desc = "A kitschy purple decorative light" light_color = COLOR_PURPLE /obj/item/flashlight/lamp/lava/pink - desc = "A kitchy pink decorative light" + desc = "A kitschy pink decorative light" light_color = COLOR_PINK /obj/item/flashlight/lamp/lava/yellow - desc = "A kitchy yellow decorative light" + desc = "A kitschy yellow decorative light" light_color = COLOR_YELLOW diff --git a/code/game/objects/items/lockpicks.dm b/code/game/objects/items/lockpicks.dm index cc799780b68..99c3eccabbe 100644 --- a/code/game/objects/items/lockpicks.dm +++ b/code/game/objects/items/lockpicks.dm @@ -35,7 +35,7 @@ /obj/item/lockpick_roll name = "roll of lockpicks" - desc = "A stitched roll used to store thin, strangely-shaped tools commonly used used to pick locks." + desc = "A stitched roll used to store thin, strangely-shaped tools commonly used to pick locks." icon = 'icons/obj/items/lockpick_roll.dmi' icon_state = ICON_STATE_WORLD material = /decl/material/solid/organic/leather diff --git a/code/game/objects/items/paintkit.dm b/code/game/objects/items/paintkit.dm index 576c58a9dc6..fc70e8902a5 100644 --- a/code/game/objects/items/paintkit.dm +++ b/code/game/objects/items/paintkit.dm @@ -71,12 +71,12 @@ // Mechs are handled in their attackby (mech_interaction.dm). /obj/item/kit/paint name = "exosuit decal kit" - desc = "A kit containing all the needed tools and parts to repaint a exosuit." + desc = "A kit containing all the needed tools and parts to repaint an exosuit." abstract_type = /obj/item/kit/paint /obj/item/kit/paint/examine(mob/user) . = ..() - to_chat(user, "This kit will add a '[new_name]' decal to a exosuit'.") + to_chat(user, "This kit will add a '[new_name]' decal to an exosuit'.") // exosuit kits. /obj/item/kit/paint/flames_red diff --git a/code/game/objects/items/rescuebag.dm b/code/game/objects/items/rescuebag.dm index da10d3c8500..6e69603618e 100644 --- a/code/game/objects/items/rescuebag.dm +++ b/code/game/objects/items/rescuebag.dm @@ -2,7 +2,7 @@ /obj/item/bodybag/rescue name = "rescue bag" desc = "A folded, reusable bag designed to prevent additional damage to an occupant, especially useful if short on time or in \ - a hostile enviroment." + a hostile environment." icon = 'icons/obj/closets/rescuebag.dmi' icon_state = "folded" origin_tech = @'{"biotech":2}' @@ -60,7 +60,7 @@ /obj/structure/closet/body_bag/rescue name = "rescue bag" desc = "A reusable plastic bag designed to prevent additional damage to an occupant, especially useful if short on time or in \ - a hostile enviroment." + a hostile environment." icon = 'icons/obj/closets/rescuebag.dmi' item_path = /obj/item/bodybag/rescue storage_types = CLOSET_STORAGE_MOBS diff --git a/code/game/objects/items/stacks/medical/medical_resin.dm b/code/game/objects/items/stacks/medical/medical_resin.dm index 78d0ef6eea8..c7ab7c5f060 100644 --- a/code/game/objects/items/stacks/medical/medical_resin.dm +++ b/code/game/objects/items/stacks/medical/medical_resin.dm @@ -1,7 +1,7 @@ /obj/item/stack/medical/resin name = "resin patches" singular_name = "resin patch" - desc = "A resin-based patching kit used to repair crystalline bodyparts. The label is written in a colourful, angular, unreadable script." + desc = "A resin-based patching kit used to repair crystalline body parts. The label is written in a colourful, angular, unreadable script." icon_state = "resin-pack" heal_brute = 10 heal_burn = 10 @@ -12,7 +12,7 @@ /obj/item/stack/medical/resin/crafted name = "resin globules" - desc = "A lump of slick, shiny resin. Used to repair damage to crystalline bodyparts." + desc = "A lump of slick, shiny resin. Used to repair damage to crystalline body parts." singular_name = "resin globule" icon_state = "resin-lump" heal_brute = 5 diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 02e51277a75..028e5a4a01a 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -10,7 +10,7 @@ /obj/item/stack/tile name = "tile" singular_name = "tile" - desc = "A non-descript floor tile." + desc = "A nondescript floor tile." randpixel = 7 w_class = ITEM_SIZE_NORMAL max_amount = 100 @@ -319,7 +319,7 @@ /obj/item/stack/tile/roof name = "roofing tile" singular_name = "roofing tile" - desc = "A non-descript roofing tile." + desc = "A nondescript roofing tile." matter_multiplier = 0.3 icon_state = "tile" material = /decl/material/solid/metal/steel diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 53ec5ef987f..6a100e47600 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -388,12 +388,12 @@ /obj/item/toy/figure/geneticist name = "Geneticist action figure" - desc = "A \"Space Life\" brand Geneticist action figure, which was recently dicontinued." + desc = "A \"Space Life\" brand Geneticist action figure, which was recently discontinued." icon_state = "geneticist" /obj/item/toy/figure/hop - name = "Head of Personel action figure" - desc = "A \"Space Life\" brand Head of Personel action figure." + name = "Head of Personnel action figure" + desc = "A \"Space Life\" brand Head of Personnel action figure." icon_state = "hop" /obj/item/toy/figure/hos @@ -576,9 +576,7 @@ //Office Desk Toys /obj/item/toy/desk - name = "desk toy master" - desc = "A object that does not exist. Parent Item" - + abstract_type = /obj/item/toy/desk var/on = 0 var/activation_sound = 'sound/effects/flashlight.ogg' @@ -598,7 +596,7 @@ /obj/item/toy/desk/newtoncradle name = "\improper Newton's cradle" - desc = "A ancient 21th century super-weapon model demonstrating that Sir Isaac Newton is the deadliest sonuvabitch in space." + desc = "An ancient 21st century super-weapon model demonstrating that Sir Isaac Newton is the deadliest sonuvabitch in space." icon_state = "newtoncradle" /obj/item/toy/desk/fan @@ -613,7 +611,7 @@ /obj/item/toy/desk/dippingbird name = "dipping bird toy" - desc = "A ancient human bird idol, worshipped by clerks and desk jockeys." + desc = "An ancient human bird idol, worshipped by clerks and desk jockeys." icon_state= "dippybird" // tg station ports diff --git a/code/game/objects/items/waterskin.dm b/code/game/objects/items/waterskin.dm index 73852feaef0..a9b1b3261a6 100644 --- a/code/game/objects/items/waterskin.dm +++ b/code/game/objects/items/waterskin.dm @@ -44,7 +44,7 @@ add_overlay(stopper_overlay) /obj/item/chems/glass/waterskin/crafted - desc = "A long and rather unwieldly water-carrying vessel." + desc = "A long and rather unwieldy water-carrying vessel." icon = 'icons/obj/items/waterskin_crafted.dmi' material = /decl/material/solid/organic/leather color = /decl/material/solid/organic/leather::color diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index f367fe6ebb2..e8e041f2301 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -75,7 +75,7 @@ icon_state = "data_2" /obj/item/card/data/disk - desc = "A plastic magstripe card for simple and speedy data storage and transfer. This one inexplicibly looks like a floppy disk." + desc = "A plastic magstripe card for simple and speedy data storage and transfer. This one inexplicably looks like a floppy disk." icon_state = "data_3" /obj/item/card/data/get_assembly_detail_color() diff --git a/code/game/objects/items/weapons/circuitboards/wall.dm b/code/game/objects/items/weapons/circuitboards/wall.dm index 6aab1dd838e..fe150c173d2 100644 --- a/code/game/objects/items/weapons/circuitboards/wall.dm +++ b/code/game/objects/items/weapons/circuitboards/wall.dm @@ -4,7 +4,7 @@ name = "circuitboard (fire alarm)" icon = 'icons/obj/doors/door_assembly.dmi' icon_state = "door_electronics" - desc = "A circuit. It has a label on it, it says \"Can handle heat levels up to 40 degrees celsius!\"." + desc = "A circuit. It has a label on it, it says \"Can handle heat levels up to 40 degrees Celsius!\"." build_path = /obj/machinery/firealarm board_type = "wall" origin_tech = @'{"programming":1,"engineering":1}' diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index cdaab55ecaa..5b9e2a62d93 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -465,7 +465,7 @@ /obj/item/shockpaddles/robot name = "defibrillator paddles" - desc = "A pair of advanced shockpaddles powered by a robot's internal power cell, able to penetrate thick clothing." + desc = "A pair of advanced shock paddles powered by a robot's internal power cell, able to penetrate thick clothing." chargecost = 50 combat = 1 cooldowntime = (3 SECONDS) @@ -542,7 +542,7 @@ */ /obj/item/shockpaddles/standalone - desc = "A pair of shockpaddles powered by an experimental miniaturized reactor" //Inspired by the advanced e-gun + desc = "A pair of shock paddles powered by an experimental miniaturized reactor" //Inspired by the advanced e-gun var/fail_counter = 0 /obj/item/shockpaddles/standalone/Destroy() diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index db8e711d562..f67a1791c48 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -1,6 +1,6 @@ /obj/item/dice name = "d6" - desc = "A dice with six sides." + desc = "A die with six sides." icon = 'icons/obj/dice.dmi' icon_state = "d66" w_class = ITEM_SIZE_TINY @@ -37,31 +37,31 @@ /obj/item/dice/d4 name = "d4" - desc = "A dice with four sides." + desc = "A die with four sides." icon_state = "d44" sides = 4 /obj/item/dice/d8 name = "d8" - desc = "A dice with eight sides." + desc = "A die with eight sides." icon_state = "d88" sides = 8 /obj/item/dice/d10 name = "d10" - desc = "A dice with ten sides." + desc = "A die with ten sides." icon_state = "d1010" sides = 10 /obj/item/dice/d12 name = "d12" - desc = "A dice with twelve sides." + desc = "A die with twelve sides." icon_state = "d1212" sides = 12 /obj/item/dice/d20 name = "d20" - desc = "A dice with twenty sides." + desc = "A die with twenty sides." icon_state = "d2020" sides = 20 @@ -76,7 +76,7 @@ /obj/item/dice/d100 name = "d100" - desc = "A dice with ten sides. This one is for the tens digit." + desc = "A die with ten sides. This one is for the tens digit." icon_state = "d10010" sides = 10 diff --git a/code/game/objects/items/weapons/ecigs.dm b/code/game/objects/items/weapons/ecigs.dm index 0a55a70a950..11fa6ec87de 100644 --- a/code/game/objects/items/weapons/ecigs.dm +++ b/code/game/objects/items/weapons/ecigs.dm @@ -64,7 +64,7 @@ /obj/item/clothing/mask/smokable/ecig/deluxe name = "deluxe electronic cigarette" - desc = "A premium model eGavana MK3 electronic cigarette, shaped like a cigar." + desc = "A premium model eHavana MK3 electronic cigarette, shaped like a cigar." icon = 'icons/clothing/mask/smokables/cigarette_electronic_deluxe.dmi' /obj/item/clothing/mask/smokable/ecig/deluxe/setup_power_supply(loaded_cell_type, accepted_cell_type, power_supply_extension_type, charge_value) diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index 69ac907bcac..138a3b7df34 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -91,7 +91,7 @@ detonate() /obj/item/grenade/flashbang/clusterbang//Created by Polymorph, fixed by Sieve - desc = "Use of this weapon may constiute a war crime in your area, consult your local captain." + desc = "Use of this weapon may constitute a war crime in your area, consult your local captain." name = "clusterbang" icon = 'icons/obj/items/grenades/clusterbang.dmi' diff --git a/code/game/objects/items/weapons/material/coins.dm b/code/game/objects/items/weapons/material/coins.dm index 19198cdc5bd..1cdd0270a96 100644 --- a/code/game/objects/items/weapons/material/coins.dm +++ b/code/game/objects/items/weapons/material/coins.dm @@ -16,7 +16,7 @@ . = ..() icon_state = "coin[rand(1,10)]" if(material) - desc = "A old-style coin stamped out of [material.solid_name]." + desc = "An old-style coin stamped out of [material.solid_name]." set_extension(src, /datum/extension/tool, list(TOOL_SCREWDRIVER = TOOL_QUALITY_BAD)) // "Coin Flipping, A.wav" by InspectorJ (www.jshaw.co.uk) of Freesound.org diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm index 9df9b46dc09..6a227fb7f93 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -119,7 +119,7 @@ //Utility knives /obj/item/knife/utility name = "utility knife" - desc = "An utility knife with a polymer handle, commonly used through human space." + desc = "A utility knife with a polymer handle, commonly used through human space." icon = 'icons/obj/items/weapon/knives/utility.dmi' w_class = ITEM_SIZE_SMALL draw_handle = TRUE diff --git a/code/game/objects/items/weapons/material/swiss.dm b/code/game/objects/items/weapons/material/swiss.dm index 44f237dc853..69d051a3aa9 100644 --- a/code/game/objects/items/weapons/material/swiss.dm +++ b/code/game/objects/items/weapons/material/swiss.dm @@ -150,7 +150,7 @@ /obj/item/knife/folding/swiss/explorer name = "explorer's combi-knife" - desc = "A small, purple, multi-purpose folding knife. This one adds a wood saw and pry bar." + desc = "A small, purple, multi-purpose folding knife. This one adds a wood saw and prybar." handle_color = COLOR_PURPLE tools = list(SWISSKNF_LBLADE, SWISSKNF_SBLADE, SWISSKNF_CLIFTER, SWISSKNF_COPENER, SWISSKNF_WBLADE, SWISSKNF_CROWBAR) diff --git a/code/game/objects/items/weapons/storage/basket.dm b/code/game/objects/items/weapons/storage/basket.dm index 8c7661451a9..b16df16f575 100644 --- a/code/game/objects/items/weapons/storage/basket.dm +++ b/code/game/objects/items/weapons/storage/basket.dm @@ -22,4 +22,4 @@ icon = 'icons/obj/items/storage/baskets/basket_large.dmi' w_class = ITEM_SIZE_GARGANTUAN storage = /datum/storage/basket/large - slowdown_general = 1 // Large and unwieldly + slowdown_general = 1 // Large and unwieldy diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 639d83a1754..7e8de5593b2 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -284,7 +284,7 @@ /obj/item/box/trackimp name = "boxed tracking implant kit" - desc = "Box full of scum-bag tracking utensils." + desc = "Box full of scumbag-tracking utensils." icon_state = "implant" /obj/item/box/trackimp/WillContain() return list(/obj/item/implantcase/tracking = 4, @@ -567,7 +567,7 @@ /obj/item/box/armband/engine name = "box of spare engineering armbands" - desc = "A box full of engineering armbands. For use in emergencies when provisional engineering peronnel are needed." + desc = "A box full of engineering armbands. For use in emergencies when provisional engineering personnel are needed." /obj/item/box/armband/engine/WillContain() return list(/obj/item/clothing/armband/engine = 5) @@ -717,7 +717,7 @@ /obj/item/box/parts_pack name = "parts pack" - desc = "A densely-stuffed box containing some small eletrical parts." + desc = "A densely-stuffed box containing some small electrical parts." icon = 'icons/obj/items/storage/part_pack.dmi' icon_state = "part" w_class = ITEM_SIZE_SMALL diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm index 1a0d7dd5c71..921f4897796 100644 --- a/code/game/objects/items/weapons/storage/misc.dm +++ b/code/game/objects/items/weapons/storage/misc.dm @@ -93,7 +93,7 @@ /obj/item/chewables/rollable/fine name = "bag of Golden Sol tobacco" - desc = "A exclusive brand of overpriced tobacco, allegedly grown at a lagrange point station in Sol system." + desc = "An exclusive brand of overpriced tobacco, allegedly grown at a lagrange point station in Sol system." icon_state = "rollfine" /obj/item/chewables/rollable/fine/WillContain() @@ -132,7 +132,7 @@ /obj/item/chewables/candy/cookies name = "pack of Getmore Cookies" - desc = "A pack of delicious cookies, and possibly the only product in Getmores Chocolate Corp lineup that has any trace of chocolate in it." + desc = "A pack of delicious cookies, and possibly the only product in Getmore Chocolate Corp's lineup that has any trace of chocolate in it." icon_state = "cookiebag" storage = /datum/storage/chewables/cookies diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index 44fa64eac6f..d0bbb3899cd 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -110,8 +110,8 @@ starting_pressure = list(/decl/material/gas/carbon_dioxide = 6 ATM) /obj/item/tank/jetpack/rig - name = "integrated manuvering module thrusterpack" - desc = "The 'manuvering' part of a manuvering jet module for a hardsuit. You could... probably use this standalone?" + name = "integrated maneuvering module thrusterpack" + desc = "The 'maneuvering' part of a maneuvering jet module for a hardsuit. You could... probably use this standalone?" starting_pressure = list(/decl/material/gas/oxygen = 6 ATM) var/obj/item/rig/holder diff --git a/code/game/objects/random/subtypes/tech.dm b/code/game/objects/random/subtypes/tech.dm index 26c05712213..23c298283fa 100644 --- a/code/game/objects/random/subtypes/tech.dm +++ b/code/game/objects/random/subtypes/tech.dm @@ -15,8 +15,8 @@ return spawnable_choices /obj/random/powercell - name = "random powercell" - desc = "This is a random powercell." + name = "random power cell" + desc = "This is a random power cell." icon = 'icons/obj/power.dmi' icon_state = "hcell" diff --git a/code/game/objects/random/subtypes/tools.dm b/code/game/objects/random/subtypes/tools.dm index 0e4c773171f..ed0a73164cb 100644 --- a/code/game/objects/random/subtypes/tools.dm +++ b/code/game/objects/random/subtypes/tools.dm @@ -17,8 +17,8 @@ return spawnable_choices /obj/random/tool/power - name = "random powertool" - desc = "This is a random rare powertool for maintenance" + name = "random power tool" + desc = "This is a random rare power tool for maintenance" /obj/random/tool/power/spawn_choices() var/static/list/spawnable_choices = list( diff --git a/code/game/objects/structures/chemistry/_chemistry.dm b/code/game/objects/structures/chemistry/_chemistry.dm index 338fdd8a24b..7050d2f9ee8 100644 --- a/code/game/objects/structures/chemistry/_chemistry.dm +++ b/code/game/objects/structures/chemistry/_chemistry.dm @@ -1,6 +1,6 @@ /obj/structure/fire_source/heater name = "heater" - desc = "An small, squat burner, generally used for heating reagents." + desc = "A small, squat burner, generally used for heating reagents." icon = 'icons/obj/structures/alembic.dmi' icon_state = ICON_STATE_WORLD material = /decl/material/solid/stone/pottery diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index ba9e023a08e..629490936d7 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -35,7 +35,7 @@ */ /obj/structure/closet/chefcloset name = "chef's closet" - desc = "It's a storage unit for foodservice garments." + desc = "It's a storage unit for food service garments." closet_appearance = /decl/closet_appearance/wardrobe/black /obj/structure/closet/chefcloset/WillContain() diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index d3aa1f21c39..9182d57f4e6 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -90,7 +90,7 @@ /obj/structure/closet/crate/internals name = "internals crate" - desc = "A internals crate." + desc = "An internals crate." /obj/structure/closet/crate/internals/fuel name = "\improper Fuel tank crate" @@ -179,7 +179,7 @@ /obj/structure/closet/crate/radiation name = "radioactive crate" - desc = "A leadlined crate with a radiation sign on it." + desc = "A lead-lined crate with a radiation sign on it." closet_appearance = /decl/closet_appearance/crate/radiation /obj/structure/closet/crate/radiation_gear @@ -197,7 +197,7 @@ /obj/structure/closet/crate/secure/explosives name = "explosives crate" - desc = "A secure exploxives crate." + desc = "A secure explosives crate." closet_appearance = /decl/closet_appearance/crate/secure/hazard /obj/structure/closet/crate/secure/shuttle diff --git a/code/game/objects/structures/crematorium.dm b/code/game/objects/structures/crematorium.dm index 61b22755224..bb05961a107 100644 --- a/code/game/objects/structures/crematorium.dm +++ b/code/game/objects/structures/crematorium.dm @@ -1,6 +1,6 @@ /obj/structure/crematorium name = "crematorium" - desc = "A human incinerator. Works well on barbeque nights." + desc = "A human incinerator. Works well on barbecue nights." icon = 'icons/obj/structures/crematorium.dmi' icon_state = "crematorium_closed" density = TRUE diff --git a/code/game/objects/structures/signs/department_signs.dm b/code/game/objects/structures/signs/department_signs.dm index 9493d2d622f..92fa661be71 100644 --- a/code/game/objects/structures/signs/department_signs.dm +++ b/code/game/objects/structures/signs/department_signs.dm @@ -23,24 +23,24 @@ /obj/structure/sign/department/xenobio_1 name = "\improper XENOBIOLOGY" - desc = "A sign labelling an area as a place where xenobiological entites are researched." + desc = "A sign labelling an area as a place where xenobiological entities are researched." icon_state = "xenobio" /obj/structure/sign/department/xenobio_2 name = "\improper XENOBIOLOGY" - desc = "A sign labelling an area as a place where xenobiological entites are researched." + desc = "A sign labelling an area as a place where xenobiological entities are researched." icon = 'icons/obj/signs/location_signs.dmi' icon_state = "xenobio2" /obj/structure/sign/department/xenobio_3 name = "\improper XENOBIOLOGY" - desc = "A sign labelling an area as a place where xenobiological entites are researched." + desc = "A sign labelling an area as a place where xenobiological entities are researched." icon = 'icons/obj/signs/location_signs.dmi' icon_state = "xenobio3" /obj/structure/sign/department/xenobio_4 name = "\improper XENOBIOLOGY" - desc = "A sign labelling an area as a place where xenobiological entites are researched." + desc = "A sign labelling an area as a place where xenobiological entities are researched." icon = 'icons/obj/signs/location_signs.dmi' icon_state = "xenobio4" @@ -176,6 +176,6 @@ /obj/structure/sign/department/star_of_life name = "emergency" - desc = "The blue six pointed star with a rod of Asclepius is the intergalactic symbol of emergency medical services." + desc = "The blue six-pointed star with a rod of Asclepius is the intergalactic symbol of emergency medical services." icon = 'icons/obj/signs/medical.dmi' icon_state = "staroflife" \ No newline at end of file diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 549d7d913ab..a7fe8eb9ec9 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -497,7 +497,7 @@ var/global/list/hygiene_props = list() /decl/barricade_tape_template/toilet tape_kind = "toilet paper" tape_desc = "A length of toilet paper. Seems like custodia is marking their territory again." - roll_desc = "A unbranded roll of standard issue two ply toilet paper. Refined from carefully rendered down sea shells due to the government's 'Abuse Of The Trees Act'." + roll_desc = "An unbranded roll of standard issue two ply toilet paper. Refined from carefully rendered down sea shells due to the government's 'Abuse Of The Trees Act'." base_icon_state = "stripetape" tape_color = COLOR_WHITE detail_overlay = "stripes" diff --git a/code/modules/ZAS/Fire.dm b/code/modules/ZAS/Fire.dm index 10ecd938f69..b4b955ecf4e 100644 --- a/code/modules/ZAS/Fire.dm +++ b/code/modules/ZAS/Fire.dm @@ -352,7 +352,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin legs_exposure = 0 if(C.body_parts_covered & SLOT_ARMS) arms_exposure = 0 - //minimize this for low-pressure enviroments + //minimize this for low-pressure environments var/mx = 5 * firelevel/vsc.fire_firelevel_multiplier * min(pressure / ONE_ATMOSPHERE, 1) //Always check these damage procs first if fire damage isn't working. They're probably what's wrong. diff --git a/code/modules/admin/quantum_mechanic.dm b/code/modules/admin/quantum_mechanic.dm index 28cf80af10e..d9977490a91 100644 --- a/code/modules/admin/quantum_mechanic.dm +++ b/code/modules/admin/quantum_mechanic.dm @@ -274,7 +274,7 @@ // ID /obj/item/card/id/quantum - desc = "An ID straight from the Department of Spaciotemporal Affairs. This one looks highly classified." + desc = "An ID straight from the Department of Spatiotemporal Affairs. This one looks highly classified." /obj/item/card/id/quantum/Initialize() . = ..() diff --git a/code/modules/admin/verbs/SDQL_2/SDQL_2.dm b/code/modules/admin/verbs/SDQL_2/SDQL_2.dm index 0331cb89a49..71b7f7208c8 100644 --- a/code/modules/admin/verbs/SDQL_2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL_2/SDQL_2.dm @@ -149,7 +149,7 @@ to_chat(usr, "Query executed on [objs.len] object\s.") catch(var/exception/e) - to_chat(usr, "An exception has occured during the execution of your query and your query has been aborted.") + to_chat(usr, "An exception has occurred during the execution of your query and your query has been aborted.") to_chat(usr, EXCEPTION_TEXT(e)) return diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index c23689af34c..017f1c2bb56 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -195,7 +195,7 @@ M.visible_message(result[1], result[1], narrate = TRUE) log_and_message_admins(" - VisibleNarrate [result[2]]/[result[3]] on [A]: [result[4]]") -// Visible narrate, it's as if it's a audible message +// Visible narrate, it's as if it's an audible message /client/proc/cmd_admin_audible_narrate(var/atom/A) set category = "Special Verbs" set name = "Audible Narrate" diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index d8bcb207a12..f759887ff62 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -1,6 +1,6 @@ /obj/item/assembly/mousetrap name = "rat trap" - desc = "A handy little spring-loaded trap for catching pesty rodents." + desc = "A handy little spring-loaded trap for catching pesky pests." icon_state = "mousetrap" origin_tech = @'{"combat":1}' material = /decl/material/solid/organic/wood/oak diff --git a/code/modules/atmospherics/components/binary_devices/pipeturbine.dm b/code/modules/atmospherics/components/binary_devices/pipeturbine.dm index e72a09e8d18..510fe486f1e 100644 --- a/code/modules/atmospherics/components/binary_devices/pipeturbine.dm +++ b/code/modules/atmospherics/components/binary_devices/pipeturbine.dm @@ -75,7 +75,7 @@ /obj/machinery/turbinemotor name = "motor" - desc = "Electrogenerator. Converts rotation into power." + desc = "A turbine motor. Converts rotation into power." icon = 'icons/obj/pipeturbine.dmi' icon_state = "motor" anchored = FALSE diff --git a/code/modules/augment/active/tool/engineering.dm b/code/modules/augment/active/tool/engineering.dm index b46692f220d..20fec8cfe1a 100644 --- a/code/modules/augment/active/tool/engineering.dm +++ b/code/modules/augment/active/tool/engineering.dm @@ -33,7 +33,7 @@ /obj/item/screwdriver/finger name = "digital screwdriver" - desc = "A nifty powertool at your literal fingertips." + desc = "A nifty power tool at your literal fingertips." icon_state = "screwdriver_finger" icon = 'icons/obj/augment_tools.dmi' @@ -43,7 +43,7 @@ /obj/item/crowbar/finger name = "digital prybar" - desc = "A somewhat awkward to use prybar. It doubles as bottle opener." + desc = "A somewhat awkward to use prybar. It doubles as a bottle opener." icon_state = "prybar_finger" icon = 'icons/obj/augment_tools.dmi' diff --git a/code/modules/augment/passive/boost/muscle.dm b/code/modules/augment/passive/boost/muscle.dm index ca38a5cd2ff..913214d9619 100644 --- a/code/modules/augment/passive/boost/muscle.dm +++ b/code/modules/augment/passive/boost/muscle.dm @@ -7,7 +7,7 @@ name = "mechanical muscles" allowed_organs = list(BP_AUGMENT_R_LEG, BP_AUGMENT_L_LEG) icon_state = "muscule" - desc = "Nanofiber tendons powered by an array of actuators to help the wearer mantain speed even while encumbered. You may want to install these in pairs to see a result." + desc = "Nanofiber tendons powered by an array of actuators to help the wearer maintain speed even while encumbered. You may want to install these in pairs to see a result." material = /decl/material/solid/metal/steel origin_tech = @'{"materials":4,"magnets":3,"biotech":3}' var/obj/item/organ/internal/augment/boost/muscle/other //we need two for these diff --git a/code/modules/awaymissions/pamphlet.dm b/code/modules/awaymissions/pamphlet.dm index c97ef5ee903..49dbb1237f4 100644 --- a/code/modules/awaymissions/pamphlet.dm +++ b/code/modules/awaymissions/pamphlet.dm @@ -8,7 +8,7 @@ winning dental plan- but that's not all the Gateway project has to offer.
\
Because we care about you, we feel it is only fair to make sure you know the risks \ before you commit to joining the Gateway project. All away destinations have \ - been fully scanned by a expeditionary team, and are certified to be 100% safe. \ + been fully scanned by an expeditionary team, and are certified to be 100% safe. \ We've even left a case of space beer along with the basic materials you'll need to expand \ the Project's operational area and start your new life.

\ Gateway Operation Basics
\ diff --git a/code/modules/bodytype/bodytype_quadruped.dm b/code/modules/bodytype/bodytype_quadruped.dm index ab5bbdd75e6..359a7d0d28a 100644 --- a/code/modules/bodytype/bodytype_quadruped.dm +++ b/code/modules/bodytype/bodytype_quadruped.dm @@ -16,12 +16,12 @@ BP_L_FOOT = list("path" = /obj/item/organ/external/foot/quadruped), BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/quadruped) ) - var/ridable = TRUE + var/rideable = TRUE var/riding_offset = @"{'x':0,'y':0,'z':8}" /decl/bodytype/quadruped/apply_appearance(var/mob/living/human/H) . = ..() - H.can_buckle = ridable + H.can_buckle = rideable H.buckle_pixel_shift = riding_offset /decl/bodytype/quadruped/get_ignited_icon_state(mob/living/victim) diff --git a/code/modules/butchery/butchery_products.dm b/code/modules/butchery/butchery_products.dm index d12b2980a3a..f4e76d9af46 100644 --- a/code/modules/butchery/butchery_products.dm +++ b/code/modules/butchery/butchery_products.dm @@ -128,7 +128,7 @@ /obj/item/food/butchery/offal name = "offal" - desc = "An assortmant of organs and lumps of unidentified gristle. Packed with nutrients and bile." + desc = "An assortment of organs and lumps of unidentified gristle. Packed with nutrients and bile." icon = 'icons/obj/food/butchery/offal.dmi' material = /decl/material/solid/organic/meat/gut nutriment_amt = 15 diff --git a/code/modules/butchery/butchery_products_meat.dm b/code/modules/butchery/butchery_products_meat.dm index aa4cdbd9a51..9907f21994c 100644 --- a/code/modules/butchery/butchery_products_meat.dm +++ b/code/modules/butchery/butchery_products_meat.dm @@ -30,7 +30,7 @@ return ..() /obj/item/food/butchery/meat/syntiflesh - desc = "A slab of flesh synthetized from reconstituted biomass or artificially grown from chemicals." + desc = "A slab of flesh synthesized from reconstituted biomass or artificially grown from chemicals." meat_name = "synthetic" // Seperate definitions because some food likes to know if it's human. @@ -60,7 +60,7 @@ butchery_data = /decl/butchery_data/animal/small/fowl /obj/item/food/butchery/meat/corgi - desc = "Tastes like... well you know..." + desc = "Tastes like... well, you know..." butchery_data = /decl/butchery_data/animal/corgi /obj/item/food/butchery/meat/xeno diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm index f83344b4841..b27ec40f29d 100644 --- a/code/modules/client/asset_cache.dm +++ b/code/modules/client/asset_cache.dm @@ -122,7 +122,7 @@ You can set verify to TRUE if you want send() to sleep until the client has the //all of our asset datums, used for referring to these later var/global/list/asset_datums = list() -//get a assetdatum or make a new one +//get an assetdatum or make a new one /proc/get_asset_datum(var/type) if (!(type in asset_datums)) return new type() diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 4a85cb47cef..2af46afe272 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -284,7 +284,7 @@ /obj/item/clothing/mask/chameleon name = "gas mask" icon = 'icons/clothing/mask/gas_mask_full.dmi' - desc = "It looks like a plain gask mask, but on closer inspection, it seems to have a small dial inside." + desc = "It looks like a plain gas mask, but on closer inspection, it seems to have a small dial inside." origin_tech = @'{"esoteric":3}' item_flags = ITEM_FLAG_INVALID_FOR_CHAMELEON bodytype_equip_flags = null diff --git a/code/modules/clothing/dresses/misc.dm b/code/modules/clothing/dresses/misc.dm index 20085a74b6c..08969f3ae87 100644 --- a/code/modules/clothing/dresses/misc.dm +++ b/code/modules/clothing/dresses/misc.dm @@ -25,18 +25,18 @@ /obj/item/clothing/dress/saloon name = "saloon girl dress" - desc = "A old western inspired gown for the girl who likes to drink." + desc = "An old western-inspired gown for the girl who likes to drink." icon = 'icons/clothing/dresses/dress_saloon.dmi' /obj/item/clothing/dress/cap name = "captain's dress uniform" - desc = "Feminine fashion for the style concious captain." + desc = "Feminine fashion for the style-conscious captain." icon = 'icons/clothing/dresses/uniform_captain_dress.dmi' body_parts_covered = SLOT_UPPER_BODY|SLOT_LOWER_BODY|SLOT_ARMS /obj/item/clothing/dress/hop name = "head of personnel dress uniform" - desc = "Feminine fashion for the style concious HoP." + desc = "Feminine fashion for the style-conscious HoP." icon = 'icons/clothing/dresses/dress_hop.dmi' body_parts_covered = SLOT_UPPER_BODY|SLOT_LOWER_BODY|SLOT_ARMS diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 17022402e0a..5341391d4d3 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -87,7 +87,7 @@ /obj/item/clothing/glasses/threedglasses name = "3D glasses" - desc = "A long time ago, people used these glasses to makes images from screens threedimensional." + desc = "A long time ago, people used these glasses to makes images from screens three-dimensional." icon = 'icons/clothing/eyes/glasses_3d.dmi' body_parts_covered = 0 diff --git a/code/modules/clothing/glasses/sunglasses.dm b/code/modules/clothing/glasses/sunglasses.dm index c31ff5ec755..7cb0c0d4708 100644 --- a/code/modules/clothing/glasses/sunglasses.dm +++ b/code/modules/clothing/glasses/sunglasses.dm @@ -1,6 +1,6 @@ /obj/item/clothing/glasses/sunglasses name = "sunglasses" - desc = "Glasses with treated lenses to prevent glare. They provide some rudamentary protection from dazzling attacks." + desc = "Glasses with treated lenses to prevent glare. They provide some rudimentary protection from dazzling attacks." icon = 'icons/clothing/eyes/sunglasses.dmi' darkness_view = -1 flash_protection = FLASH_PROTECTION_NONE diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index a435e585d3c..ae93b592aeb 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -33,7 +33,7 @@ /obj/item/clothing/head/that name = "top-hat" - desc = "It's an amish looking hat." + desc = "It's an Amish-looking hat." icon = 'icons/clothing/head/tophat.dmi' siemens_coefficient = 0.9 @@ -78,7 +78,7 @@ /obj/item/clothing/head/rabbitears name = "rabbit ears" - desc = "Wearing these makes you looks useless, and only good for your sex appeal." + desc = "Wearing these makes you look useless, and only good for your sex appeal." icon = 'icons/clothing/head/bunny.dmi' body_parts_covered = 0 flags_inv = 0 @@ -220,7 +220,7 @@ /obj/item/clothing/head/tank name = "padded cap" - desc = "A padded skullcup for those prone to bumping their heads against hard surfaces." + desc = "A padded skullcap for those prone to bumping their head against hard surfaces." icon = 'icons/clothing/head/tank.dmi' flags_inv = BLOCK_HEAD_HAIR color = "#5f5f5f" diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 01d01335e58..a665d969853 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -84,7 +84,7 @@ /obj/item/clothing/head/welding/knight name = "knightly welding helmet" - desc = "A painted welding helmet, this one looks like a knights helmet." + desc = "A painted welding helmet, this one looks like a knight's helmet." icon = 'icons/clothing/head/welding/knight.dmi' /obj/item/clothing/head/welding/fancy @@ -224,7 +224,7 @@ add_overlay(emissive_overlay(icon, "[icon_state]-flame")) z_flags |= ZMM_MANGLE_PLANES -// Overidable so species with limited headspace in the sprite bounding area can offset it (scavs) +// Overrideable so species with limited headspace in the sprite bounding area can offset it (scavs) /obj/item/clothing/head/cakehat/proc/get_mob_flame_overlay(var/image/overlay, var/bodytype) if(overlay && check_state_in_icon("[overlay.icon_state]-flame", overlay.icon)) return emissive_overlay(overlay.icon, "[overlay.icon_state]-flame") diff --git a/code/modules/clothing/jumpsuits/job.dm b/code/modules/clothing/jumpsuits/job.dm index 90eb1ae24bb..5c637e6e892 100644 --- a/code/modules/clothing/jumpsuits/job.dm +++ b/code/modules/clothing/jumpsuits/job.dm @@ -144,7 +144,7 @@ ) /obj/item/clothing/jumpsuit/psych - desc = "A basic white jumpsuit. It has turqouise markings that denote the wearer as a psychiatrist." + desc = "A basic white jumpsuit. It has turquoise markings that denote the wearer as a psychiatrist." name = "psychiatrist's jumpsuit" icon = 'icons/clothing/jumpsuits/jumpsuit_psych.dmi' diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index 06d78421b29..02584ae5311 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -22,7 +22,7 @@ permeability_coefficient = 0.01 /obj/item/clothing/mask/breath/emergency - desc = "A close-fitting mask that is used by the wallmounted emergency oxygen pump." + desc = "A close-fitting mask that is used by the wall-mounted emergency oxygen pump." name = "emergency mask" permeability_coefficient = 0.50 diff --git a/code/modules/clothing/masks/chewable.dm b/code/modules/clothing/masks/chewable.dm index 84d490148fb..8fe3c3562cc 100644 --- a/code/modules/clothing/masks/chewable.dm +++ b/code/modules/clothing/masks/chewable.dm @@ -1,6 +1,6 @@ /obj/item/clothing/mask/chewable + abstract_type = /obj/item/clothing/mask/chewable name = "chewable item master" - desc = "You're not sure what this is. You should probably ahelp it." icon = 'icons/clothing/mask/chewables/lollipop.dmi' body_parts_covered = 0 bodytype_equip_flags = null @@ -55,7 +55,7 @@ /obj/item/clothing/mask/chewable/tobacco name = "wad" - desc = "A chewy wad of tobacco. Cut in long strands and treated with syrups so it doesn't taste like a ash-tray when you stuff it into your face." + desc = "A chewy wad of tobacco. Cut in long strands and treated with syrups so it doesn't taste like an ash-tray when you stuff it into your face." throw_speed = 0.5 icon = 'icons/clothing/mask/chewables/chew.dmi' type_butt = /obj/item/trash/cigbutt/spitwad @@ -89,14 +89,14 @@ /obj/item/clothing/mask/chewable/tobacco/lenni name = "chewing tobacco" - desc = "A chewy wad of tobacco. Cut in long strands and treated with syrups so it tastes less like a ash-tray when you stuff it into your face." + desc = "A chewy wad of tobacco. Cut in long strands and treated with syrups so it tastes less like an ash-tray when you stuff it into your face." /obj/item/clothing/mask/chewable/tobacco/lenni/populate_reagents() add_to_reagents(/decl/material/solid/tobacco, 2) /obj/item/clothing/mask/chewable/tobacco/redlady name = "chewing tobacco" - desc = "A chewy wad of fine tobacco. Cut in long strands and treated with syrups so it doesn't taste like a ash-tray when you stuff it into your face" + desc = "A chewy wad of fine tobacco. Cut in long strands and treated with syrups so it doesn't taste like an ash-tray when you stuff it into your face" /obj/item/clothing/mask/chewable/tobacco/redlady/populate_reagents() add_to_reagents(/decl/material/solid/tobacco/fine, 2) diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 7ceb955904c..afabff1f337 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -146,7 +146,7 @@ /obj/item/clothing/mask/rubber/barros name = "Amaya Barros mask" - desc = "Current Secretary-General of Sol Cental Government. Not that the real thing would visit this pigsty." + desc = "Current Secretary-General of Sol Central Government. Not that the real thing would visit this pigsty." icon = 'icons/clothing/mask/barros.dmi' visible_name = "Amaya Barros" diff --git a/code/modules/clothing/masks/smokable.dm b/code/modules/clothing/masks/smokable.dm index 675783b875e..4aa4fd8cb5e 100644 --- a/code/modules/clothing/masks/smokable.dm +++ b/code/modules/clothing/masks/smokable.dm @@ -1,6 +1,6 @@ /obj/item/clothing/mask/smokable + abstract_type = /obj/item/clothing/mask/smokable name = "smokable item" - desc = "You're not sure what this is. You should probably ahelp it." icon = 'icons/clothing/mask/smokables/cigarette.dmi' body_parts_covered = 0 bodytype_equip_flags = null @@ -492,7 +492,7 @@ ///////////////// /obj/item/clothing/mask/smokable/pipe name = "smoking pipe" - desc = "A pipe, for smoking. Probably made of meershaum or something." + desc = "A pipe, for smoking. Probably made of meerschaum or something." icon = 'icons/clothing/mask/smokables/pipe.dmi' w_class = ITEM_SIZE_TINY smoketime = 0 diff --git a/code/modules/clothing/shirts/sweaters.dm b/code/modules/clothing/shirts/sweaters.dm index 1e19f372e89..5065789b2ed 100644 --- a/code/modules/clothing/shirts/sweaters.dm +++ b/code/modules/clothing/shirts/sweaters.dm @@ -4,6 +4,6 @@ icon = 'icons/clothing/shirts/uniform_turtleneck.dmi' /obj/item/clothing/shirt/sweater/turquoise - name = "turqouise turtleneck" - desc = "A turqouise sweater and a pair of dark blue slacks." + name = "turquoise turtleneck" + desc = "A turquoise sweater and a pair of dark blue slacks." icon = 'icons/clothing/shirts/uniform_turtleneck_blue.dmi' diff --git a/code/modules/clothing/shirts/syndicate.dm b/code/modules/clothing/shirts/syndicate.dm index ab2498cc055..a131a36a7e7 100644 --- a/code/modules/clothing/shirts/syndicate.dm +++ b/code/modules/clothing/shirts/syndicate.dm @@ -1,6 +1,6 @@ /obj/item/clothing/shirt/syndicate name = "tactical turtleneck" - desc = "It's some non-descript, slightly suspicious looking, turtleneck sweater." + desc = "It's some nondescript, slightly suspicious looking, turtleneck sweater." icon = 'icons/clothing/shirts/sweater_tactical.dmi' armor = list( ARMOR_MELEE = ARMOR_MELEE_SMALL, diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 53579e0dd79..a2d298807dd 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -153,7 +153,7 @@ /obj/item/clothing/shoes/athletic name = "athletic shoes" - desc = "A pair of sleek atheletic shoes. Made by and for the sporty types." + desc = "A pair of sleek athletic shoes. Made by and for the sporty types." icon = 'icons/clothing/feet/sports.dmi' /obj/item/clothing/shoes/dress/sneakies diff --git a/code/modules/clothing/skirts/job.dm b/code/modules/clothing/skirts/job.dm index 11cbba468ba..2f4dd7a17c0 100644 --- a/code/modules/clothing/skirts/job.dm +++ b/code/modules/clothing/skirts/job.dm @@ -1,6 +1,6 @@ /obj/item/clothing/skirt/research_director name = "chief science officer dress uniform" - desc = "Feminine fashion for the style concious CSO. Its fabric provides minor protection from biological contaminants." + desc = "Feminine fashion for the style-conscious CSO. Its fabric provides minor protection from biological contaminants." icon = 'icons/clothing/dresses/dress_rd.dmi' armor = list( ARMOR_BIO = ARMOR_BIO_MINOR diff --git a/code/modules/clothing/spacesuits/rig/modules/combat.dm b/code/modules/clothing/spacesuits/rig/modules/combat.dm index f6a35661567..6ba6b837d81 100644 --- a/code/modules/clothing/spacesuits/rig/modules/combat.dm +++ b/code/modules/clothing/spacesuits/rig/modules/combat.dm @@ -200,7 +200,7 @@ /obj/item/rig_module/mounted name = "mounted gun" - desc = "Somesort of mounted gun." + desc = "Some sort of mounted gun." selectable = 1 usable = 1 module_cooldown = 0 diff --git a/code/modules/clothing/spacesuits/rig/modules/computer.dm b/code/modules/clothing/spacesuits/rig/modules/computer.dm index c263a126afd..5536a750030 100644 --- a/code/modules/clothing/spacesuits/rig/modules/computer.dm +++ b/code/modules/clothing/spacesuits/rig/modules/computer.dm @@ -104,7 +104,7 @@ if(!card) card = new /obj/item/aicard(src) - // Terminal interaction only works with an inteliCarded AI. + // Terminal interaction only works with an intelliCarded AI. if(!istype(card)) return 0 @@ -328,7 +328,7 @@ /obj/item/rig_module/power_sink name = "hardsuit power sink" - desc = "An heavy-duty power sink." + desc = "A heavy-duty power sink." icon_state = "powersink" toggleable = 1 activates_on_touch = 1 diff --git a/code/modules/clothing/spacesuits/rig/modules/modules.dm b/code/modules/clothing/spacesuits/rig/modules/modules.dm index 893ec665f88..a616b18c757 100644 --- a/code/modules/clothing/spacesuits/rig/modules/modules.dm +++ b/code/modules/clothing/spacesuits/rig/modules/modules.dm @@ -10,7 +10,7 @@ /obj/item/rig_module name = "hardsuit upgrade" - desc = "It looks pretty sciency." + desc = "It looks pretty science-y." icon = 'icons/obj/rig_modules.dmi' icon_state = "module" material = /decl/material/solid/metal/steel diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index f9f4f356c2b..b76278d5ebd 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -444,7 +444,7 @@ return 1 return 0 -/obj/item/rig/proc/check_power_cost(var/mob/living/user, var/cost, var/use_unconcious, var/obj/item/rig_module/mod, var/user_is_ai) +/obj/item/rig/proc/check_power_cost(var/mob/living/user, var/cost, var/use_unconscious, var/obj/item/rig_module/mod, var/user_is_ai) if(!istype(user)) return 0 @@ -457,7 +457,7 @@ fail_msg = "You must be wearing \the [src] to do this." if(sealing) fail_msg = "The hardsuit is in the process of adjusting seals and cannot be activated." - else if(!fail_msg && ((use_unconcious && user.stat > 1) || (!use_unconcious && user.stat))) + else if(!fail_msg && ((use_unconscious && user.stat > 1) || (!use_unconscious && user.stat))) fail_msg = "You are in no fit state to do that." else if(!cell) fail_msg = "There is no cell installed in the suit." diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 4c8fba5849f..bce77c8c072 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -2,7 +2,7 @@ /obj/item/clothing/head/bio_hood name = "bio hood" icon = 'icons/clothing/head/biosuit/_biosuit.dmi' - desc = "A hood that protects the head and face from biological comtaminants." + desc = "A hood that protects the head and face from biological contaminants." permeability_coefficient = 0 armor = list( ARMOR_BIO = ARMOR_BIO_SHIELDED, diff --git a/code/modules/clothing/suits/dashiki.dm b/code/modules/clothing/suits/dashiki.dm index c61e603a7ae..ac14b45bd60 100644 --- a/code/modules/clothing/suits/dashiki.dm +++ b/code/modules/clothing/suits/dashiki.dm @@ -1,16 +1,16 @@ /obj/item/clothing/suit/dashiki name = "black dashiki" - desc = "An ornately embroidered pullover garmant sporting a v-shaped collar. This one is green and black." + desc = "An ornately embroidered pullover garment sporting a v-shaped collar. This one is green and black." icon = 'icons/clothing/suits/dashiki/dashiki.dmi' slot_flags = SLOT_OVER_BODY accessory_slot = ACCESSORY_SLOT_DECOR /obj/item/clothing/suit/dashiki/red name = "red dashiki" - desc = "An ornately embroidered pullover garmant sporting a v-shaped collar. This one is red." + desc = "An ornately embroidered pullover garment sporting a v-shaped collar. This one is red." icon = 'icons/clothing/suits/dashiki/dashiki_red.dmi' /obj/item/clothing/suit/dashiki/blue name = "blue dashiki" - desc = "An ornately embroidered pullover garmant sporting a v-shaped collar. This one is blue." + desc = "An ornately embroidered pullover garment sporting a v-shaped collar. This one is blue." icon = 'icons/clothing/suits/dashiki/dashiki_blue.dmi' diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 24f7d5f0a72..764b696000d 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -39,7 +39,7 @@ /obj/item/clothing/suit/toggle/labcoat/mad name = "The Mad's labcoat" - desc = "It makes you look capable of konking someone on the noggin and shooting them into space." + desc = "It makes you look capable of conking someone on the noggin and shooting them into space." color = COLOR_GREEN /obj/item/clothing/suit/toggle/labcoat/chemist diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 900580dffe8..25aa1a94bbd 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -87,9 +87,10 @@ body_parts_covered = SLOT_UPPER_BODY|SLOT_LOWER_BODY|SLOT_LEGS|SLOT_FEET|SLOT_ARMS flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT +// todo: remove 40k reference? /obj/item/clothing/suit/imperium_monk name = "Imperium monk" - desc = "Have YOU killed a xenos today?" + desc = "Have YOU killed a xeno today?" icon = 'icons/clothing/suits/w40k.dmi' body_parts_covered = SLOT_HEAD|SLOT_UPPER_BODY|SLOT_LOWER_BODY|SLOT_LEGS|SLOT_FEET|SLOT_ARMS flags_inv = HIDESHOES|HIDEJUMPSUIT diff --git a/code/modules/clothing/suits/wizard.dm b/code/modules/clothing/suits/wizard.dm index c8f0208fb4d..d302f06103f 100644 --- a/code/modules/clothing/suits/wizard.dm +++ b/code/modules/clothing/suits/wizard.dm @@ -7,7 +7,7 @@ /obj/item/clothing/suit/wizrobe/red name = "red wizard robe" - desc = "A rather ratty red robe." + desc = "A rather ratty red robe." icon = 'icons/clothing/suits/wizard/red.dmi' /obj/item/clothing/suit/wizrobe/marisa diff --git a/code/modules/clothing/webbing/misc.dm b/code/modules/clothing/webbing/misc.dm index 74d41a0c491..c390a9bf2ed 100644 --- a/code/modules/clothing/webbing/misc.dm +++ b/code/modules/clothing/webbing/misc.dm @@ -6,7 +6,7 @@ /obj/item/clothing/webbing/bandolier name = "bandolier" - desc = "A lightweight synthethic bandolier with straps for holding ammunition or other small objects." + desc = "A lightweight synthetic bandolier with straps for holding ammunition or other small objects." icon = 'icons/obj/items/bandolier.dmi' storage = /datum/storage/pockets/bandolier diff --git a/code/modules/codex/categories/category_surgery.dm b/code/modules/codex/categories/category_surgery.dm index 7bf78fccfc7..df818b89c80 100644 --- a/code/modules/codex/categories/category_surgery.dm +++ b/code/modules/codex/categories/category_surgery.dm @@ -26,7 +26,7 @@
  • Use a scalpel to make an incision.
  • Use a retractor to widen the incision, if necessary.
  • Use a hemostat to clamp any bleeders, if necessary.
    • -
  • On bodyparts with bone encasement, like the skull and ribs, use a circular saw to open the encasing bone.
    • +
  • On body parts with bone encasement, like the skull and ribs, use a circular saw to open the encasing bone.

    • Closing an incision

    diff --git a/code/modules/codex/entries/guides.dm b/code/modules/codex/entries/guides.dm index 747a279d691..7f3ec5d857f 100644 --- a/code/modules/codex/entries/guides.dm +++ b/code/modules/codex/entries/guides.dm @@ -559,7 +559,7 @@

    A note on terms

      -
    • Mass spectrometry - MS is the procedure used used to measure and quantify the components of matter. The most prized tool in the field of +
    • Mass spectrometry - MS is the procedure used to measure and quantify the components of matter. The most prized tool in the field of 'Materials analysis.'
    • Radiometric dating - MS applied using the right carrier reagents can be used to accurately determine the age of a sample.
    • Dissonance ratio - This is a pseudoarbitrary value indicating the overall presence of a particular element in a greater composite. diff --git a/code/modules/codex/entries/medical.dm b/code/modules/codex/entries/medical.dm index 69add447b6a..0ab7f3ca37e 100644 --- a/code/modules/codex/entries/medical.dm +++ b/code/modules/codex/entries/medical.dm @@ -43,8 +43,8 @@ deprivation, irradiation, shock, and chemicals inside the occupant, at least until the bag is opened again.
      \
      \ Stasis bags can only be used once, and are rather costly, so use them well. They are ideal for situations where someone may die \ - before being able to bring them back to safety, or if they are in a hostile enviroment, such as in vacuum or in a toxins leak, as \ - the bag will protect the occupant from most outside enviromental hazards. If you open a bag by mistake, closing the bag with no \ + before being able to bring them back to safety, or if they are in a hostile environment, such as in vacuum or in a toxins leak, as \ + the bag will protect the occupant from most outside environmental hazards. If you open a bag by mistake, closing the bag with no \ occupant will not use up the bag, and you can pick it back up.
      \
      \ You can use a health analyzer to scan the occupant's vitals without opening the bag by clicking the occupied bag with the analyzer." diff --git a/code/modules/detectivework/tools/crimekit.dm b/code/modules/detectivework/tools/crimekit.dm index c3756e4e01a..4dc2965ca76 100644 --- a/code/modules/detectivework/tools/crimekit.dm +++ b/code/modules/detectivework/tools/crimekit.dm @@ -1,7 +1,7 @@ //crime scene kit /obj/item/briefcase/crimekit name = "crime scene kit" - desc = "A stainless steel-plated carrycase for all your forensic needs. Feels heavy." + desc = "A stainless steel-plated carrying case for all your forensic needs. Feels heavy." icon = 'icons/obj/items/storage/crime_kit.dmi' material = /decl/material/solid/organic/leather/synth matter = list(/decl/material/solid/metal/stainlesssteel = MATTER_AMOUNT_REINFORCEMENT) diff --git a/code/modules/fabrication/_fabricator.dm b/code/modules/fabrication/_fabricator.dm index b7c4f920ca2..43ae4885331 100644 --- a/code/modules/fabrication/_fabricator.dm +++ b/code/modules/fabrication/_fabricator.dm @@ -1,6 +1,6 @@ /obj/machinery/fabricator name = "autolathe" - desc = "It produces common day to day items from a variety of materials." + desc = "It produces common day-to-day items from a variety of materials." icon = 'icons/obj/machines/fabricators/autolathe.dmi' icon_state = "autolathe" density = TRUE diff --git a/code/modules/food/plates/plate_tray.dm b/code/modules/food/plates/plate_tray.dm index 2b05fabfbf8..5bc0488090c 100644 --- a/code/modules/food/plates/plate_tray.dm +++ b/code/modules/food/plates/plate_tray.dm @@ -157,10 +157,10 @@ TRAY TYPES GO HERE /obj/item/plate/tray/metal/silver name = "platter" - desc = "You lazy bum." + desc = "The new generation is so lazy, they expect everything to be handed to them on this." material = /decl/material/solid/metal/silver /obj/item/plate/tray/metal/gold name = "platter" - desc = "A gold tray to serve food on. But oh sofancy." + desc = "A gold tray to serve food on. Heavy, but oh-so-fancy." material = /decl/material/solid/metal/gold \ No newline at end of file diff --git a/code/modules/games/boardgame.dm b/code/modules/games/boardgame.dm index 5c7765027cb..5fd4c46d448 100644 --- a/code/modules/games/boardgame.dm +++ b/code/modules/games/boardgame.dm @@ -236,7 +236,7 @@ /obj/item/checker/bishop name = "bishop" - desc = "What corruption occured, urging holy men to fight?" + desc = "What corruption occurred, urging holy men to fight?" /obj/item/checker/bishop/red piece_color ="red" diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm index 8084a66d09d..9c39e239b0b 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -106,7 +106,7 @@ var/global/list/card_decks = list() /obj/item/deck/compact name = "compact deck of cards" - desc = "A deck of playing cards. Looks like this one hasn't numbers from two to five, and jokers." + desc = "A deck of playing cards. Looks like this one is missing numbers from two to five, and both jokers." icon_state = "deck" /obj/item/deck/compact/generate_cards() @@ -266,7 +266,7 @@ var/global/list/card_decks = list() /obj/item/pack name = "card pack" - desc = "For those with disposible income." + desc = "For those with disposable income." icon_state = "card_pack" icon = 'icons/obj/items/playing_cards.dmi' w_class = ITEM_SIZE_SMALL diff --git a/code/modules/gemstones/gemstone_cuts.dm b/code/modules/gemstones/gemstone_cuts.dm index 4b8b15fb7d8..a880d09644f 100644 --- a/code/modules/gemstones/gemstone_cuts.dm +++ b/code/modules/gemstones/gemstone_cuts.dm @@ -66,7 +66,7 @@ /decl/gemstone_cut/octagon name = "octagon" adjective = "octagon-cut" - desc = "A octagon-cut gemstone." + desc = "An octagon-cut gemstone." icon = 'icons/obj/items/gemstones/octagon.dmi' /decl/gemstone_cut/round diff --git a/code/modules/integrated_electronics/subtypes/access.dm b/code/modules/integrated_electronics/subtypes/access.dm index 11e008e93df..8d65f2c31da 100644 --- a/code/modules/integrated_electronics/subtypes/access.dm +++ b/code/modules/integrated_electronics/subtypes/access.dm @@ -1,6 +1,6 @@ /obj/item/integrated_circuit/input/card_reader name = "ID card reader" //To differentiate it from the data card reader - desc = "A circuit that can read the registred name, assignment, and PassKey string from an ID card." + desc = "A circuit that can read the registered name, assignment, and PassKey string from an ID card." icon_state = "card_reader" complexity = 4 diff --git a/code/modules/integrated_electronics/subtypes/manipulation.dm b/code/modules/integrated_electronics/subtypes/manipulation.dm index 0fd00002576..82449cc6ab6 100644 --- a/code/modules/integrated_electronics/subtypes/manipulation.dm +++ b/code/modules/integrated_electronics/subtypes/manipulation.dm @@ -537,7 +537,7 @@ /obj/item/integrated_circuit/manipulation/wormhole name = "wormhole generator" desc = "This powerful circuit can open micro-length wormholes between two points in space." - extended_desc = "If a valid teleporter console is supplied as input then its selected teleporter beacon will be used as destination point, \ + extended_desc = "If a valid teleporter console is supplied as input then its selected teleporter beacon will be used as the destination point, \ and if not an undefined destination point is selected. \ Rift direction is a cardinal value determening in which direction the rift will be opened, relative the local north. \ A direction value of 0 will open the rift on top of the assembly, and any other non-cardinal values will open the rift in the assembly's current facing." @@ -593,7 +593,7 @@ /obj/item/integrated_circuit/manipulation/ai name = "integrated intelligence control circuit" - desc = "Similar in structure to a intellicard, this circuit allows the AI to pulse four different activators for control of a circuit." + desc = "Similar in structure to a intelliCard, this circuit allows the AI to pulse four different activators for control of a circuit." extended_desc = "Loading an AI is easy, all that is required is to insert the container into the device's slot. Unloading is a similar process, simply press\ down on the device in question and the device/card should pop out (if applicable)." icon_state = "ai" diff --git a/code/modules/integrated_electronics/subtypes/reagents.dm b/code/modules/integrated_electronics/subtypes/reagents.dm index 5255d8469c8..777bc82a7b4 100644 --- a/code/modules/integrated_electronics/subtypes/reagents.dm +++ b/code/modules/integrated_electronics/subtypes/reagents.dm @@ -343,7 +343,7 @@ /obj/item/integrated_circuit/reagent/storage/grinder name = "reagent grinder" - desc = "This is a reagent grinder. It accepts a ref to something, and refines it into reagents. It cannot grind materials. It can store up to 100u." + desc = "This is a reagent grinder. It accepts a ref to something and refines it into reagents. It cannot grind materials and can store up to 100u." icon_state = "blender" extended_desc = "" inputs = list( diff --git a/code/modules/integrated_electronics/subtypes/smart.dm b/code/modules/integrated_electronics/subtypes/smart.dm index f92af368dcd..4f2781f5c11 100644 --- a/code/modules/integrated_electronics/subtypes/smart.dm +++ b/code/modules/integrated_electronics/subtypes/smart.dm @@ -4,7 +4,7 @@ /obj/item/integrated_circuit/smart/basic_pathfinder name = "basic pathfinder" desc = "This complex circuit is able to determine what direction a given target is." - extended_desc = "This circuit uses a miniturized integrated camera to determine where the target is. If the machine \ + extended_desc = "This circuit uses a miniaturized integrated camera to determine where the target is. If the machine \ cannot see the target, it will not be able to calculate the correct direction." icon_state = "numberpad" complexity = 5 diff --git a/code/modules/maps/template_types/random_exoplanet/planet_types/shrouded.dm b/code/modules/maps/template_types/random_exoplanet/planet_types/shrouded.dm index 5b201f4509d..91613687054 100644 --- a/code/modules/maps/template_types/random_exoplanet/planet_types/shrouded.dm +++ b/code/modules/maps/template_types/random_exoplanet/planet_types/shrouded.dm @@ -4,7 +4,7 @@ /obj/effect/overmap/visitable/sector/planetoid/exoplanet/shrouded name = "shrouded exoplanet" - desc = "An exoplanet shrouded in a perpetual storm of bizzare, light absorbing particles." + desc = "An exoplanet shrouded in a perpetual storm of bizarre, light absorbing particles." color = "#783ca4" /obj/effect/overmap/visitable/sector/planetoid/exoplanet/shrouded/get_atmosphere_color() diff --git a/code/modules/maps/template_types/random_exoplanet/planetoid_data.dm b/code/modules/maps/template_types/random_exoplanet/planetoid_data.dm index 83421bfc416..8947d15a5de 100644 --- a/code/modules/maps/template_types/random_exoplanet/planetoid_data.dm +++ b/code/modules/maps/template_types/random_exoplanet/planetoid_data.dm @@ -132,7 +132,7 @@ //Always keep the overmap marker in sync if we have one set already try_update_overmap_marker() -// ** Bunch of overridables below ** +// ** Bunch of overrideables below ** ///Sets the name of the planetoid, and causes updates to happen to anything linked to us. /datum/planetoid_data/proc/SetName(var/newname) diff --git a/code/modules/materials/definitions/gasses/material_gas_mundane.dm b/code/modules/materials/definitions/gasses/material_gas_mundane.dm index 394b1580c17..1113f8c5aff 100644 --- a/code/modules/materials/definitions/gasses/material_gas_mundane.dm +++ b/code/modules/materials/definitions/gasses/material_gas_mundane.dm @@ -1,7 +1,7 @@ /decl/material/gas/oxygen name = "oxygen" uid = "gas_oxygen" - lore_text = "An ubiquitous oxidizing agent." + lore_text = "A ubiquitous oxidizing agent." flags = MAT_FLAG_FUSION_FUEL gas_specific_heat = 20 molar_mass = 0.032 @@ -153,7 +153,7 @@ /decl/material/gas/nitrogen name = "nitrogen" uid = "gas_nitrogen" - lore_text = "An ubiquitous noble gas." + lore_text = "A ubiquitous noble gas." gas_specific_heat = 20 molar_mass = 0.028 latent_heat = 199 diff --git a/code/modules/materials/definitions/liquids/materials_liquid_chemistry.dm b/code/modules/materials/definitions/liquids/materials_liquid_chemistry.dm index bb527d7123d..5f95bea169f 100644 --- a/code/modules/materials/definitions/liquids/materials_liquid_chemistry.dm +++ b/code/modules/materials/definitions/liquids/materials_liquid_chemistry.dm @@ -1,7 +1,7 @@ /decl/material/liquid/surfactant // Foam precursor name = "surfactant" uid = "liquid_surfactant" - lore_text = "A isocyanate liquid that forms a foam when mixed with water." + lore_text = "An isocyanate liquid that forms a foam when mixed with water." taste_description = "metal" color = "#9e6b38" value = 0.1 @@ -10,7 +10,7 @@ /decl/material/liquid/foaming_agent // Metal foaming agent. This is lithium hydride. Add other recipes (e.g. LiH + H2O -> LiOH + H2) eventually. name = "foaming agent" uid = "liquid_foaming_agent" - lore_text = "A agent that yields metallic foam when mixed with light metal and a strong acid." + lore_text = "An agent that yields metallic foam when mixed with light metal and a strong acid." taste_description = "metal" color = "#664b63" value = 0.1 diff --git a/code/modules/materials/definitions/liquids/materials_liquid_solvents.dm b/code/modules/materials/definitions/liquids/materials_liquid_solvents.dm index ec78c02b460..58d11660565 100644 --- a/code/modules/materials/definitions/liquids/materials_liquid_solvents.dm +++ b/code/modules/materials/definitions/liquids/materials_liquid_solvents.dm @@ -31,7 +31,7 @@ /decl/material/liquid/acid/polyacid name = "polytrinic acid" uid = "liquid_polytrinic_acid" - lore_text = "Polytrinic acid is a an extremely corrosive chemical substance." + lore_text = "Polytrinic acid is an extremely corrosive chemical substance." taste_description = "acid" color = "#8e18a9" solvent_power = MAT_SOLVENT_STRONGEST diff --git a/code/modules/mechs/components/armour.dm b/code/modules/mechs/components/armour.dm index b86d67295dc..a5c122dfade 100644 --- a/code/modules/mechs/components/armour.dm +++ b/code/modules/mechs/components/armour.dm @@ -17,7 +17,7 @@ /obj/item/robot_parts/robot_component/armour/exosuit/radproof name = "radiation-proof armour plating" - desc = "A fully enclosed radiation hardened shell designed to protect the pilot from radiation" + desc = "A fully enclosed radiation hardened shell designed to protect the pilot from radiation." armor = list( ARMOR_MELEE = ARMOR_MELEE_RESISTANT, ARMOR_BULLET = ARMOR_BALLISTIC_PISTOL, @@ -32,7 +32,7 @@ /obj/item/robot_parts/robot_component/armour/exosuit/em name = "EM-shielded armour plating" - desc = "A shielded plating that sorrounds the eletronics and protects them from electromagnetic radiation" + desc = "A shielded plating that surrounds sensitive electronic components and protects them from electromagnetic radiation." armor = list( ARMOR_MELEE = ARMOR_MELEE_RESISTANT , ARMOR_BULLET = ARMOR_BALLISTIC_SMALL, @@ -48,7 +48,7 @@ /obj/item/robot_parts/robot_component/armour/exosuit/combat name = "heavy combat plating" - desc = "Plating designed to deflect incoming attacks and explosions" + desc = "Plating designed to deflect incoming attacks and explosions." armor = list( ARMOR_MELEE = ARMOR_MELEE_MAJOR, ARMOR_BULLET = ARMOR_BALLISTIC_RESISTANT, diff --git a/code/modules/mechs/equipment/medical.dm b/code/modules/mechs/equipment/medical.dm index 4aadea64370..ac926851a43 100644 --- a/code/modules/mechs/equipment/medical.dm +++ b/code/modules/mechs/equipment/medical.dm @@ -1,6 +1,6 @@ /obj/item/mech_equipment/sleeper name = "\improper exosuit sleeper" - desc = "An exosuit-mounted sleeper designed to mantain patients stabilized on their way to medical facilities." + desc = "An exosuit-mounted sleeper designed to maintain patients stabilized on their way to medical facilities." icon_state = "mech_sleeper" restricted_hardpoints = list(HARDPOINT_BACK) restricted_software = list(MECH_SOFTWARE_MEDICAL) diff --git a/code/modules/mechs/mech_wreckage.dm b/code/modules/mechs/mech_wreckage.dm index eb23590ea08..3f0c0802015 100644 --- a/code/modules/mechs/mech_wreckage.dm +++ b/code/modules/mechs/mech_wreckage.dm @@ -1,6 +1,6 @@ /obj/structure/mech_wreckage name = "wreckage" - desc = "It might have some salvagable parts." + desc = "It might have some salvageable parts." density = TRUE opacity = TRUE anchored = TRUE diff --git a/code/modules/mob/language/synthetic.dm b/code/modules/mob/language/synthetic.dm index 99fc6d54499..6f8a751bcac 100644 --- a/code/modules/mob/language/synthetic.dm +++ b/code/modules/mob/language/synthetic.dm @@ -1,7 +1,7 @@ /decl/language/machine name = "Encoded Audio Language" shorthand = "EAL" - desc = "A efficient language of encoded tones used by synthetics." + desc = "An efficient language of encoded tones used by synthetics." speech_verb = "whistles" ask_verb = "chirps" exclaim_verb = "whistles loudly" diff --git a/code/modules/mob/living/human/human_verbs.dm b/code/modules/mob/living/human/human_verbs.dm index a43f889eb11..6eb93377612 100644 --- a/code/modules/mob/living/human/human_verbs.dm +++ b/code/modules/mob/living/human/human_verbs.dm @@ -270,7 +270,7 @@ usr.setClickCooldown(20) if(usr.stat > 0) - to_chat(usr, "You are unconcious and cannot do that!") + to_chat(usr, "You are unconscious and cannot do that!") return if(usr.restrained()) diff --git a/code/modules/mob/living/human/life.dm b/code/modules/mob/living/human/life.dm index ebc47ef1202..2e4bc449d5a 100644 --- a/code/modules/mob/living/human/life.dm +++ b/code/modules/mob/living/human/life.dm @@ -85,7 +85,7 @@ return pressure_adjustment_coefficient -// Calculate how much of the enviroment pressure-difference affects the human. +// Calculate how much of the environment pressure-difference affects the human. /mob/living/human/calculate_affecting_pressure(var/pressure) var/pressure_difference diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index dcbc0d2917e..ae5b36205d0 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -351,7 +351,7 @@ default behaviour is: switch_from_dead_to_living_mob_list() timeofdeath = 0 - // restore us to conciousness + // restore us to consciousness set_stat(CONSCIOUS) // make the icons look correct @@ -1084,7 +1084,7 @@ default behaviour is: if(user.mob_size >= exosuit.body.min_pilot_size && user.mob_size <= exosuit.body.max_pilot_size) exosuit.enter(src) else - to_chat(user, SPAN_WARNING("You cannot pilot a exosuit of this size.")) + to_chat(user, SPAN_WARNING("You cannot pilot an exosuit of this size.")) return TRUE . = ..() diff --git a/code/modules/mob/living/silicon/ai/ai_radio.dm b/code/modules/mob/living/silicon/ai/ai_radio.dm index c9a32ee9cd3..7a195abc9ba 100644 --- a/code/modules/mob/living/silicon/ai/ai_radio.dm +++ b/code/modules/mob/living/silicon/ai/ai_radio.dm @@ -2,7 +2,7 @@ name = "\improper AI subspace transceiver" desc = "Integrated AI radio transceiver." encryption_keys = list(/obj/item/encryptionkey/heads/ai_integrated) - var/disabledAi = 0 // Atlantis: Used to manually disable AI's integrated radio via inteliCard menu. + var/disabledAi = 0 // Atlantis: Used to manually disable AI's integrated radio via intelliCard menu. /obj/item/radio/headset/heads/ai_integrated/get_accessible_channel_descriptions(mob/user) . = ..() diff --git a/code/modules/mob/living/silicon/ai/power.dm b/code/modules/mob/living/silicon/ai/power.dm index 9d9206348df..1785b37ecb5 100644 --- a/code/modules/mob/living/silicon/ai/power.dm +++ b/code/modules/mob/living/silicon/ai/power.dm @@ -85,7 +85,7 @@ -// Handles all necessary power checks: Area power, inteliCard and Malf AI APU power and manual override. +// Handles all necessary power checks: Area power, intelliCard and Malf AI APU power and manual override. /mob/living/silicon/ai/proc/has_power(var/respect_override = 1) if(psupply && !(psupply.stat & NOPOWER)) return 1 @@ -214,7 +214,7 @@ update_use_power(get_power_state()) /obj/machinery/ai_powersupply/proc/get_power_state() - // Dead, powered by APU, admin power, or inside an item (inteliCard/IIS). No power usage. + // Dead, powered by APU, admin power, or inside an item (intelliCard/IIS). No power usage. if(!powered_ai.stat == DEAD || powered_ai.admin_powered || istype(powered_ai.loc, /obj/item/)) return 0 // Normal power usage. diff --git a/code/modules/mob/living/silicon/robot/drone/drone_say.dm b/code/modules/mob/living/silicon/robot/drone/drone_say.dm index c547137d125..e4d40ac20df 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_say.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_say.dm @@ -21,7 +21,7 @@ if(istype(L)) return L.broadcast(src,trim(copytext(message,2))) - //Must be concious to speak + //Must be conscious to speak if (stat) return 0 diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm index 59ead6d32d8..71c952c9dbd 100644 --- a/code/modules/mob/living/silicon/robot/robot_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_items.dm @@ -87,7 +87,7 @@ //A harvest item for serviceborgs. /obj/item/robot_harvester name = "auto harvester" - desc = "A hand-held harvest tool that resembles a sickle. It uses energy to cut plant matter very efficently." + desc = "A hand-held harvest tool that resembles a sickle. It uses energy to cut plant matter very efficiently." icon = 'icons/obj/items/borg_module/autoharvester.dmi' icon_state = "autoharvester" max_health = ITEM_HEALTH_NO_DAMAGE diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm index d8443751980..17b7b6976f2 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm @@ -89,7 +89,7 @@ /mob/living/simple_animal/hostile/beast/shantak name = "shantak" - desc = "A piglike creature with a bright iridiscent mane that sparkles as though lit by an inner light. Don't be fooled by its beauty though." + desc = "A piglike creature with a bright iridescent mane that sparkles as though lit by an inner light. Don't be fooled by its beauty though." faction = "shantak" icon = 'icons/mob/simple_animal/shantak.dmi' move_intents = list( diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index ad15792b151..3e6ec236f4c 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -780,7 +780,7 @@ usr.setClickCooldown(20) if(usr.stat == UNCONSCIOUS) - to_chat(usr, "You are unconcious and cannot do that!") + to_chat(usr, "You are unconscious and cannot do that!") return if(usr.restrained()) diff --git a/code/modules/mob/observer/eye/freelook/chunk.dm b/code/modules/mob/observer/eye/freelook/chunk.dm index 97c869dfc19..090b232c739 100644 --- a/code/modules/mob/observer/eye/freelook/chunk.dm +++ b/code/modules/mob/observer/eye/freelook/chunk.dm @@ -128,7 +128,7 @@ if(seenby.len) updating = TRUE spawn(UPDATE_BUFFER) // Batch large changes, such as many doors opening or closing at once - if(updating) // Check if we're still updating, a forced update may have occured. + if(updating) // Check if we're still updating, a forced update may have occurred. update() else dirty = TRUE // If this chunk is seen by noone, simply mark it as dirty and do nothing diff --git a/code/modules/modular_computers/computers/subtypes/dev_holo.dm b/code/modules/modular_computers/computers/subtypes/dev_holo.dm index f2460d4efdf..838bce869e9 100644 --- a/code/modules/modular_computers/computers/subtypes/dev_holo.dm +++ b/code/modules/modular_computers/computers/subtypes/dev_holo.dm @@ -1,6 +1,6 @@ /obj/item/modular_computer/holotablet name = "holotablet" - desc = "An holoemitter-fitted device designed for writing reports and notes." + desc = "A holoemitter-fitted device designed for writing reports and notes." icon = 'icons/obj/modular_computers/holo/basic.dmi' icon_state = ICON_STATE_WORLD diff --git a/code/modules/modular_computers/file_system/programs/research/ai_restorer.dm b/code/modules/modular_computers/file_system/programs/research/ai_restorer.dm index 8683438c072..a1b613ac1ce 100644 --- a/code/modules/modular_computers/file_system/programs/research/ai_restorer.dm +++ b/code/modules/modular_computers/file_system/programs/research/ai_restorer.dm @@ -4,7 +4,7 @@ program_icon_state = "generic" program_key_state = "mining_key" program_menu_icon = "person" - extended_desc = "This program is capable of reconstructing damaged AI systems. It can also be used to upload basic laws to the AI. Requires direct AI connection via inteliCard slot." + extended_desc = "This program is capable of reconstructing damaged AI systems. It can also be used to upload basic laws to the AI. Requires direct AI connection via intelliCard slot." size = 12 read_access = list(access_bridge) requires_access_to_run = 0 diff --git a/code/modules/modular_computers/hardware/ai_slot.dm b/code/modules/modular_computers/hardware/ai_slot.dm index c25e0abb1d5..72345bf4939 100644 --- a/code/modules/modular_computers/hardware/ai_slot.dm +++ b/code/modules/modular_computers/hardware/ai_slot.dm @@ -1,7 +1,7 @@ -// A wrapper that allows the computer to contain an inteliCard. +// A wrapper that allows the computer to contain an intelliCard. /obj/item/stock_parts/computer/ai_slot - name = "inteliCard slot" - desc = "An IIS interlink with connection uplinks that allow the device to interface with most common inteliCard models. Too large to fit into tablets. Uses a lot of power when active." + name = "intelliCard slot" + desc = "An IIS interlink with connection uplinks that allow the device to interface with most common intelliCard models. Too large to fit into tablets. Uses a lot of power when active." icon_state = "aislot" hardware_size = 1 critical = 0 @@ -58,7 +58,7 @@ device = locate() in src if(!device.stored_card) - to_chat(user, "There is no intellicard connected to \the [src].") + to_chat(user, "There is no intelliCard connected to \the [src].") return device.do_eject_ai(user) diff --git a/code/modules/modular_computers/hardware/battery_module.dm b/code/modules/modular_computers/hardware/battery_module.dm index 7c47bf5a7ba..52f0b478b33 100644 --- a/code/modules/modular_computers/hardware/battery_module.dm +++ b/code/modules/modular_computers/hardware/battery_module.dm @@ -2,7 +2,7 @@ // have tremendeous capacity in comparsion. Higher tier cells would provide your device with nearly infinite battery life, which is something i want to avoid. /obj/item/stock_parts/computer/battery_module name = "standard battery" - desc = "A standard power cell, commonly seen in high-end portable microcomputers or low-end laptops. It's rating is 75 Wh." + desc = "A standard power cell, commonly seen in high-end portable microcomputers or low-end laptops. Its rating is 75 Wh." icon_state = "battery_normal" critical = 1 origin_tech = @'{"powerstorage":1,"engineering":1}' @@ -35,7 +35,7 @@ /obj/item/stock_parts/computer/battery_module/advanced name = "advanced battery" - desc = "An advanced power cell, often used in most laptops. It is too large to be fitted into smaller devices. It's rating is 110 Wh." + desc = "An advanced power cell, often used in most laptops. It is too large to be fitted into smaller devices. Its rating is 110 Wh." icon_state = "battery_advanced" origin_tech = @'{"powerstorage":2,"engineering":2}' hardware_size = 2 @@ -44,7 +44,7 @@ /obj/item/stock_parts/computer/battery_module/super name = "super battery" - desc = "A very advanced power cell, often used in high-end devices, or as uninterruptable power supply for important consoles or servers. It's rating is 150 Wh." + desc = "A very advanced power cell, often used in high-end devices, or as uninterruptible power supply for important consoles or servers. Its rating is 150 Wh." icon_state = "battery_super" origin_tech = @'{"powerstorage":3,"engineering":3}' hardware_size = 2 @@ -53,7 +53,7 @@ /obj/item/stock_parts/computer/battery_module/ultra name = "ultra battery" - desc = "A very advanced large power cell. It's often used as uninterruptable power supply for critical consoles or servers. It's rating is 200 Wh." + desc = "A very advanced large power cell. It's often used as an uninterruptible power supply for critical consoles or servers. Its rating is 200 Wh." icon_state = "battery_ultra" origin_tech = @'{"powerstorage":5,"engineering":4}' hardware_size = 3 @@ -62,7 +62,7 @@ /obj/item/stock_parts/computer/battery_module/micro name = "micro battery" - desc = "A small power cell, commonly seen in most portable microcomputers. It's rating is 50 Wh." + desc = "A small power cell, commonly seen in most portable microcomputers. Its rating is 50 Wh." icon_state = "battery_micro" origin_tech = @'{"powerstorage":2,"engineering":2}' battery_rating = 50 @@ -70,7 +70,7 @@ /obj/item/stock_parts/computer/battery_module/nano name = "nano battery" - desc = "A tiny power cell, commonly seen in low-end portable microcomputers. It's rating is 30 Wh." + desc = "A tiny power cell, commonly seen in low-end portable microcomputers. Its rating is 30 Wh." icon_state = "battery_nano" battery_rating = 30 material = /decl/material/solid/metal/steel diff --git a/code/modules/modular_computers/hardware/network_card.dm b/code/modules/modular_computers/hardware/network_card.dm index 562ea9a221a..7915dc05bac 100644 --- a/code/modules/modular_computers/hardware/network_card.dm +++ b/code/modules/modular_computers/hardware/network_card.dm @@ -31,7 +31,7 @@ /obj/item/stock_parts/computer/network_card/advanced name = "advanced network card" - desc = "An advanced network card for usage with standard network protocols. It's transmitter is strong enough to connect even when far away." + desc = "An advanced network card for usage with standard network protocols. Its transmitter is strong enough to connect even when far away." long_range = 1 origin_tech = @'{"programming":4,"engineering":2}' power_usage = 100 // Better range but higher power usage. diff --git a/code/modules/modular_computers/hardware/processor_unit.dm b/code/modules/modular_computers/hardware/processor_unit.dm index 95cf5d8525d..9c803c2c2ad 100644 --- a/code/modules/modular_computers/hardware/processor_unit.dm +++ b/code/modules/modular_computers/hardware/processor_unit.dm @@ -25,7 +25,7 @@ /obj/item/stock_parts/computer/processor_unit/photonic name = "photonic processor" - desc = "An advanced experimental CPU that uses photonic core instead of regular circuitry. It is more power efficient than its elecron analog." + desc = "An advanced experimental CPU that uses photonic core instead of regular circuitry. It is more power efficient than its electron analogue." icon_state = "cpu_normal_photonic" hardware_size = 2 power_usage = 50 @@ -36,7 +36,7 @@ /obj/item/stock_parts/computer/processor_unit/photonic/small name = "photonic microprocessor" - desc = "An advanced miniaturised CPU for use in portable devices. It uses photonic core instead of regular circuitry. It is more power efficient than its elecron analog." + desc = "An advanced miniaturised CPU for use in portable devices. It uses photonic core instead of regular circuitry. It is more power efficient than its electron analogue." icon_state = "cpu_small_photonic" hardware_size = 1 power_usage = 10 diff --git a/code/modules/modular_computers/terminal/terminal.dm b/code/modules/modular_computers/terminal/terminal.dm index dec38ed92f1..02f13da48bc 100644 --- a/code/modules/modular_computers/terminal/terminal.dm +++ b/code/modules/modular_computers/terminal/terminal.dm @@ -266,4 +266,4 @@ if(OS_NETWORK_ERROR) return "Unable to connect to the network" - return "An unspecified error occured." \ No newline at end of file + return "An unspecified error occurred." \ No newline at end of file diff --git a/code/modules/nano/interaction/default.dm b/code/modules/nano/interaction/default.dm index 4e1f89bb2d4..51a7a6eca75 100644 --- a/code/modules/nano/interaction/default.dm +++ b/code/modules/nano/interaction/default.dm @@ -45,13 +45,13 @@ var/global/datum/topic_state/default/default_topic_state = new if(src_object in view(client.view, src)) return STATUS_INTERACTIVE - // If we're installed in a chassi, rather than transfered to an inteliCard or other container, then check if we have camera view + // If we're installed in a chassi, rather than transfered to an intelliCard or other container, then check if we have camera view if(is_in_chassis()) //stop AIs from leaving windows open and using then after they lose vision if(cameranet && !cameranet.is_turf_visible(get_turf(src_object))) return STATUS_CLOSE return STATUS_INTERACTIVE - else if(get_dist(src_object, src) <= get_effective_view(client)) // View does not return what one would expect while installed in an inteliCard + else if(get_dist(src_object, src) <= get_effective_view(client)) // View does not return what one would expect while installed in an intelliCard return STATUS_INTERACTIVE return STATUS_CLOSE diff --git a/code/modules/organs/internal/brain_computer.dm b/code/modules/organs/internal/brain_computer.dm index 78d41959026..919b10e056d 100644 --- a/code/modules/organs/internal/brain_computer.dm +++ b/code/modules/organs/internal/brain_computer.dm @@ -1,7 +1,7 @@ // Robobrain. /obj/item/organ/internal/brain/robotic name = "computer intelligence core" - desc = "The pinnacle of artifical intelligence technology, conveniently stored in a fist-sized cube." + desc = "The pinnacle of artificial intelligence technology, conveniently stored in a fist-sized cube." icon = 'icons/obj/items/brain_interface_robotic.dmi' origin_tech = @'{"engineering":4,"materials":4,"wormholes":2,"programming":4}' material = /decl/material/solid/metal/steel diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 36d6a3ac531..72bf4e7ad02 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -630,7 +630,7 @@ var/global/list/ailment_reference_cache = list() STOP_PROCESSING(SSobj, src) vital_to_owner = null -//Since some types of organs completely ignore being detached, moved it to an overridable organ proc for external prosthetics +//Since some types of organs completely ignore being detached, moved it to an overrideable organ proc for external prosthetics /obj/item/organ/proc/set_detached(var/is_detached) if(is_detached) status |= ORGAN_CUT_AWAY diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm index cfbf0ad897d..d1a57276851 100644 --- a/code/modules/overmap/ships/computers/sensors.dm +++ b/code/modules/overmap/ships/computers/sensors.dm @@ -257,4 +257,4 @@ /obj/machinery/shipsensors/weak heat_reduction = 0.2 - desc = "Miniturized gravity scanner with various other sensors, used to detect irregularities in surrounding space. Can only run in vacuum to protect delicate quantum BS elements." + desc = "Miniaturized gravity scanner with various other sensors, used to detect irregularities in surrounding space. Can only run in vacuum to protect delicate quantum BS elements." diff --git a/code/modules/overmap/ships/machines/fusion_thruster.dm b/code/modules/overmap/ships/machines/fusion_thruster.dm index c8e10e58d04..0f4b673554c 100644 --- a/code/modules/overmap/ships/machines/fusion_thruster.dm +++ b/code/modules/overmap/ships/machines/fusion_thruster.dm @@ -1,6 +1,6 @@ /obj/machinery/atmospherics/unary/engine/fusion name = "fusion nozzle" - desc = "Simple rocket nozzle, expelling gas at hypersonic velocities to propell the ship." + desc = "Simple rocket nozzle, expelling gas at hypersonic velocities to propel the ship." base_type = /obj/machinery/atmospherics/unary/engine/fusion engine_extension = /datum/extension/ship_engine/gas/fusion diff --git a/code/modules/overmap/ships/machines/gas_thruster.dm b/code/modules/overmap/ships/machines/gas_thruster.dm index 7650eb31085..4d744491d3a 100644 --- a/code/modules/overmap/ships/machines/gas_thruster.dm +++ b/code/modules/overmap/ships/machines/gas_thruster.dm @@ -1,6 +1,6 @@ /obj/machinery/atmospherics/unary/engine name = "rocket nozzle" - desc = "Simple rocket nozzle, expelling gas at hypersonic velocities to propell the ship." + desc = "Simple rocket nozzle, expelling gas at hypersonic velocities to propel the ship." icon = 'icons/obj/ship_engine.dmi' icon_state = "nozzle" layer = STRUCTURE_LAYER diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 6e2b63b82fa..11e314053ce 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -6,7 +6,7 @@ var/global/list/all_apcs = list() // Requires a wire connection to a power network through a terminal // Generates a terminal based on the direction of the APC on spawn -// There are three different power channels, lighting, equipment, and enviroment +// There are three different power channels, lighting, equipment, and environment // Each may have one of the following states // Power channels set to Auto change when power levels rise or drop below a threshold diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index a60fab7f939..f6dada5b25d 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -1,7 +1,7 @@ // Power Cells /obj/item/cell name = "power cell" - desc = "A rechargable electrochemical power cell." + desc = "A rechargeable electrochemical power cell." icon = 'icons/obj/power.dmi' icon_state = "cell" item_state = "cell" @@ -315,13 +315,13 @@ /obj/item/cell/potato name = "potato battery" - desc = "A rechargable starch based power cell." + desc = "A rechargeable starch based power cell." origin_tech = @'{"powerstorage":1}' icon = 'icons/obj/power.dmi' icon_state = "potato_cell" maxcharge = 20 -//Generic battery cell for guns with rechargable batteries. +//Generic battery cell for guns with rechargeable batteries. /obj/item/cell/gun name = "weapon energy cell" desc = "A military grade high-density battery, expected to deplete after tens of thousands of complete charge cycles." diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 4fbd6dea467..d9ffb660f37 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -11,7 +11,7 @@ /obj/machinery/gravity_generator/ name = "Gravitational Generator" - desc = "A device which produces a gravaton field when set up." + desc = "A device which produces a graviton field when set up." icon = 'icons/obj/singularity.dmi' icon_state = "TheSingGen" anchored = TRUE diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 4f5e0eb41cc..d20a0eb1c23 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -403,7 +403,7 @@ /obj/machinery/port_gen/pacman/super name = "portable fission generator" - desc = "A power generator that utilizes uranium sheets as fuel. Can run for much longer than the standard portabke generators. Rated for 80 kW max safe output." + desc = "A power generator that utilizes uranium sheets as fuel. Can run for much longer than the standard portable generators. Rated for 80 kW max safe output." icon_state = "portgen1" sheet_path = /obj/item/stack/material/puck sheet_material = /decl/material/solid/metal/uranium diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm index 59665f270cb..cccc10631e3 100644 --- a/code/modules/power/smes_construction.dm +++ b/code/modules/power/smes_construction.dm @@ -37,7 +37,7 @@ // 500% Charge Capacity, 40% I/O Capacity. Holds a lot of energy, but charges slowly if not combined with other coils. Ideal for backup storage. /obj/item/stock_parts/smes_coil/super_capacity name = "superconductive capacitance coil" - desc = "Specialised version of standard superconductive magnetic coil. This one has significantly stronger containment field, allowing for significantly larger power storage. It's IO rating is much lower, however." + desc = "Specialised version of standard superconductive magnetic coil. This one has significantly stronger containment field, allowing for significantly larger power storage. Its IO rating is much lower, however." icon_state = "smes_coil_capacitance" ChargeCapacity = 250 KILOWATTS IOCapacity = 100 KILOWATTS @@ -76,7 +76,7 @@ maximum_component_parts = list(/obj/item/stock_parts/smes_coil = 6, /obj/item/stock_parts = 15) interact_offline = TRUE var/safeties_enabled = 1 // If 0 modifications can be done without discharging the SMES, at risk of critical failure. - var/failing = 0 // If 1 critical failure has occured and SMES explosion is imminent. + var/failing = 0 // If 1 critical failure has occurred and SMES explosion is imminent. var/grounding = 1 // Cut to quickly discharge, at cost of "minor" electrical issues in output powernet. var/RCon = 1 // Cut to disable AI and remote control. var/RCon_tag = "NO_TAG" // RCON tag, change to show it on SMES Remote control console. diff --git a/code/modules/projectiles/guns/energy/capacitor.dm b/code/modules/projectiles/guns/energy/capacitor.dm index 1232ef3e8f3..6d417484f83 100644 --- a/code/modules/projectiles/guns/energy/capacitor.dm +++ b/code/modules/projectiles/guns/energy/capacitor.dm @@ -259,7 +259,7 @@ var/global/list/laser_wavelengths // Subtypes. /obj/item/gun/energy/capacitor/rifle name = "capacitor rifle" - desc = "A heavy, unwieldly directed energy weapon that uses a linear capacitor array to charge a powerful beam." + desc = "A heavy, unwieldy directed energy weapon that uses a linear capacitor array to charge a powerful beam." max_capacitors = 4 icon = 'icons/obj/guns/capacitor_rifle.dmi' slot_flags = SLOT_BACK diff --git a/code/modules/projectiles/guns/launcher/foam_gun.dm b/code/modules/projectiles/guns/launcher/foam_gun.dm index af3cbb1519b..8bdb703a1a1 100644 --- a/code/modules/projectiles/guns/launcher/foam_gun.dm +++ b/code/modules/projectiles/guns/launcher/foam_gun.dm @@ -97,7 +97,7 @@ //the projectile /obj/item/foam_dart name = "foam dart" - desc = "An offical Jorf brand foam dart, for use only with offical Jorf brand foam dart launching products." + desc = "An official Jorf brand foam dart, for use only with official Jorf brand foam dart launching products." icon = 'icons/obj/guns/foam/dart.dmi' icon_state = "dart" w_class = ITEM_SIZE_TINY @@ -128,7 +128,7 @@ //boxes of the projectile /obj/item/box/foam_darts name = "box of foam darts" - desc = "It's a box of offical Jorf brand foam darts, for use only with offical Jorf brand products." + desc = "It's a box of official Jorf brand foam darts, for use only with official Jorf brand products." icon = 'icons/obj/guns/foam/boxes.dmi' icon_state = "dart_box" diff --git a/code/modules/projectiles/guns/launcher/syringe_gun.dm b/code/modules/projectiles/guns/launcher/syringe_gun.dm index 69fa0078472..6594d041a58 100644 --- a/code/modules/projectiles/guns/launcher/syringe_gun.dm +++ b/code/modules/projectiles/guns/launcher/syringe_gun.dm @@ -152,7 +152,7 @@ /obj/item/gun/launcher/syringe/disguised name = "deluxe electronic cigarette" - desc = "A premium model eGavana MK3 electronic cigarette, shaped like a cigar." + desc = "A premium model eHavana MK3 electronic cigarette, shaped like a cigar." icon = 'icons/clothing/mask/smokables/cigarette_electronic_deluxe.dmi' icon_state = ICON_STATE_WORLD w_class = ITEM_SIZE_SMALL diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 0021fc7522b..136afb2c921 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -1,6 +1,6 @@ /obj/item/gun/projectile/shotgun/pump name = "shotgun" - desc = "The mass-produced W-T Remmington 29x shotgun is a favourite of police and security forces on many worlds. Useful for sweeping alleys." + desc = "The mass-produced W-T Remington 29x shotgun is a favourite of police and security forces on many worlds. Useful for sweeping alleys." icon = 'icons/obj/guns/shotgun/pump.dmi' icon_state = ICON_STATE_WORLD max_shells = 4 diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 9b76b5dec22..ba629119594 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -186,7 +186,7 @@ var/global/datum/reagents/sink/infinite_reagent_sink = new if((check_flags & ATOM_FLAG_NO_REACT) && (check_flags & ATOM_FLAG_NO_PHASE_CHANGE) && (check_flags & ATOM_FLAG_NO_DISSOLVE)) return 0 - var/reaction_occured = FALSE + var/reaction_occurred = FALSE var/list/eligible_reactions = list() var/temperature = location?.temperature || T20C @@ -228,7 +228,7 @@ var/global/datum/reagents/sink/infinite_reagent_sink = new clear_reagent(R.type) for(var/product in replace_self_with) add_reagent(product, replace_self_with[product] * replace_amount) - reaction_occured = TRUE + reaction_occurred = TRUE if(location) if(replace_message) @@ -245,7 +245,7 @@ var/global/datum/reagents/sink/infinite_reagent_sink = new for(var/decl/chemical_reaction/reaction in eligible_reactions) if(reaction.can_happen(src)) active_reactions[reaction] = 1 // The number is going to be 1/(fraction of remaining reagents we are allowed to use), computed below - reaction_occured = 1 + reaction_occurred = 1 var/list/used_reagents = list() // if two reactions share a reagent, each is allocated half of it, so we compute this here @@ -273,10 +273,10 @@ var/global/datum/reagents/sink/infinite_reagent_sink = new update_total() - if(reaction_occured) + if(reaction_occurred) HANDLE_REACTIONS(src) // Check again in case the new reagents can react again - return reaction_occured + return reaction_occurred /* Holder-to-chemical */ /datum/reagents/proc/handle_update(var/safety) diff --git a/code/modules/reagents/chems/chems_alcohol.dm b/code/modules/reagents/chems/chems_alcohol.dm index 44384d64365..505354b4d30 100644 --- a/code/modules/reagents/chems/chems_alcohol.dm +++ b/code/modules/reagents/chems/chems_alcohol.dm @@ -121,7 +121,7 @@ /decl/material/liquid/alcohol/ale name = "ale" - lore_text = "A dark alchoholic beverage made by malted barley and yeast." + lore_text = "A dark alcoholic beverage made by malted barley and yeast." taste_description = "hearty barley ale" color = "#4c3100" strength = 50 @@ -174,7 +174,7 @@ /decl/material/liquid/alcohol/cognac name = "cognac" - lore_text = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. Classy as fornication." + lore_text = "A sweet and strongly alcoholic drink, made after numerous distillations and years of maturing. Classy as fornication." taste_description = "rich and smooth alcohol" taste_mult = 1.1 color = "#ab3c05" @@ -199,7 +199,7 @@ glass_name = "gin" glass_desc = "A crystal clear glass of Griffeater gin." -//Base type for alchoholic drinks containing coffee +//Base type for alcoholic drinks containing coffee /decl/material/liquid/alcohol/coffee name = "coffee liqueur" lore_text = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936!" @@ -362,7 +362,7 @@ /decl/material/liquid/alcohol/wine name = "red wine" - lore_text = "An premium alchoholic beverage made from distilled grape juice." + lore_text = "An premium alcoholic beverage made from distilled grape juice." taste_description = "bitter sweetness" color = "#7e4043" // rgb: 126, 64, 67 strength = 15 @@ -375,7 +375,7 @@ /decl/material/liquid/alcohol/wine/premium name = "white wine" - lore_text = "An exceptionally expensive alchoholic beverage made from distilled white grapes." + lore_text = "An exceptionally expensive alcoholic beverage made from distilled white grapes." taste_description = "white velvet" color = "#ffddaa" // rgb: 255, 221, 170 - a light cream strength = 20 diff --git a/code/modules/reagents/cocktails.dm b/code/modules/reagents/cocktails.dm index 166d689541b..1815fa6e998 100644 --- a/code/modules/reagents/cocktails.dm +++ b/code/modules/reagents/cocktails.dm @@ -236,7 +236,7 @@ /decl/cocktail/beepsky_smash name = "Beepsky Smash" - description = "A cocktail originating with stationside security forces. Rumoured to take the edge off being stunned with your own baton." + description = "A cocktail originating with station-side security forces. Rumoured to take the edge off being stunned with your own baton." ratios = list( /decl/material/liquid/alcohol/whiskey = 2, /decl/material/liquid/drink/juice/lime = 1, @@ -560,7 +560,7 @@ /decl/cocktail/rewriter name = "Rewriter" - description = "A sickly concotion that college students and academics swear by for getting you through an all-nighter or six." + description = "A sickly concoction that college students and academics swear by for getting you through an all-nighter or six." ratios = list( /decl/material/liquid/drink/coffee = 1, /decl/material/liquid/drink/citrussoda = 1 diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index 658b68dddf7..862b3d65505 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -117,7 +117,7 @@ /obj/item/chems/borghypo/service name = "cyborg drink synthesizer" - desc = "A portable drink dispencer." + desc = "A portable drink dispenser." icon = 'icons/obj/drinks.dmi' icon_state = "shaker" charge_cost = 5 diff --git a/code/modules/reagents/reagent_containers/drinks/bottle.dm b/code/modules/reagents/reagent_containers/drinks/bottle.dm index 54d4516579a..4da6883ce56 100644 --- a/code/modules/reagents/reagent_containers/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/drinks/bottle.dm @@ -346,7 +346,7 @@ /obj/item/chems/drinks/bottle/cognac name = "Chateau De Baton Premium Cognac" - desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time." + desc = "A sweet and strongly alcoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time." icon_state = "cognacbottle" center_of_mass = @'{"x":16,"y":6}' diff --git a/code/modules/reagents/reagent_containers/drinks/cocktailshaker.dm b/code/modules/reagents/reagent_containers/drinks/cocktailshaker.dm index c2517e3b519..f8416cf3a1f 100644 --- a/code/modules/reagents/reagent_containers/drinks/cocktailshaker.dm +++ b/code/modules/reagents/reagent_containers/drinks/cocktailshaker.dm @@ -1,6 +1,6 @@ /obj/item/chems/drinks/shaker name = "shaker" - desc = "A three piece Cobbler-style shaker. Used to mix, cool, and strain drinks." + desc = "A three-piece Cobbler-style shaker. Used to mix, cool, and strain drinks." icon_state = "shaker" amount_per_transfer_from_this = 10 possible_transfer_amounts = @"[5,10,15,25,30,60]" //Professional bartender should be able to transfer as much as needed diff --git a/code/modules/reagents/reagent_containers/food/canned/_canned.dm b/code/modules/reagents/reagent_containers/food/canned/_canned.dm index 5e4c35d8129..63fa762a18d 100644 --- a/code/modules/reagents/reagent_containers/food/canned/_canned.dm +++ b/code/modules/reagents/reagent_containers/food/canned/_canned.dm @@ -82,7 +82,7 @@ /obj/item/food/can/beans name = "baked beans" icon_state = "beans" - desc = "Carefully synthethized from soy." + desc = "Carefully synthesized from soy." trash = /obj/item/trash/beans filling_color = "#ff6633" nutriment_desc = list("beans" = 1) diff --git a/code/modules/reagents/reagent_containers/food/dairy/cheeses.dm b/code/modules/reagents/reagent_containers/food/dairy/cheeses.dm index 9b31f8e3c7c..b6f7287382d 100644 --- a/code/modules/reagents/reagent_containers/food/dairy/cheeses.dm +++ b/code/modules/reagents/reagent_containers/food/dairy/cheeses.dm @@ -22,7 +22,7 @@ /obj/item/food/dairy/cheese/wheel name = "wheel" - desc = "A big wheel of delcious cheese." + desc = "A big wheel of delicious cheese." icon = 'icons/obj/food/dairy/cheese_wheel.dmi' slice_path = /obj/item/food/dairy/cheese/wedge/slice slice_num = 5 diff --git a/code/modules/reagents/reagent_containers/food/junkfood.dm b/code/modules/reagents/reagent_containers/food/junkfood.dm index 7792578bcda..70a2f267872 100644 --- a/code/modules/reagents/reagent_containers/food/junkfood.dm +++ b/code/modules/reagents/reagent_containers/food/junkfood.dm @@ -91,7 +91,7 @@ /obj/item/food/junk/squid name = "\improper Calamari Crisps" icon_state = "squid" - desc = "Space cepholapod tentacles, carefully removed from the squid then dried into strips of delicious rubbery goodness!" + desc = "Space cephalopod tentacles, carefully removed from the squid then dried into strips of delicious rubbery goodness!" trash = /obj/item/trash/squid filling_color = "#c0a9d7" center_of_mass = @'{"x":15,"y":9}' @@ -355,7 +355,7 @@ /obj/item/food/junk/oort name = "\improper Cloud Rocks" icon_state = "oort" - desc = "Pop rocks. The new formula guarantees fewer shrapnel induced oral injuries." + desc = "Pop rocks. The new formula guarantees fewer shrapnel-induced oral injuries." trash = /obj/item/trash/oort filling_color = "#3f7dd2" center_of_mass = @'{"x":15,"y":9}' diff --git a/code/modules/reagents/reagent_containers/food/pasta.dm b/code/modules/reagents/reagent_containers/food/pasta.dm index b62330fb2e9..94c12fc4feb 100644 --- a/code/modules/reagents/reagent_containers/food/pasta.dm +++ b/code/modules/reagents/reagent_containers/food/pasta.dm @@ -54,7 +54,7 @@ /obj/item/food/meatballspagetti name = "spaghetti & meatballs" - desc = "Now thats a nice meatball!" + desc = "Now that's a nice meatball!" icon = 'icons/obj/food/pasta/meatball_spaghetti.dmi' plate = /obj/item/plate filling_color = "#de4545" diff --git a/code/modules/reagents/reagent_containers/food/sliceable/cakes.dm b/code/modules/reagents/reagent_containers/food/sliceable/cakes.dm index e5088980d8e..2d7f45c72ee 100644 --- a/code/modules/reagents/reagent_containers/food/sliceable/cakes.dm +++ b/code/modules/reagents/reagent_containers/food/sliceable/cakes.dm @@ -17,7 +17,7 @@ /obj/item/food/slice/carrotcake name = "carrot cake slice" - desc = "Carrotty slice of carrot cake, carrots are good for your eyes! It's true! Probably!" + desc = "Carrot-y slice of carrot cake, carrots are good for your eyes! It's true! Probably!" icon = 'icons/obj/food/baked/cakes/slices/carrot.dmi' plate = /obj/item/plate filling_color = "#ffd675" @@ -77,7 +77,7 @@ /obj/item/food/slice/cheesecake name = "cheese cake slice" - desc = "Slice of pure cheestisfaction." + desc = "Slice of pure cheesatisfaction." icon = 'icons/obj/food/baked/cakes/slices/cheese.dmi' plate = /obj/item/plate filling_color = "#faf7af" diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index be5659ebba4..70dc6661c2a 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -22,7 +22,7 @@ ) // autoinjectors takes less time than a normal syringe (overriden for hypospray). - // This delay is only applied when injecting concious mobs, and is not applied for self-injection + // This delay is only applied when injecting conscious mobs, and is not applied for self-injection // The 1.9 factor scales it so it takes the following number of seconds: // NONE 1.47 // BASIC 1.00 @@ -57,7 +57,7 @@ user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) user.do_attack_animation(target) - if(user != target && !target.incapacitated() && time) // you're injecting someone else who is concious, so apply the device's intrisic delay + if(user != target && !target.incapacitated() && time) // you're injecting someone else who is conscious, so apply the device's intrisic delay to_chat(user, SPAN_WARNING("\The [user] is trying to inject \the [target] with \the [name].")) if(!user.do_skilled(time, SKILL_MEDICAL, target)) return TRUE @@ -83,7 +83,7 @@ //////////////////////////////////////////////////////////////////////////////// /obj/item/chems/hypospray/vial name = "hypospray" - desc = "A sterile, air-needle autoinjector for rapid administration of drugs to patients. Uses a replacable 30u vial." + desc = "A sterile, air-needle autoinjector for rapid administration of drugs to patients. Uses a replaceable 30u vial." possible_transfer_amounts = @"[1,2,5,10,15,20,30]" amount_per_transfer_from_this = 5 volume = 0 diff --git a/code/modules/reagents/reagent_containers/retort.dm b/code/modules/reagents/reagent_containers/retort.dm index d19e473ee33..0b78d727e24 100644 --- a/code/modules/reagents/reagent_containers/retort.dm +++ b/code/modules/reagents/reagent_containers/retort.dm @@ -1,7 +1,7 @@ /obj/item/chems/glass/retort name = "retort" base_name = "retort" - desc = "A strangely-shaped vessel for seperating chemicals when heated." + desc = "A strangely-shaped vessel for separating chemicals when heated." icon = 'icons/obj/items/retort.dmi' icon_state = ICON_STATE_WORLD volume = 120 diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index febab7b3c6b..da96a75e031 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -301,7 +301,7 @@ var/global/list/all_conveyor_switches = list() /obj/item/conveyor_switch_construct/oneway name = "one-way conveyor switch assembly" - desc = "An one-way conveyor control switch assembly." + desc = "A one-way conveyor control switch assembly." /obj/item/conveyor_switch_construct/oneway/afterattack(atom/A, mob/user, proximity) if(!proximity || !istype(A, /turf/floor) || user.incapacitated()) diff --git a/code/modules/research/research_fields.dm b/code/modules/research/research_fields.dm index 31448ed7631..d37be7dde72 100644 --- a/code/modules/research/research_fields.dm +++ b/code/modules/research/research_fields.dm @@ -49,7 +49,7 @@ /decl/research_field/programming name = "Data Science" - desc = "The study of computer science, data manipuation and artificial intelligence." + desc = "The study of computer science, data manipulation and artificial intelligence." id = TECH_DATA /decl/research_field/esoteria diff --git a/code/modules/sealant_gun/sealant_gun.dm b/code/modules/sealant_gun/sealant_gun.dm index 70d644b721c..6f0d9196644 100644 --- a/code/modules/sealant_gun/sealant_gun.dm +++ b/code/modules/sealant_gun/sealant_gun.dm @@ -1,6 +1,6 @@ /obj/item/gun/launcher/sealant name = "sealant gun" - desc = "A heavy, unwieldly device used to spray metal foam sealant onto hull breaches or damaged flooring." + desc = "A heavy, unwieldy device used to spray metal foam sealant onto hull breaches or damaged flooring." icon = 'icons/obj/guns/sealant_gun.dmi' icon_state = ICON_STATE_WORLD autofire_enabled = TRUE diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm index 85ee565817b..7edabde4cb4 100644 --- a/code/modules/shuttles/shuttle.dm +++ b/code/modules/shuttles/shuttle.dm @@ -116,7 +116,7 @@ if (moving_status == SHUTTLE_IDLE) return //someone cancelled the launch - if(!fuel_check()) //fuel error (probably out of fuel) occured, so cancel the launch + if(!fuel_check()) //fuel error (probably out of fuel) occurred, so cancel the launch var/datum/shuttle/autodock/S = src if(istype(S)) S.cancel_launch(null) @@ -138,7 +138,7 @@ if(moving_status == SHUTTLE_IDLE) return //someone cancelled the launch - if(!fuel_check()) //fuel error (probably out of fuel) occured, so cancel the launch + if(!fuel_check()) //fuel error (probably out of fuel) occurred, so cancel the launch var/datum/shuttle/autodock/S = src if(istype(S)) S.cancel_launch(null) diff --git a/code/modules/shuttles/shuttle_ferry.dm b/code/modules/shuttles/shuttle_ferry.dm index ebe0a7cf54f..020d8c670c9 100644 --- a/code/modules/shuttles/shuttle_ferry.dm +++ b/code/modules/shuttles/shuttle_ferry.dm @@ -63,4 +63,4 @@ if(initial(waypoint_offsite)) return "The offsite waypoint landmark (tag: [initial(waypoint_offsite)]) was not found." else - return "A offsite waypoint was not properly set." \ No newline at end of file + return "An offsite waypoint was not properly set." \ No newline at end of file diff --git a/code/modules/shuttles/shuttle_log.dm b/code/modules/shuttles/shuttle_log.dm index 8313873b212..b4cf0a2d7b5 100644 --- a/code/modules/shuttles/shuttle_log.dm +++ b/code/modules/shuttles/shuttle_log.dm @@ -17,7 +17,7 @@ SSshuttle.shuttle_logs[given_shuttle] = src /datum/shuttle_log/Destroy() - update_registred() + update_registered() registered = null current_mission = null QDEL_NULL_LIST(missions) @@ -30,7 +30,7 @@ /datum/shuttle_log/proc/unregister(datum/nano_module/module) registered -= module -/datum/shuttle_log/proc/update_registred() +/datum/shuttle_log/proc/update_registered() for(var/datum/nano_module/module in registered) SSnano.update_uis(module) @@ -49,7 +49,7 @@ qdel(old_report) new_report.mission.set_value(mission.name) mission.other_reports += report - update_registred() + update_registered() return 1 /datum/shuttle_log/proc/process_queue() @@ -64,7 +64,7 @@ if(!current_mission && length(queued_missions)) current_mission = queued_missions[1] current_mission.stage = SHUTTLE_MISSION_PLANNED - update_registred() + update_registered() /datum/shuttle_log/proc/create_mission(name) var/datum/shuttle_mission/mission = new() @@ -85,7 +85,7 @@ mission.name = name for(var/datum/computer_file/report/recipient/shuttle/report in mission.other_reports) report.mission.set_value(name) - update_registred() + update_registered() //Only missions that haven't started can be deleted; returns 0 on failure. /datum/shuttle_log/proc/delete_mission(datum/shuttle_mission/mission) diff --git a/code/modules/surgery/crystal.dm b/code/modules/surgery/crystal.dm index b607c915c26..39ec4770a45 100644 --- a/code/modules/surgery/crystal.dm +++ b/code/modules/surgery/crystal.dm @@ -1,6 +1,6 @@ /decl/surgery_step/generic/cut_open/crystal name = "Drill keyhole incision" - description = "This procedure drills a keyhold incision into crystalline limbs to allow for delicate internal work." + description = "This procedure drills a keyhole incision into crystalline limbs to allow for delicate internal work." allowed_tools = list(TOOL_SURGICAL_DRILL = 100) fail_string = "cracking" access_string = "a neat hole" diff --git a/code/modules/synthesized_instruments/real_instruments/Trumpet/trumpet.dm b/code/modules/synthesized_instruments/real_instruments/Trumpet/trumpet.dm index ef2caaa8bb4..6f275ac2521 100644 --- a/code/modules/synthesized_instruments/real_instruments/Trumpet/trumpet.dm +++ b/code/modules/synthesized_instruments/real_instruments/Trumpet/trumpet.dm @@ -1,6 +1,6 @@ /obj/item/synthesized_instrument/trumpet name = "Omnitrumpet" - desc = "The Omnitrumptet series 400 with more than 30 sound samples and fully customizable high fidelity output provides the ultimate means to toot your own horn" + desc = "The Omnitrumpet series 400 with more than 30 sound samples and fully customizable high fidelity output provides the ultimate means to toot your own horn" icon_state = "trumpet" sound_player = /datum/sound_player/synthesizer path = /datum/instrument/brass diff --git a/code/modules/tools/subtypes/power_tools.dm b/code/modules/tools/subtypes/power_tools.dm index a0b0867a3b7..84099987a3e 100644 --- a/code/modules/tools/subtypes/power_tools.dm +++ b/code/modules/tools/subtypes/power_tools.dm @@ -1,6 +1,6 @@ /obj/item/tool/hydraulic_cutter name = "hydraulic cutter" - desc = "A universal, miniturized hydraulic tool with interchangable heads for either prying or cutting. But not both at the same time." + desc = "A universal, miniaturized hydraulic tool with interchangeable heads for either prying or cutting. But not both at the same time." icon = 'icons/obj/items/tool/cutter.dmi' icon_state = ICON_STATE_WORLD slot_flags = SLOT_LOWER_BODY diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm index 62606d2626b..4a61ea40daa 100644 --- a/code/modules/vehicles/cargo_train.dm +++ b/code/modules/vehicles/cargo_train.dm @@ -1,6 +1,6 @@ /obj/vehicle/train/cargo/engine name = "cargo train tug" - desc = "A ridable electric car designed for pulling cargo trolleys." + desc = "A rideable electric car designed for pulling cargo trolleys." icon = 'icons/obj/vehicles.dmi' icon_state = "cargo_engine" on = 0 diff --git a/code/modules/xenoarcheaology/finds/strange_rock.dm b/code/modules/xenoarcheaology/finds/strange_rock.dm index 7f0713988ff..5e2c8770e9c 100644 --- a/code/modules/xenoarcheaology/finds/strange_rock.dm +++ b/code/modules/xenoarcheaology/finds/strange_rock.dm @@ -1,7 +1,7 @@ /obj/item/strangerock name = "strange rock" - desc = "Seems to have some unusal strata evident throughout it." + desc = "Seems to have some unusual strata evident throughout it." icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "strange" origin_tech = @'{"materials":5}' diff --git a/maps/away/liberia/liberia_areas.dm b/maps/away/liberia/liberia_areas.dm index f9c07b77691..de18310846c 100644 --- a/maps/away/liberia/liberia_areas.dm +++ b/maps/away/liberia/liberia_areas.dm @@ -42,11 +42,11 @@ icon_state = "engine" /area/liberia/personellroom1 - name = "\improper Liberia - Personell Room 1" + name = "\improper Liberia - Personal Room 1" icon_state = "dk_yellow" /area/liberia/personellroom2 - name = "\improper Liberia - Personell Room 2" + name = "\improper Liberia - Personal Room 2" icon_state = "purple" /area/liberia/traidingroom diff --git a/maps/away/magshield/magshield.dm b/maps/away/magshield/magshield.dm index 323d4beb759..7344b67ec55 100644 --- a/maps/away/magshield/magshield.dm +++ b/maps/away/magshield/magshield.dm @@ -2,7 +2,7 @@ /obj/effect/overmap/visitable/sector/magshield name = "orbital station" - desc = "Sensors detect an orbital station above the exoplanet. Sporadic magentic impulses are registred inside it. Planet landing is impossible due to lower orbits being cluttered with chaotically moving metal chunks." + desc = "Sensors detect an orbital station above the exoplanet. Sporadic magentic impulses are registered inside it. Planet landing is impossible due to lower orbits being cluttered with chaotically moving metal chunks." icon_state = "object" initial_generic_waypoints = list( "nav_magshield_1", @@ -172,4 +172,4 @@ /obj/item/paper/magshield/log name = "printed page" - info = "\[07:31\] Attention: solar flare detected! Automatic countermeasures activated.
      \[07:33\] Warning: ERROR: NULL input at FARADAY_CAGE#12.TFI - line 2067: No command found. System will be rebooted.
      \[07:39\] Warning: radiaton countermeasures inactive. Please initiate emergency protocol.
      \[07:40\] Warning: radiaton countermeasures inactive. Please initiate emergency protocol.
      \[07:41\] Warning: radiaton countermeasures inactive. Please initiate emergency protocol.
      \[07:45\] Attention! Multiple systems failure. Please initiate emergency protocol
      \[07:52\] Warning: LIDAR-ASTRA system detected multiple meteors approaching. Estimate impact time: 12.478 seconds.
      \[07:52\] Warning! Miltiple hull breaches det~!!@#" + info = "\[07:31\] Attention: solar flare detected! Automatic countermeasures activated.
      \[07:33\] Warning: ERROR: NULL input at FARADAY_CAGE#12.TFI - line 2067: No command found. System will be rebooted.
      \[07:39\] Warning: radiation countermeasures inactive. Please initiate emergency protocol.
      \[07:40\] Warning: radiation countermeasures inactive. Please initiate emergency protocol.
      \[07:41\] Warning: radiation countermeasures inactive. Please initiate emergency protocol.
      \[07:45\] Attention! Multiple systems failure. Please initiate emergency protocol
      \[07:52\] Warning: LIDAR-ASTRA system detected multiple meteors approaching. Estimate impact time: 12.478 seconds.
      \[07:52\] Warning! Miltiple hull breaches det~!!@#" diff --git a/maps/away/unishi/unishi_jobs.dm b/maps/away/unishi/unishi_jobs.dm index ce315df3faf..4935f5c928c 100644 --- a/maps/away/unishi/unishi_jobs.dm +++ b/maps/away/unishi/unishi_jobs.dm @@ -4,7 +4,7 @@ outfit_type = /decl/outfit/job/unishi/crew supervisors = "your survival" info = "You remember waking up to alarms blaring in your face. Before you could react, a gush of hot air blew \ - you away, knocking you cold unconcious. Before this happened you were a crew member \ + you away, knocking you cold unconscious. Before this happened you were a crew member \ on this research vessel, SRV Verne, as it carried the members of the presitigous Ceti Technical institute in \ their pursuit of research. " required_language = /decl/language/human/common @@ -15,7 +15,7 @@ total_positions = 2 outfit_type = /decl/outfit/job/unishi/researcher info = "You remember waking up to alarms blaring in your face. Before you could react, a gush of hot air blew \ - you away, knocking you cold unconcious. Before this happened, you were a researcher, aboard SRV Verne." + you away, knocking you cold unconscious. Before this happened, you were a researcher, aboard SRV Verne." required_language = /decl/language/human/common /decl/outfit/job/unishi diff --git a/maps/ministation/ministation_antagonists.dm b/maps/ministation/ministation_antagonists.dm index bdbfab66cc8..c924733529f 100644 --- a/maps/ministation/ministation_antagonists.dm +++ b/maps/ministation/ministation_antagonists.dm @@ -45,7 +45,7 @@ "the tradehouse account documents" = /obj/item/documents/tradehouse/account, "the tradehouse personnel data" = /obj/item/documents/tradehouse/personnel, "the table-top spaceship model" = /obj/item/toy/shipmodel, - "the AI inteliCard" = /obj/item/aicard, + "the AI intelliCard" = /obj/item/aicard, "the nuclear authentication disk" = /obj/item/disk/nuclear, "the officer's sword" = /obj/item/sword/replica/officersword ) \ No newline at end of file diff --git a/maps/random_ruins/exoplanet_ruins/monoliths/monoliths.dm b/maps/random_ruins/exoplanet_ruins/monoliths/monoliths.dm index 77f027c0bab..1f8f82994c3 100644 --- a/maps/random_ruins/exoplanet_ruins/monoliths/monoliths.dm +++ b/maps/random_ruins/exoplanet_ruins/monoliths/monoliths.dm @@ -8,7 +8,7 @@ /obj/structure/monolith name = "monolith" - desc = "An obviously artifical structure of unknown origin. The symbols 'DWNbTX' are engraved on the base." + desc = "An obviously artificial structure of unknown origin. The symbols 'DWNbTX' are engraved on the base." icon = 'icons/obj/structures/monolith.dmi' icon_state = "jaggy1" layer = ABOVE_HUMAN_LAYER diff --git a/maps/~mapsystem/maps.dm b/maps/~mapsystem/maps.dm index 4347eed5419..84a5e81f276 100644 --- a/maps/~mapsystem/maps.dm +++ b/maps/~mapsystem/maps.dm @@ -2,8 +2,8 @@ var/global/datum/map/using_map = new USING_MAP_DATUM var/global/list/all_maps = list() var/global/list/votable_maps = list() -var/global/const/MAP_HAS_BRANCH = 1 //Branch system for occupations, togglable -var/global/const/MAP_HAS_RANK = 2 //Rank system, also togglable +var/global/const/MAP_HAS_BRANCH = 1 //Branch system for occupations, toggleable +var/global/const/MAP_HAS_RANK = 2 //Rank system, also toggleable /proc/initialise_map_list() for(var/map_type in subtypesof(/datum/map)) diff --git a/mods/content/corporate/items/medals.dm b/mods/content/corporate/items/medals.dm index 646bbcdea40..136cc53f5cd 100644 --- a/mods/content/corporate/items/medals.dm +++ b/mods/content/corporate/items/medals.dm @@ -15,5 +15,5 @@ /obj/item/clothing/medal/nanotrasen/bronze name = "corporate sciences medal" - desc = "A bronze medal awarded to employees for signifigant contributions to the fields of science or engineering." + desc = "A bronze medal awarded to employees for significant contributions to the fields of science or engineering." icon = 'mods/content/corporate/icons/clothing/accessories/medal_bronze.dmi' diff --git a/mods/content/dungeon_loot/subtypes/exosuit.dm b/mods/content/dungeon_loot/subtypes/exosuit.dm index 44a04ae3a75..29ab815a119 100644 --- a/mods/content/dungeon_loot/subtypes/exosuit.dm +++ b/mods/content/dungeon_loot/subtypes/exosuit.dm @@ -92,7 +92,7 @@ /obj/structure/loot_pile/exosuit/explorer name = "exploration exosuit wreckage" - desc = "The ruins of some unfortunate exploration exosuit. Perhaps something is salvagable." + desc = "The ruins of some unfortunate exploration exosuit. Perhaps something is salvageable." /obj/structure/loot_pile/exosuit/explorer/get_common_loot() var/static/list/common_loot = list( @@ -118,7 +118,7 @@ /obj/structure/loot_pile/exosuit/heavy name = "heavy exosuit wreckage" - desc = "The ruins of some unfortunate heavy exosuit. Perhaps something is salvagable." + desc = "The ruins of some unfortunate heavy exosuit. Perhaps something is salvageable." /obj/structure/loot_pile/exosuit/heavy/get_common_loot() var/static/list/common_loot = list( @@ -144,7 +144,7 @@ /obj/structure/loot_pile/exosuit/light name = "light exosuit wreckage" - desc = "The ruins of some unfortunate light exosuit. Perhaps something is salvagable." + desc = "The ruins of some unfortunate light exosuit. Perhaps something is salvageable." /obj/structure/loot_pile/exosuit/light/get_common_loot() var/static/list/common_loot = list( diff --git a/mods/content/fantasy/datum/cultures.dm b/mods/content/fantasy/datum/cultures.dm index ae74081e827..f7d0ad5b0bc 100644 --- a/mods/content/fantasy/datum/cultures.dm +++ b/mods/content/fantasy/datum/cultures.dm @@ -3,7 +3,7 @@ description = "The Splinter Kingdoms are a disparate mish-mash of regional powers, feudal warlords, and more organized \ settlements within the space once claimed by the Imperial Aegis. When the Aegis collapsed, several hundred years ago, the \ resulting wars and squabbling took decades to settle, and in many places the tensions and conflicts still run hot. Most of \ - the Splinter Kingdoms emulate the peasant-noble social heirarchies of the Aegis, but a variety of other forms of governance \ + the Splinter Kingdoms emulate the peasant-noble social hierarchies of the Aegis, but a variety of other forms of governance \ and society can be found." uid = "heritage_fantasy_splinter" diff --git a/mods/content/government/away_sites/icarus/icarus.dm b/mods/content/government/away_sites/icarus/icarus.dm index bd1b5e57584..7715e42d5ec 100644 --- a/mods/content/government/away_sites/icarus/icarus.dm +++ b/mods/content/government/away_sites/icarus/icarus.dm @@ -38,7 +38,7 @@ /datum/map_template/ruin/away_site/icarus name = "Fallen Icarus" - description = "The crashlanding site of the SEV Icarus." + description = "The crash-landing site of the SEV Icarus." prefix = "mods/content/government/away_sites/" suffixes = list("icarus/icarus-1.dmm", "icarus/icarus-2.dmm") cost = 2 @@ -78,7 +78,7 @@ /obj/item/disk/icarus name = "black box backup disk" - desc = "Digital storage. Inscription says: \"Deliver to Sol Goverment Expeditionary Corps Command!\". Content is encrypted with quantum crypthography methods." + desc = "Digital storage. Inscription says: \"Deliver to Sol Government Expeditionary Corps Command!\". Content is encrypted with quantum cryptography methods." color = COLOR_GRAY40 label = "label_warning" /obj/item/paper/icarus/log diff --git a/mods/content/modern_earth/datum/religions.dm b/mods/content/modern_earth/datum/religions.dm index a52d2d252f3..d241f9a86bb 100644 --- a/mods/content/modern_earth/datum/religions.dm +++ b/mods/content/modern_earth/datum/religions.dm @@ -20,7 +20,7 @@ /decl/background_detail/religion/sikh name = "Sikhsm" - description = "An Indian monotheistic religion based on the spiritual teachings of Guru Nanak and the nine Sikh gurus that succeeded him. Someone who practicies Sikhism is called a Sikh." + description = "An Indian monotheistic religion based on the spiritual teachings of Guru Nanak and the nine Sikh gurus that succeeded him. Someone who practices Sikhism is called a Sikh." uid = "religion_sikhsm" /decl/background_detail/religion/muslim diff --git a/mods/content/pheromones/pheromone_implant.dm b/mods/content/pheromones/pheromone_implant.dm index 961c4755d5d..a9e16ef2faf 100644 --- a/mods/content/pheromones/pheromone_implant.dm +++ b/mods/content/pheromones/pheromone_implant.dm @@ -1,6 +1,6 @@ /obj/item/implant/pheromone name = "pheromone implant" - desc = "A civilian grade implant for communicating with Indrel via pheromones." + desc = "A civilian grade implant for communicating via pheromones." origin_tech = "{'materials':1,'biotech':1}" /obj/item/implanter/pheromone diff --git a/mods/content/pheromones/pheromone_mob.dm b/mods/content/pheromones/pheromone_mob.dm index 776e978ce34..fef81e3e234 100644 --- a/mods/content/pheromones/pheromone_mob.dm +++ b/mods/content/pheromones/pheromone_mob.dm @@ -21,7 +21,7 @@ /obj/item/organ/internal/pheromone_gland name = "pheromone gland" - desc = "A miscellenaous lump of flesh full of chemicals." + desc = "A miscellaneous lump of flesh full of chemicals." icon_state = "stomach" organ_tag = BP_PHEROMONE_GLAND parent_organ = BP_CHEST diff --git a/mods/content/psionics/datum/antagonists/foundation.dm b/mods/content/psionics/datum/antagonists/foundation.dm index 7877dfd5061..fd6b15b0bde 100644 --- a/mods/content/psionics/datum/antagonists/foundation.dm +++ b/mods/content/psionics/datum/antagonists/foundation.dm @@ -48,6 +48,6 @@ /obj/item/radio/headset/foundation name = "\improper Foundation radio headset" - desc = "The headeset of the occult cavalry." + desc = "The headset of the occult cavalry." icon = 'icons/obj/items/device/radio/headsets/headset_command.dmi' encryption_keys = list(/obj/item/encryptionkey/ert) diff --git a/mods/content/supermatter/items/sm_grenade.dm b/mods/content/supermatter/items/sm_grenade.dm index b7f3186e666..6ee79e079bf 100644 --- a/mods/content/supermatter/items/sm_grenade.dm +++ b/mods/content/supermatter/items/sm_grenade.dm @@ -51,7 +51,7 @@ /datum/uplink_item/item/grenades/supermatters name = "5x Supermatter Grenades" - desc = "These grenades contains a small supermatter shard which will delaminate upon activation and pull in nearby objects, irradiate lifeforms, and eventually explode." + desc = "These grenades contain a small supermatter shard which will delaminate upon activation and pull in nearby objects, irradiate lifeforms, and eventually explode." item_cost = 60 antag_roles = list(/decl/special_role/mercenary) path = /obj/item/box/supermatters diff --git a/mods/content/supermatter/overrides/sm_meteor.dm b/mods/content/supermatter/overrides/sm_meteor.dm index 449ad80fbb9..f5bba645c18 100644 --- a/mods/content/supermatter/overrides/sm_meteor.dm +++ b/mods/content/supermatter/overrides/sm_meteor.dm @@ -1,5 +1,5 @@ /obj/effect/meteor/destroyer/supermatter name = "supermatter shard" - desc = "Oh god, what will be next..?" + desc = "Oh God, what will be next...?" icon = 'icons/obj/supermatter_32.dmi' icon_state = "supermatter" diff --git a/mods/species/adherent/organs/organs_internal.dm b/mods/species/adherent/organs/organs_internal.dm index 94990cd3f5e..4a25ee4d0fd 100644 --- a/mods/species/adherent/organs/organs_internal.dm +++ b/mods/species/adherent/organs/organs_internal.dm @@ -136,7 +136,7 @@ /obj/item/organ/internal/powered/cooling_fins name = "cooling fins" gender = PLURAL - desc = "A lacy filligree of heat-radiating fins." + desc = "A lacy filigree of heat-radiating fins." action_button_name = "Toggle Cooling" action_button_desc = "Enables or disables your battery-powered internal cooling system" default_action_type = /datum/action/item_action/organ/adherent diff --git a/mods/species/ascent/items/tools.dm b/mods/species/ascent/items/tools.dm index e007d98d30b..663a47ca6ea 100644 --- a/mods/species/ascent/items/tools.dm +++ b/mods/species/ascent/items/tools.dm @@ -32,7 +32,7 @@ MANTIDIFY(/obj/item/tank/jetpack/carbondioxide, "maneuvering pack", "pr /obj/item/knife/kitchen/cleaver/ascent name = "xenobiological flenser" - desc = "A mindboggingly alien tool for flensing flesh." + desc = "A mind-boggingly alien tool for flensing flesh." icon = 'mods/species/ascent/icons/ascent_doodads.dmi' icon_state = "xenobutch" @@ -44,7 +44,7 @@ MANTIDIFY(/obj/item/tank/jetpack/carbondioxide, "maneuvering pack", "pr /obj/item/food/hydration name = "hydration ration" - desc = "Approximately ten units of liquid hydration in a edible membrane. Unflavored." + desc = "Approximately ten units of liquid hydration in an edible membrane. Unflavored." icon = 'mods/species/ascent/icons/ascent_doodads.dmi' icon_state = "h2o_ration" bitesize = 10 diff --git a/mods/species/vox/datum/factions_vox.dm b/mods/species/vox/datum/factions_vox.dm index a82a82ca025..1fbf8259798 100644 --- a/mods/species/vox/datum/factions_vox.dm +++ b/mods/species/vox/datum/factions_vox.dm @@ -2,7 +2,7 @@ name = "Shoal Crew" description = "Most vox are content to live and work on the arkships, serving their alloted span under the watchful \ eye of their betters, who in turn serve the apex. Although there is always some degree of social turmoil amongst the \ - ark families, with contests and challenges resulting in shifting heirarchies, it usually does not go any further than \ + ark families, with contests and challenges resulting in shifting hierarchies, it usually does not go any further than \ the general day-to-day energy exhibited by all vox. The average ark labourer is not ambitious, and knows things could \ be a lot worse." hidden_from_codex = TRUE diff --git a/nano/templates/aicard.tmpl b/nano/templates/aicard.tmpl index be860a52ac9..6f25cb01f23 100644 --- a/nano/templates/aicard.tmpl +++ b/nano/templates/aicard.tmpl @@ -1,51 +1,51 @@ - + - + {{if data.has_ai}}
      @@ -61,11 +61,11 @@ Used In File(s): \code\game\objects\items\devices\aicard.dm {{:data.backup_capacitor}}%
      - - {{if data.has_laws}} + + {{if data.has_laws}} - +
      Laws:
      @@ -76,8 +76,8 @@ Used In File(s): \code\game\objects\items\devices\aicard.dm {{else}} No laws found. {{/if}} - - {{if data.operational}} + + {{if data.operational}}
      IndexLaw
      diff --git a/nano/templates/camera_settings.tmpl b/nano/templates/camera_settings.tmpl index f6a37d773c2..7620bc0da8a 100644 --- a/nano/templates/camera_settings.tmpl +++ b/nano/templates/camera_settings.tmpl @@ -1,5 +1,5 @@ {{if data.error}} -

      An error has occured:

      +

      An error has occurred:

      Additional information: {{:data.error}}
      Please try again. If the problem persists contact your system administrator for assistance.
      @@ -58,4 +58,4 @@
      {{/if}} EXONET Firmware v110.04.4h Copyright EXONETWORKS INC -{{/if}} \ No newline at end of file +{{/if}} \ No newline at end of file diff --git a/nano/templates/computer_fabricator.tmpl b/nano/templates/computer_fabricator.tmpl index d8bfb558b7c..3fd551c3078 100644 --- a/nano/templates/computer_fabricator.tmpl +++ b/nano/templates/computer_fabricator.tmpl @@ -62,7 +62,7 @@ Tesla Relay is an advanced wireless power relay that allows your device to connect to nearby area power controller to provide alternative power source.
      Nano Printer is device that allows printing of various documents. This device was certified EcoFriendlyPlus and is capable of recycling existing paper for printing purposes.
      Card Reader adds a slot that allows you to manipulate RFID cards. Please note that this is not necessary to allow the device to read your identification, it is just necessary to manipulate other cards.
      - Intellicard Slot is a specialised high powered hardware that can hold an intellicard with active AI personality. It is required for some specialised programs to run properly.
      + Intellicard Slot is a specialised high powered hardware that can hold an intelliCard with active AI personality. It is required for some specialised programs to run properly.
      {{else data.state == 2}}

      Step 3: Payment

      diff --git a/nano/templates/file_browser.tmpl b/nano/templates/file_browser.tmpl index cf3c3d3c1b5..5453c8b6876 100644 --- a/nano/templates/file_browser.tmpl +++ b/nano/templates/file_browser.tmpl @@ -1,5 +1,5 @@ {{if data.error}} -

      A disk error has occured:

      +

      A disk error has occurred:

      Additional information: {{:data.error}}
      Please try again. If the problem persists contact your system administrator for assistance. {{:helper.link('Back to file select', null, { "BRS_back" : 1 })}} diff --git a/nano/templates/file_manager.tmpl b/nano/templates/file_manager.tmpl index 3b61a10dddb..248043b31e6 100644 --- a/nano/templates/file_manager.tmpl +++ b/nano/templates/file_manager.tmpl @@ -12,16 +12,16 @@ {{/if}} {{if data.error}} -

      An error has occured:

      +

      An error has occurred:

      Additional information: {{:data.error}}
      Please try again. If the problem persists contact your system administrator for assistance. {{:helper.link('Back to menu', null, { "PRG_clear_error" : 1 })}} {{else data.file_error}} -

      An error with the selected file has occured:

      +

      An error with the selected file has occurred:

      Additional information: {{:data.file_error}}
      {{:helper.link('Back to menu', null, { "PRG_clear_error" : 1 })}} {{else data.disk_error}} -

      An error with the selected disk has occured:

      +

      An error with the selected disk has occurred:

      Additional information: {{:data.disk_error}}
      {{:helper.link('Back to menu', null, { "PRG_clear_error" : 1 })}} {{else}} diff --git a/nano/templates/network_acl.tmpl b/nano/templates/network_acl.tmpl index 19e60e2ddd9..11812a6b02b 100644 --- a/nano/templates/network_acl.tmpl +++ b/nano/templates/network_acl.tmpl @@ -1,5 +1,5 @@ {{if data.error}} -

      An error has occured:

      +

      An error has occurred:

      Additional information: {{:data.error}}
      Please try again. If the problem persists contact your system administrator for assistance.
      diff --git a/nano/templates/network_lock.tmpl b/nano/templates/network_lock.tmpl index 319618960fc..89ba30748e5 100644 --- a/nano/templates/network_lock.tmpl +++ b/nano/templates/network_lock.tmpl @@ -1,5 +1,5 @@ {{if data.error}} -

      An error has occured:

      +

      An error has occurred:

      Additional information: {{:data.error}}
      Please try again. If the problem persists contact your system administrator for assistance. {{:helper.link('Refresh', null, { "refresh" : 1 })}} diff --git a/nano/templates/network_machine_settings.tmpl b/nano/templates/network_machine_settings.tmpl index 73c9b107822..8c75b76e1b7 100644 --- a/nano/templates/network_machine_settings.tmpl +++ b/nano/templates/network_machine_settings.tmpl @@ -1,5 +1,5 @@ {{if data.error}} -

      An error has occured:

      +

      An error has occurred:

      Additional information: {{:data.error}}
      Please try again. If the problem persists contact your system administrator for assistance.
      @@ -34,4 +34,4 @@
      EXONET Firmware v110.04.4h Copyright EXONETWORKS INC -{{/if}} \ No newline at end of file +{{/if}} \ No newline at end of file diff --git a/nano/templates/network_mainframe.tmpl b/nano/templates/network_mainframe.tmpl index f271e98b4f1..3cb6d44378b 100644 --- a/nano/templates/network_mainframe.tmpl +++ b/nano/templates/network_mainframe.tmpl @@ -1,5 +1,5 @@ {{if data.error}} -

      An error has occured:

      +

      An error has occurred:

      Additional information: {{:data.error}}
      Please try again. If the problem persists contact your system administrator for assistance.
      @@ -33,7 +33,7 @@
      MISSING
      - {{/if}} + {{/if}}
      EXONET Firmware v110.04.4h Copyright EXONETWORKS INC -{{/if}} \ No newline at end of file +{{/if}} \ No newline at end of file diff --git a/nano/templates/network_modem.tmpl b/nano/templates/network_modem.tmpl index f48696ebe4c..ad1abaa9901 100644 --- a/nano/templates/network_modem.tmpl +++ b/nano/templates/network_modem.tmpl @@ -1,5 +1,5 @@ {{if data.error}} -

      An error has occured:

      +

      An error has occurred:

      Additional information: {{:data.error}}
      Please try again. If the problem persists contact your system administrator for assistance.
      @@ -28,4 +28,4 @@ {{/for}}
      EXONET Firmware v110.04.4h Copyright EXONETWORKS INC -{{/if}} \ No newline at end of file +{{/if}} \ No newline at end of file diff --git a/nano/templates/network_router.tmpl b/nano/templates/network_router.tmpl index 3829283b712..0c1630f0af5 100644 --- a/nano/templates/network_router.tmpl +++ b/nano/templates/network_router.tmpl @@ -1,5 +1,5 @@ {{if data.error}} -

      An error has occured:

      +

      An error has occurred:

      Additional information: {{:data.error}}
      Please try again. If the problem persists contact your system administrator for assistance.
      diff --git a/nano/templates/request_console.tmpl b/nano/templates/request_console.tmpl index 4465f223e0d..698f7b162c9 100644 --- a/nano/templates/request_console.tmpl +++ b/nano/templates/request_console.tmpl @@ -66,7 +66,7 @@ Used In File(s): \code\game\machinery\requests_console.dm
      Message sent successfully.
      {{:helper.link('Continue', 'arrowthick-1-e', { 'setScreen' : 0 })}}
      {{else data.screen == 5}} -
      An Error occured. Message not sent.
      +
      An Error occurred. Message not sent.
      {{:helper.link('Continue', 'arrowthick-1-e', { 'setScreen' : 0 })}}
      {{else data.screen == 6}}
      diff --git a/nano/templates/song_editor.tmpl b/nano/templates/song_editor.tmpl index 56618b947e8..3ac2b19b17e 100644 --- a/nano/templates/song_editor.tmpl +++ b/nano/templates/song_editor.tmpl @@ -7,7 +7,7 @@ By default, every note is natural and in octave 3. Defining otherwise is remembered for each note.
      Example: C,D,E,F,G,A,B will play a C major scale.
      After a note has an accidental placed, it will be remembered: C,C4,C,C3 is C3,C4,C4,C3
      - Chords can be played simply by seperating each note with a hyphon: A-C#,Cn-E,E-G#,Gn-B
      + Chords can be played simply by separating each note with a hyphon: A-C#,Cn-E,E-G#,Gn-B
      A pause may be denoted by an empty chord: C,E,,C,G
      To make a chord be a different time, end it with /x, where the chord length will be length
      defined by tempo / x: C,G/2,E/4
      From f1b47a4a2219bf03983e5044900430127114f567 Mon Sep 17 00:00:00 2001 From: Penelope Haze Date: Sun, 26 Jan 2025 21:31:05 -0500 Subject: [PATCH 8/8] Fix more (mostly compound) phrases in descriptions --- code/_helpers/visual_filters.dm | 2 +- .../uplink/highly_visible_and_dangerous_weapons.dm | 2 +- code/datums/uplink/stealth_and_camouflage_items.dm | 2 +- code/game/machinery/doors/firedoor.dm | 2 +- .../machinery/embedded_controller/docking_program.dm | 2 +- code/game/machinery/kitchen/cooking_machines/fryer.dm | 2 +- code/game/machinery/recharger.dm | 2 +- code/game/machinery/rechargestation.dm | 2 +- code/game/machinery/self_destruct.dm | 6 +++--- code/game/objects/effects/decals/misc.dm | 2 +- code/game/objects/items/books/fluff/science.dm | 4 ++-- code/game/objects/items/flashlights/misc.dm | 2 +- code/game/objects/items/weapons/material/folding.dm | 2 +- code/game/objects/items/weapons/nuclear_cylinder.dm | 2 +- code/game/objects/items/weapons/tanks/tank_types.dm | 4 ++-- code/game/objects/items/weapons/tech_disks.dm | 2 +- .../crates_lockers/closets/utility_closets.dm | 2 +- code/game/objects/structures/signs/plaques.dm | 2 +- code/game/objects/structures/transit_tubes.dm | 2 +- code/game/objects/structures/watercloset.dm | 4 ++-- code/modules/atmospherics/pipes.dm | 10 +++++----- code/modules/clothing/chameleon.dm | 2 +- code/modules/clothing/costumes/misc.dm | 2 +- code/modules/clothing/dresses/misc.dm | 6 +++--- code/modules/clothing/head/collectable.dm | 4 ++-- code/modules/clothing/masks/breath.dm | 2 +- code/modules/clothing/masks/chewable.dm | 6 +++--- code/modules/clothing/spacesuits/miscellaneous.dm | 2 +- code/modules/clothing/spacesuits/rig/suits/station.dm | 2 +- code/modules/clothing/spacesuits/void/station.dm | 4 ++-- code/modules/clothing/suits/armor/merc.dm | 2 +- code/modules/clothing/suits/dashiki.dm | 6 +++--- code/modules/codex/categories/category_reactions.dm | 2 +- .../crafting/stack_recipes/recipes_cardstock.dm | 2 +- code/modules/detectivework/microscope/dnascanner.dm | 2 +- code/modules/games/boardgame.dm | 2 +- code/modules/genetics/plants/trait_biolum.dm | 2 +- code/modules/goals/definitions/personal_achievement.dm | 2 +- .../integrated_electronics/subtypes/converters.dm | 4 ++-- .../random_exoplanet/planet_types/shrouded.dm | 2 +- code/modules/mechs/equipment/utility.dm | 2 +- code/modules/mechs/premade/_premade.dm | 2 +- code/modules/merchant/merchant_guns.dm | 2 +- code/modules/mining/mine_items.dm | 2 +- code/modules/mob/living/silicon/robot/flying/flying.dm | 2 +- .../living/simple_animal/hostile/retaliate/drone.dm | 2 +- code/modules/mob/skills/skill.dm | 2 +- code/modules/paperwork/printer.dm | 2 +- code/modules/power/breaker_box.dm | 2 +- code/modules/power/cable.dm | 2 +- code/modules/power/fusion/gyrotron/gyrotron.dm | 2 +- code/modules/power/sensors/powernet_sensor.dm | 2 +- code/modules/projectiles/ammunition/bullets.dm | 2 +- code/modules/projectiles/guns/energy/secure.dm | 2 +- code/modules/projectiles/guns/launcher/syringe_gun.dm | 2 +- .../reagents/reagent_containers/drinks/bottle.dm | 2 +- code/modules/reagents/reagent_containers/food/eggs.dm | 2 +- code/modules/security_levels/keycard_authentication.dm | 2 +- code/unit_tests/zas_tests.dm | 2 +- mods/species/ascent/datum/languages.dm | 2 +- 60 files changed, 78 insertions(+), 78 deletions(-) diff --git a/code/_helpers/visual_filters.dm b/code/_helpers/visual_filters.dm index 10e485e1854..2f8ba1afe3c 100644 --- a/code/_helpers/visual_filters.dm +++ b/code/_helpers/visual_filters.dm @@ -1,4 +1,4 @@ -// These involve BYOND's built in filters that do visual effects, and not stuff that distinguishes between things. +// These involve BYOND's built-in filters that do visual effects, and not stuff that distinguishes between things. // All of this ported from TG. // And then ported to Nebula from Polaris. diff --git a/code/datums/uplink/highly_visible_and_dangerous_weapons.dm b/code/datums/uplink/highly_visible_and_dangerous_weapons.dm index 0d08c3dd7cd..c64cf84b614 100644 --- a/code/datums/uplink/highly_visible_and_dangerous_weapons.dm +++ b/code/datums/uplink/highly_visible_and_dangerous_weapons.dm @@ -51,7 +51,7 @@ /datum/uplink_item/item/visible_weapons/energy_gun name = "Energy Gun" - desc = "An energy based sidearm with three different lethality settings." + desc = "An energy-based sidearm with three different lethality settings." item_cost = 32 path = /obj/item/gun/energy/gun diff --git a/code/datums/uplink/stealth_and_camouflage_items.dm b/code/datums/uplink/stealth_and_camouflage_items.dm index 9a9d21c0761..d2f189c5dd2 100644 --- a/code/datums/uplink/stealth_and_camouflage_items.dm +++ b/code/datums/uplink/stealth_and_camouflage_items.dm @@ -42,7 +42,7 @@ /datum/uplink_item/item/stealth_items/voice name = "Modified Gas Mask" - desc = "A fully functioning gas mask that is able to conceal your face and has a built in voice modulator, \ + desc = "A fully functioning gas mask that is able to conceal your face and has a built-in voice modulator, \ so you can become a true shadow operative!" item_cost = 20 path = /obj/item/clothing/mask/chameleon/voice diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index fab7e5836fe..d6e1916fb87 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -10,7 +10,7 @@ /obj/machinery/door/firedoor name = "emergency shutter" - desc = "Emergency air-tight shutters, capable of sealing off breached areas." + desc = "Emergency airtight shutters, capable of sealing off breached areas." icon = 'icons/obj/doors/hazard/door.dmi' var/panel_file = 'icons/obj/doors/hazard/panel.dmi' var/welded_file = 'icons/obj/doors/hazard/welded.dmi' diff --git a/code/game/machinery/embedded_controller/docking_program.dm b/code/game/machinery/embedded_controller/docking_program.dm index 8bea52eb025..03cfc947941 100644 --- a/code/game/machinery/embedded_controller/docking_program.dm +++ b/code/game/machinery/embedded_controller/docking_program.dm @@ -78,7 +78,7 @@ /datum/computer/file/embedded_program/docking/receive_user_command(command) if(command == "dock" || command == "undock") - if(!tag_target) //Prevents from self destructing if no docking buddy + if(!tag_target) //Prevents from self-destructing if no docking buddy return FALSE var/datum/signal/signal = new() diff --git a/code/game/machinery/kitchen/cooking_machines/fryer.dm b/code/game/machinery/kitchen/cooking_machines/fryer.dm index 0be1e523f11..090c58670cf 100644 --- a/code/game/machinery/kitchen/cooking_machines/fryer.dm +++ b/code/game/machinery/kitchen/cooking_machines/fryer.dm @@ -1,6 +1,6 @@ /obj/machinery/cooker/fryer name = "deep fryer" - desc = "Deep fried everything." + desc = "Deep-fried everything." icon_state = "fryer_off" can_cook_mobs = 1 cook_type = "deep fried" diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index fc240f89e81..b507e309276 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -120,7 +120,7 @@ /obj/machinery/recharger/wallcharger name = "wall recharger" - desc = "A heavy duty wall recharger specialized for energy weaponry." + desc = "A heavy-duty wall recharger specialized for energy weaponry." icon = 'icons/obj/machines/recharger_wall.dmi' icon_state = "wrecharger0" active_power_usage = 50 KILOWATTS //It's more specialized than the standalone recharger (guns and batons only) so make it more powerful diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 64a7cb96235..bed17113864 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -1,6 +1,6 @@ /obj/machinery/recharge_station name = "robot recharging station" - desc = "A heavy duty rapid charging system, designed to quickly recharge autonomous system power reserves." + desc = "A heavy-duty rapid charging system, designed to quickly recharge autonomous system power reserves." icon = 'icons/obj/objects.dmi' icon_state = "borgcharger0" density = TRUE diff --git a/code/game/machinery/self_destruct.dm b/code/game/machinery/self_destruct.dm index 3cf9137e831..3d1f841884d 100644 --- a/code/game/machinery/self_destruct.dm +++ b/code/game/machinery/self_destruct.dm @@ -1,6 +1,6 @@ /obj/machinery/self_destruct name = "\improper Nuclear Cylinder Inserter" - desc = "A hollow space used to insert nuclear cylinders for arming the self destruct." + desc = "A hollow space used to insert nuclear cylinders for arming the self-destruct mechanism." icon = 'icons/obj/machines/self_destruct.dmi' icon_state = "empty" density = FALSE @@ -48,10 +48,10 @@ return var/obj/machinery/nuclearbomb/nuke = locate(/obj/machinery/nuclearbomb/station) in get_area(src) if(!nuke) - to_chat(user, "Unable to interface with the self destruct terminal, unable to disarm.") + to_chat(user, "Unable to interface with the self-destruct terminal, unable to disarm.") return if(nuke.timing) - to_chat(user, "The self destruct sequence is in progress, unable to disarm.") + to_chat(user, "The self-destruct sequence is in progress, unable to disarm.") return user.visible_message("[user] begins extracting [cylinder].", "You begin extracting [cylinder].") if(do_after(user, 40, src)) diff --git a/code/game/objects/effects/decals/misc.dm b/code/game/objects/effects/decals/misc.dm index 35c5a8f2eef..ac3664d7559 100644 --- a/code/game/objects/effects/decals/misc.dm +++ b/code/game/objects/effects/decals/misc.dm @@ -1,6 +1,6 @@ /obj/effect/decal/point name = "arrow" - desc = "It's an arrow hanging in mid-air. There may be a wizard about." + desc = "It's an arrow hanging in midair. There may be a wizard about." icon = 'icons/effects/markers.dmi' icon_state = "arrow" layer = POINTER_LAYER diff --git a/code/game/objects/items/books/fluff/science.dm b/code/game/objects/items/books/fluff/science.dm index 728b5599e2f..eee65121cb9 100644 --- a/code/game/objects/items/books/fluff/science.dm +++ b/code/game/objects/items/books/fluff/science.dm @@ -5,7 +5,7 @@ title = "Spectroscopy: Analysing the Anomalies of the Cosmos" fluff_text = {" It's perhaps one of the most exciting times to be alive, with the recent breakthroughs in understanding and categorisation of things we may one day no longer call - 'anomalies,' but rather 'infrequent or rare occurrences of certain celestial weather or phenomena.' Perhaps a little more long winded, but no less eloquent all the + 'anomalies,' but rather 'infrequent or rare occurrences of certain celestial weather or phenomena.' Perhaps a little more long-winded, but no less eloquent all the same! Why, look at the strides we're making in piercing the walls of spacetime or our steadily improving ability to clarify and stabilise subspace emissions; it's certainly an exciting time to be alive. For the moment, the Hydrolian hasn't seen two spatial anomalies alike but the day will come and it is soon, I can feel it. "} @@ -16,7 +16,7 @@ author = "Jasper Pascal, Senior Lecturer in Materials Analysis at the University of Jol'Nar" title = "Materials Analysis and the Chemical Implications" fluff_text = {" - In today's high tech research fields, leaps and bounds are being made every day. Whether it's great strides forward in our understanding of the physical universe + In today's high-tech research fields, leaps and bounds are being made every day. Whether it's great strides forward in our understanding of the physical universe or the operation of some fancy new piece of equipment, it seems like all the cool fields are producing new toys to play with, leaving doddery old fields such as materials analysis and chemistry relegated to the previous few centuries, when we were still learning the makeup and structure of the elements.

      diff --git a/code/game/objects/items/flashlights/misc.dm b/code/game/objects/items/flashlights/misc.dm index d8fe75b4d74..cdd07f77f43 100644 --- a/code/game/objects/items/flashlights/misc.dm +++ b/code/game/objects/items/flashlights/misc.dm @@ -15,7 +15,7 @@ /obj/item/flashlight/maglight name = "maglight" - desc = "A very, very heavy duty flashlight." + desc = "A very, very heavy-duty flashlight." icon = 'icons/obj/lighting/maglight.dmi' _base_attack_force = 10 attack_verb = list ("smacked", "thwacked", "thunked") diff --git a/code/game/objects/items/weapons/material/folding.dm b/code/game/objects/items/weapons/material/folding.dm index 38cfa3a2476..5d298afbd27 100644 --- a/code/game/objects/items/weapons/material/folding.dm +++ b/code/game/objects/items/weapons/material/folding.dm @@ -62,7 +62,7 @@ /obj/item/knife/folding/tacticool name = "folding knife" - desc = "A small folding knife with a polymer handle and a blackened steel blade. These are typically marketed for self defense purposes." + desc = "A small folding knife with a polymer handle and a blackened steel blade. These are typically marketed for self-defense purposes." icon = 'icons/obj/items/weapon/knives/folding/tacticool.dmi' valid_handle_colors = list("#0f0f2a", "#2a0f0f", "#0f2a0f", COLOR_GRAY20, COLOR_DARK_GUNMETAL) diff --git a/code/game/objects/items/weapons/nuclear_cylinder.dm b/code/game/objects/items/weapons/nuclear_cylinder.dm index 24f097cf1e1..8e5f910bb93 100644 --- a/code/game/objects/items/weapons/nuclear_cylinder.dm +++ b/code/game/objects/items/weapons/nuclear_cylinder.dm @@ -1,6 +1,6 @@ /obj/item/nuclear_cylinder name = "\improper nuclear cylinder" - desc = "This cylinder is used in the self destruct system of the ship." + desc = "This cylinder is used in the self-destruct system of the ship." icon = 'icons/obj/items/nuclear_cylinder.dmi' icon_state = "nuclear_cylinder" item_state = "nuclear" diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 2a25e4e607f..f5b1580e8a6 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -87,8 +87,8 @@ w_class = ITEM_SIZE_NORMAL /obj/item/tank/emergency/oxygen/double/red //firefighting tank, fits on belt, back or suitslot - name = "self contained breathing apparatus" - desc = "A self contained breathing apparatus, well known as SCBA. Generally filled with oxygen." + name = "self-contained breathing apparatus" + desc = "A self-contained breathing apparatus, well known as SCBA. Generally filled with oxygen." icon = 'icons/obj/items/tanks/tank_scuba.dmi' slot_flags = SLOT_LOWER_BODY | SLOT_BACK diff --git a/code/game/objects/items/weapons/tech_disks.dm b/code/game/objects/items/weapons/tech_disks.dm index 91922a2853d..012acea79a6 100644 --- a/code/game/objects/items/weapons/tech_disks.dm +++ b/code/game/objects/items/weapons/tech_disks.dm @@ -3,7 +3,7 @@ /////////////////////////////////////////////////////////////////////////////// /obj/item/disk name = "data disk" - desc = "A standard 3.5 inch floppy disk for storing computer files... What's even an inch?" + desc = "A standard 3.5-inch floppy disk for storing computer files... What's even an inch?" icon = 'icons/obj/items/device/diskette.dmi' icon_state = ICON_STATE_WORLD w_class = ITEM_SIZE_TINY diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 909998d0bc7..c4259273a4b 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -16,7 +16,7 @@ */ /obj/structure/closet/emcloset name = "emergency closet" - desc = "It's a storage unit for emergency breathmasks and o2 tanks." + desc = "It's a storage unit for emergency breath masks and oxygen tanks." closet_appearance = /decl/closet_appearance/oxygen /obj/structure/closet/emcloset/WillContain() diff --git a/code/game/objects/structures/signs/plaques.dm b/code/game/objects/structures/signs/plaques.dm index e455131d89a..19d72c4e1ef 100644 --- a/code/game/objects/structures/signs/plaques.dm +++ b/code/game/objects/structures/signs/plaques.dm @@ -31,7 +31,7 @@ /obj/structure/sign/plaque/golden/medical name = "medical certificate" - desc = "A picture next to a long winded description of medical certifications and degrees." + desc = "A picture next to a long-winded description of medical certifications and degrees." /obj/structure/sign/plaque/ai_dev name = "\improper AI developers plaque" diff --git a/code/game/objects/structures/transit_tubes.dm b/code/game/objects/structures/transit_tubes.dm index b7fba083f5c..0c9982cc9a6 100644 --- a/code/game/objects/structures/transit_tubes.dm +++ b/code/game/objects/structures/transit_tubes.dm @@ -380,7 +380,7 @@ // Parse the icon_state into a list of directions. -// This means that mappers can use Dream Maker's built in +// This means that mappers can use Dream Maker's built-in // "Generate Instances from Icon-states" option to get all // variations. Additionally, as a separate proc, sub-types // can handle it more intelligently. diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index a7fe8eb9ec9..6a9c9f09551 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -497,7 +497,7 @@ var/global/list/hygiene_props = list() /decl/barricade_tape_template/toilet tape_kind = "toilet paper" tape_desc = "A length of toilet paper. Seems like custodia is marking their territory again." - roll_desc = "An unbranded roll of standard issue two ply toilet paper. Refined from carefully rendered down sea shells due to the government's 'Abuse Of The Trees Act'." + roll_desc = "An unbranded roll of standard-issue two-ply toilet paper. Refined from carefully rendered-down seashells due to the government's 'Abuse Of The Trees Act'." base_icon_state = "stripetape" tape_color = COLOR_WHITE detail_overlay = "stripes" @@ -530,7 +530,7 @@ var/global/list/hygiene_props = list() //////////////////////////////////////////////////// /obj/item/paper/crumpled/bog name = "sheet of toilet paper" - desc = "A single sheet of toilet paper. Two ply." + desc = "A single sheet of toilet paper. Two-ply." icon = 'icons/obj/items/paperwork/toilet_paper.dmi' /obj/structure/hygiene/faucet diff --git a/code/modules/atmospherics/pipes.dm b/code/modules/atmospherics/pipes.dm index 2840d64ba68..f53bbd7363d 100644 --- a/code/modules/atmospherics/pipes.dm +++ b/code/modules/atmospherics/pipes.dm @@ -223,7 +223,7 @@ icon = 'icons/atmos/pipes.dmi' icon_state = "11" name = "pipe" - desc = "A one meter section of regular pipe." + desc = "A one-meter section of regular pipe." volume = ATMOS_DEFAULT_VOLUME_PIPE @@ -285,7 +285,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/scrubbers name = "scrubbers pipe" - desc = "A one meter section of scrubbers pipe." + desc = "A one-meter section of scrubbers pipe." icon_state = "11-scrubbers" connect_types = CONNECT_TYPE_SCRUBBER icon_connect_type = "-scrubbers" @@ -293,7 +293,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply name = "air supply pipe" - desc = "A one meter section of supply pipe." + desc = "A one-meter section of supply pipe." icon_state = "11-supply" connect_types = CONNECT_TYPE_SUPPLY icon_connect_type = "-supply" @@ -333,7 +333,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers name = "scrubbers pipe" - desc = "A one meter section of scrubbers pipe." + desc = "A one-meter section of scrubbers pipe." icon_state = "11-scrubbers" connect_types = CONNECT_TYPE_SCRUBBER icon_connect_type = "-scrubbers" @@ -341,7 +341,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply name = "air supply pipe" - desc = "A one meter section of supply pipe." + desc = "A one-meter section of supply pipe." icon_state = "11-supply" connect_types = CONNECT_TYPE_SUPPLY icon_connect_type = "-supply" diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 2af46afe272..39ea1c743a9 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -190,7 +190,7 @@ /obj/item/clothing/shoes/chameleon name = "black shoes" icon = 'icons/clothing/feet/colored_shoes.dmi' - desc = "They're comfy black shoes, with clever cloaking technology built in. It seems to have a small dial on the back of each shoe." + desc = "They're comfy black shoes, with clever cloaking technology built-in. It seems to have a small dial on the back of each shoe." origin_tech = @'{"esoteric":3}' item_flags = ITEM_FLAG_INVALID_FOR_CHAMELEON bodytype_equip_flags = null diff --git a/code/modules/clothing/costumes/misc.dm b/code/modules/clothing/costumes/misc.dm index 13495b75d2f..b44cfb42bc7 100644 --- a/code/modules/clothing/costumes/misc.dm +++ b/code/modules/clothing/costumes/misc.dm @@ -77,7 +77,7 @@ /obj/item/clothing/costume/oldman name = "old man's suit" - desc = "A classic suit for the older gentleman with built in back support." + desc = "A classic suit for the older gentleman with built-in back support." icon = 'icons/clothing/costumes/uniform_lawyer_old.dmi' /obj/item/clothing/costume/lawyer diff --git a/code/modules/clothing/dresses/misc.dm b/code/modules/clothing/dresses/misc.dm index 08969f3ae87..49c74faa645 100644 --- a/code/modules/clothing/dresses/misc.dm +++ b/code/modules/clothing/dresses/misc.dm @@ -1,6 +1,6 @@ /obj/item/clothing/dress/green name = "green dress" - desc = "A simple, tight fitting green dress." + desc = "A simple, tight-fitting green dress." icon = 'icons/clothing/dresses/dress_green.dmi' /obj/item/clothing/dress/yellow @@ -15,12 +15,12 @@ /obj/item/clothing/dress/pink name = "pink dress" - desc = "A simple, tight fitting pink dress." + desc = "A simple, tight-fitting pink dress." icon = 'icons/clothing/dresses/dress_pink.dmi' /obj/item/clothing/dress/purple name = "purple dress" - desc= "A simple, tight fitting purple dress." + desc= "A simple, tight-fitting purple dress." icon = 'icons/clothing/dresses/dress_purple.dmi' /obj/item/clothing/dress/saloon diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index c14e8d495da..d5918f6a7a2 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -7,8 +7,8 @@ armor = null /obj/item/clothing/head/collectable/petehat - name = "ultra rare hat" - desc = "An ultra rare hat. It commands a certain respect." + name = "ultra-rare hat" + desc = "An ultra-rare hat. It commands a certain respect." icon = 'icons/clothing/head/pete.dmi' /obj/item/clothing/head/collectable/xenom diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index 02584ae5311..e20814e2ec3 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -27,7 +27,7 @@ permeability_coefficient = 0.50 /obj/item/clothing/mask/breath/scba - desc = "A close-fitting self contained breathing apparatus mask. Can be connected to an air supply." + desc = "A close-fitting self-contained breathing apparatus mask. Can be connected to an air supply." name = "\improper SCBA mask" icon = 'icons/clothing/mask/breath_scuba.dmi' item_flags = ITEM_FLAG_AIRTIGHT|ITEM_FLAG_FLEXIBLEMATERIAL diff --git a/code/modules/clothing/masks/chewable.dm b/code/modules/clothing/masks/chewable.dm index 8fe3c3562cc..682c68bc51f 100644 --- a/code/modules/clothing/masks/chewable.dm +++ b/code/modules/clothing/masks/chewable.dm @@ -55,7 +55,7 @@ /obj/item/clothing/mask/chewable/tobacco name = "wad" - desc = "A chewy wad of tobacco. Cut in long strands and treated with syrups so it doesn't taste like an ash-tray when you stuff it into your face." + desc = "A chewy wad of tobacco. Cut in long strands and treated with syrups so it doesn't taste like an ashtray when you stuff it into your face." throw_speed = 0.5 icon = 'icons/clothing/mask/chewables/chew.dmi' type_butt = /obj/item/trash/cigbutt/spitwad @@ -89,14 +89,14 @@ /obj/item/clothing/mask/chewable/tobacco/lenni name = "chewing tobacco" - desc = "A chewy wad of tobacco. Cut in long strands and treated with syrups so it tastes less like an ash-tray when you stuff it into your face." + desc = "A chewy wad of tobacco. Cut in long strands and treated with syrups so it tastes less like an ashtray when you stuff it into your face." /obj/item/clothing/mask/chewable/tobacco/lenni/populate_reagents() add_to_reagents(/decl/material/solid/tobacco, 2) /obj/item/clothing/mask/chewable/tobacco/redlady name = "chewing tobacco" - desc = "A chewy wad of fine tobacco. Cut in long strands and treated with syrups so it doesn't taste like an ash-tray when you stuff it into your face" + desc = "A chewy wad of fine tobacco. Cut in long strands and treated with syrups so it doesn't taste like an ashtray when you stuff it into your face" /obj/item/clothing/mask/chewable/tobacco/redlady/populate_reagents() add_to_reagents(/decl/material/solid/tobacco/fine, 2) diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index e37955054ba..75ba84eb56b 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -1,7 +1,7 @@ //Orange emergency space suit /obj/item/clothing/head/helmet/space/emergency name = "emergency space helmet" - desc = "A simple helmet with a built in light, smells like mothballs." + desc = "A simple helmet with a built-in light, smells like mothballs." flash_protection = FLASH_PROTECTION_NONE /obj/item/clothing/suit/space/emergency diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm index 4d6c335a8c0..fe48b0e24b0 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station.dm @@ -389,7 +389,7 @@ /obj/item/clothing/head/helmet/space/rig/zero camera = null - desc = "A bubble helmet that maximizes the field of view. A state of the art holographic display provides a stream of information" + desc = "A bubble helmet that maximizes the field of view. A state-of-the-art holographic display provides a stream of information" icon = 'icons/clothing/rigs/helmets/helmet_null.dmi' /obj/item/clothing/suit/space/rig/zero diff --git a/code/modules/clothing/spacesuits/void/station.dm b/code/modules/clothing/spacesuits/void/station.dm index 92b2b6b27cf..74a7ace494e 100644 --- a/code/modules/clothing/spacesuits/void/station.dm +++ b/code/modules/clothing/spacesuits/void/station.dm @@ -323,7 +323,7 @@ //Atmospherics /obj/item/clothing/head/helmet/space/void/atmos/alt - name = "heavy duty atmospherics voidsuit helmet" + name = "heavy-duty atmospherics voidsuit helmet" desc = "A voidsuit helmet plated with an expensive heat and radiation resistant ceramic." icon = 'icons/clothing/spacesuit/void/atmos_alt/helmet.dmi' armor = list( @@ -336,7 +336,7 @@ ) /obj/item/clothing/suit/space/void/atmos/alt - name = "heavy duty atmos voidsuit" + name = "heavy-duty atmos voidsuit" desc = "An expensive voidsuit, rated to withstand extreme heat and even minor radiation without exceeding room temperature within." icon = 'icons/clothing/spacesuit/void/atmos_alt/suit.dmi' armor = list( diff --git a/code/modules/clothing/suits/armor/merc.dm b/code/modules/clothing/suits/armor/merc.dm index a138ef7b732..7d8c6ea3bf0 100644 --- a/code/modules/clothing/suits/armor/merc.dm +++ b/code/modules/clothing/suits/armor/merc.dm @@ -9,7 +9,7 @@ /obj/item/clothing/armor_attachment/plate/merc name = "heavy armor plate" - desc = "A diamond-reinforced titanium armor plate, providing state of the art protection. Attaches to a plate carrier." + desc = "A diamond-reinforced titanium armor plate, providing state-of-the-art protection. Attaches to a plate carrier." icon = 'icons/clothing/accessories/armor/armor_merc.dmi' armor = list( ARMOR_MELEE = ARMOR_MELEE_RESISTANT, diff --git a/code/modules/clothing/suits/dashiki.dm b/code/modules/clothing/suits/dashiki.dm index ac14b45bd60..70dafd614fa 100644 --- a/code/modules/clothing/suits/dashiki.dm +++ b/code/modules/clothing/suits/dashiki.dm @@ -1,16 +1,16 @@ /obj/item/clothing/suit/dashiki name = "black dashiki" - desc = "An ornately embroidered pullover garment sporting a v-shaped collar. This one is green and black." + desc = "An ornately embroidered pullover garment sporting a V-shaped collar. This one is green and black." icon = 'icons/clothing/suits/dashiki/dashiki.dmi' slot_flags = SLOT_OVER_BODY accessory_slot = ACCESSORY_SLOT_DECOR /obj/item/clothing/suit/dashiki/red name = "red dashiki" - desc = "An ornately embroidered pullover garment sporting a v-shaped collar. This one is red." + desc = "An ornately embroidered pullover garment sporting a V-shaped collar. This one is red." icon = 'icons/clothing/suits/dashiki/dashiki_red.dmi' /obj/item/clothing/suit/dashiki/blue name = "blue dashiki" - desc = "An ornately embroidered pullover garment sporting a v-shaped collar. This one is blue." + desc = "An ornately embroidered pullover garment sporting a V-shaped collar. This one is blue." icon = 'icons/clothing/suits/dashiki/dashiki_blue.dmi' diff --git a/code/modules/codex/categories/category_reactions.dm b/code/modules/codex/categories/category_reactions.dm index c46829e0dfa..913e1469029 100644 --- a/code/modules/codex/categories/category_reactions.dm +++ b/code/modules/codex/categories/category_reactions.dm @@ -19,7 +19,7 @@ /decl/codex_category/materials/chemistry/compounds name = "Compounds" - desc = "Chemical reactions with non-medical, mundane, interesting or spectacular effects." + desc = "Chemical reactions with nonmedical, mundane, interesting or spectacular effects." guide_name = "Compounds" reaction_category = REACTION_TYPE_COMPOUND diff --git a/code/modules/crafting/stack_recipes/recipes_cardstock.dm b/code/modules/crafting/stack_recipes/recipes_cardstock.dm index d15f0f027e2..30e9e6f5e3a 100644 --- a/code/modules/crafting/stack_recipes/recipes_cardstock.dm +++ b/code/modules/crafting/stack_recipes/recipes_cardstock.dm @@ -1,7 +1,7 @@ /decl/stack_recipe/cardstock abstract_type = /decl/stack_recipe/cardstock craft_stack_types = /obj/item/stack/material/cardstock - available_to_map_tech_level = MAP_TECH_LEVEL_SPACE // not exactly high tech, but donuts etc are not medieval + available_to_map_tech_level = MAP_TECH_LEVEL_SPACE // not exactly high-tech, but donuts etc are not medieval /decl/stack_recipe/cardstock/box result_type = /obj/item/box diff --git a/code/modules/detectivework/microscope/dnascanner.dm b/code/modules/detectivework/microscope/dnascanner.dm index 964b8c2f2e3..f4976215181 100644 --- a/code/modules/detectivework/microscope/dnascanner.dm +++ b/code/modules/detectivework/microscope/dnascanner.dm @@ -1,7 +1,7 @@ //DNA machine /obj/machinery/forensic/dnascanner name = "DNA analyzer" - desc = "A high tech machine that is designed to read DNA samples properly." + desc = "A high-tech machine that is designed to read DNA samples properly." icon = 'icons/obj/forensics.dmi' icon_state = "dna_open" anchored = TRUE diff --git a/code/modules/games/boardgame.dm b/code/modules/games/boardgame.dm index 5fd4c46d448..4aa01e0697d 100644 --- a/code/modules/games/boardgame.dm +++ b/code/modules/games/boardgame.dm @@ -1,6 +1,6 @@ /obj/item/board name = "board" - desc = "A standard 16\" checkerboard. Well used." //Goddamn imperial system. + desc = "A standard 16\" checkerboard. Well-used." //Goddamn imperial system. icon = 'icons/obj/pieces.dmi' icon_state = "board" material = /decl/material/solid/organic/wood/oak diff --git a/code/modules/genetics/plants/trait_biolum.dm b/code/modules/genetics/plants/trait_biolum.dm index 26c5d38b69d..a4b8e623e18 100644 --- a/code/modules/genetics/plants/trait_biolum.dm +++ b/code/modules/genetics/plants/trait_biolum.dm @@ -5,4 +5,4 @@ /decl/plant_trait/biolum/get_extended_data(val, datum/seed/grown_seed) if(val) - return "It is [grown_seed?.get_trait(TRAIT_BIOLUM_COLOUR) ? "bio-luminescent" : "bio-luminescent"]." + return "It is [grown_seed?.get_trait(TRAIT_BIOLUM_COLOUR) ? "bioluminescent" : "bioluminescent"]." diff --git a/code/modules/goals/definitions/personal_achievement.dm b/code/modules/goals/definitions/personal_achievement.dm index bf83f3303e9..12849c7f785 100644 --- a/code/modules/goals/definitions/personal_achievement.dm +++ b/code/modules/goals/definitions/personal_achievement.dm @@ -32,5 +32,5 @@ completion_message = "Yeah! Smash the state!" /datum/goal/achievement/newshound - description = "Catch up on the news with a newspaper, none of that new-fangled digital media." + description = "Catch up on the news with a newspaper, none of that newfangled digital media." completion_message = "You feel much more in-the-know." \ No newline at end of file diff --git a/code/modules/integrated_electronics/subtypes/converters.dm b/code/modules/integrated_electronics/subtypes/converters.dm index a6049076789..2b91f12b1ec 100644 --- a/code/modules/integrated_electronics/subtypes/converters.dm +++ b/code/modules/integrated_electronics/subtypes/converters.dm @@ -394,7 +394,7 @@ /obj/item/integrated_circuit/converter/hsv2hex name = "hsv to hexadecimal" - desc = "This circuit can convert a HSV (Hue, Saturation, and Value) color to a Hexadecimal RGB color." + desc = "This circuit can convert an HSV (Hue, Saturation, and Value) color to a Hexadecimal RGB color." extended_desc = "The first pin controls tint (0-359), the second pin controls how intense the tint is (0-255), and the third controls how bright the tint is (0 for black, 127 for normal, 255 for white)." icon_state = "hsv-hex" inputs = list( @@ -420,7 +420,7 @@ /obj/item/integrated_circuit/converter/rgb2hex name = "rgb to hexadecimal" - desc = "This circuit can convert a RGB (Red, Green, Blue) color to a Hexadecimal RGB color." + desc = "This circuit can convert an RGB (Red, Green, Blue) color to a Hexadecimal RGB color." extended_desc = "The first pin controls red amount, the second pin controls green amount, and the third controls blue amount. They all go from 0-255." icon_state = "rgb-hex" inputs = list( diff --git a/code/modules/maps/template_types/random_exoplanet/planet_types/shrouded.dm b/code/modules/maps/template_types/random_exoplanet/planet_types/shrouded.dm index 91613687054..4ef94c9de02 100644 --- a/code/modules/maps/template_types/random_exoplanet/planet_types/shrouded.dm +++ b/code/modules/maps/template_types/random_exoplanet/planet_types/shrouded.dm @@ -4,7 +4,7 @@ /obj/effect/overmap/visitable/sector/planetoid/exoplanet/shrouded name = "shrouded exoplanet" - desc = "An exoplanet shrouded in a perpetual storm of bizarre, light absorbing particles." + desc = "An exoplanet shrouded in a perpetual storm of bizarre, light-absorbing particles." color = "#783ca4" /obj/effect/overmap/visitable/sector/planetoid/exoplanet/shrouded/get_atmosphere_color() diff --git a/code/modules/mechs/equipment/utility.dm b/code/modules/mechs/equipment/utility.dm index b5fb55b0461..deb50fc2b94 100644 --- a/code/modules/mechs/equipment/utility.dm +++ b/code/modules/mechs/equipment/utility.dm @@ -572,7 +572,7 @@ /obj/item/gun/energy/plasmacutter/mounted/mech/auto charge_cost = 13 name = "rotatory plasma cutter" - desc = "A state of the art rotating, variable intensity, sequential-cascade plasma cutter. Resist the urge to aim this at your coworkers." + desc = "A state-of-the-art rotating, variable intensity, sequential-cascade plasma cutter. Resist the urge to aim this at your coworkers." max_shots = 15 firemodes = list( list(mode_name="single shot", autofire_enabled=0, burst=1, fire_delay=6, dispersion = list(0.0)), diff --git a/code/modules/mechs/premade/_premade.dm b/code/modules/mechs/premade/_premade.dm index 77914bfc25d..6498521605a 100644 --- a/code/modules/mechs/premade/_premade.dm +++ b/code/modules/mechs/premade/_premade.dm @@ -40,7 +40,7 @@ /mob/living/exosuit/premade/random name = "mismatched exosuit" - desc = "It seems to have been roughly thrown together and then spraypainted a single colour." + desc = "It seems to have been roughly thrown together and then spray-painted a single colour." /mob/living/exosuit/premade/random/Initialize(mapload, var/obj/structure/heavy_vehicle_frame/source_frame, var/super_random = FALSE, var/using_boring_colours = FALSE) var/list/use_colours diff --git a/code/modules/merchant/merchant_guns.dm b/code/modules/merchant/merchant_guns.dm index e41d3d480e9..939a570aab1 100644 --- a/code/modules/merchant/merchant_guns.dm +++ b/code/modules/merchant/merchant_guns.dm @@ -12,5 +12,5 @@ return ..() /obj/item/gun/projectile/automatic/smg/usi - desc = "A cheap mass produced SMG. This one looks especially run-down. Uses pistol rounds." + desc = "A cheap mass-produced SMG. This one looks especially run-down. Uses pistol rounds." jam_chance = 20 \ No newline at end of file diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 7621e897fc8..5836b2ed979 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -29,7 +29,7 @@ // Flags. /obj/item/stack/flag name = "beacon" - desc = "Some deployable high-visibilty beacons." + desc = "Some deployable high-visibility beacons." singular_name = "beacon" icon_state = "folded" amount = 10 diff --git a/code/modules/mob/living/silicon/robot/flying/flying.dm b/code/modules/mob/living/silicon/robot/flying/flying.dm index 42d6b717d93..05b6f1da745 100644 --- a/code/modules/mob/living/silicon/robot/flying/flying.dm +++ b/code/modules/mob/living/silicon/robot/flying/flying.dm @@ -1,5 +1,5 @@ /mob/living/silicon/robot/flying - desc = "A utility robot with an anti-gravity hover unit and a lightweight frame." + desc = "A utility robot with an antigravity hover unit and a lightweight frame." icon = 'icons/mob/robots/flying/flying.dmi' module_category = ROBOT_MODULE_TYPE_FLYING dismantle_type = /obj/item/robot_parts/robot_suit/flyer diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm index c8de00b79d2..b0b396c8586 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm @@ -2,7 +2,7 @@ //malfunctioning combat drones /mob/living/simple_animal/hostile/malf_drone name = "combat drone" - desc = "An automated combat drone armed with state of the art weaponry and shielding." + desc = "An automated combat drone armed with state-of-the-art weaponry and shielding." icon = 'icons/mob/simple_animal/drone_combat.dmi' burst_projectile = 0 max_health = 300 diff --git a/code/modules/mob/skills/skill.dm b/code/modules/mob/skills/skill.dm index 87cad27fdb3..9d75a5d591e 100644 --- a/code/modules/mob/skills/skill.dm +++ b/code/modules/mob/skills/skill.dm @@ -331,7 +331,7 @@ category = /decl/skill_category/engineering uid = "skill_electrical" fallback_key = "/decl/hierarchy/skill/engineering/electrical" - desc = "This skill describes your knowledge of electronics and the underlying physics. A low level of this skill implies you know how to lay out wiring and configure powernets, a high level of this skill is required for working complex electronic devices such as circuits or bots." + desc = "This skill describes your knowledge of electronics and the underlying physics. A low level of this skill implies you know how to lay out wiring and configure power networks, a high level of this skill is required for working complex electronic devices such as circuits or bots." levels = list( "Unskilled" = "You know that electrical wires are dangerous and getting shocked is bad; you can see and report electrical malfunctions such as broken wires or malfunctioning APCs. You can change a light bulb, and you know how to replace a battery or charge up the equipment you normally use.
      - Every time you open the hacking panel, wires are randomized.
      - Every time you pulse a wire, there is a chance you pulse a different one.
      - Every time you cut a wire, there is a chance you cut/mend extra ones.
      - You can misconnect remote signalling devices.", "Basic" = "You can do basic wiring; you can lay cable for solars or the engine. You can repair broken wiring and build simple electrical equipment like light fixtures or APCs. You know the basics of circuits and understand how to protect yourself from electrical shock. You can probably hack a vending machine.
      - Every time you open the hacking panel, some wires might be duplicated.", diff --git a/code/modules/paperwork/printer.dm b/code/modules/paperwork/printer.dm index 0f91439ab58..cfb02e78a14 100644 --- a/code/modules/paperwork/printer.dm +++ b/code/modules/paperwork/printer.dm @@ -5,7 +5,7 @@ //////////////////////////////////////////////////////////////////////////////////////// /obj/item/stock_parts/printer name = "printer" - desc = "A full fledged laser printer. This one is meant to be installed inside another machine. Comes with its own paper feeder and toner slot." + desc = "A full-fledged laser printer. This one is meant to be installed inside another machine. Comes with its own paper feeder and toner slot." icon = 'icons/obj/items/stock_parts/modular_components.dmi' icon_state = "printer" randpixel = 5 diff --git a/code/modules/power/breaker_box.dm b/code/modules/power/breaker_box.dm index bf0c3c7fc75..5cb140c727e 100644 --- a/code/modules/power/breaker_box.dm +++ b/code/modules/power/breaker_box.dm @@ -8,7 +8,7 @@ name = "breaker box" icon = 'icons/obj/power.dmi' icon_state = "bbox_off" - desc = "A large machine with heavy duty switching circuits used for advanced grid control." + desc = "A large machine with heavy-duty switching circuits used for advanced grid control." //directwired = 0 var/icon_state_on = "bbox_on" var/icon_state_off = "bbox_off" diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 655e2766497..412f01cf6cb 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -509,7 +509,7 @@ By design, d1 is the smallest direction and d2 is the highest max_amount = MAXCOIL color = COLOR_MAROON paint_color = COLOR_MAROON - desc = "A coil of wiring, suitable for both delicate electronics and heavy duty power supply." + desc = "A coil of wiring, suitable for both delicate electronics and heavy-duty power supply." singular_name = "length" w_class = ITEM_SIZE_NORMAL throw_speed = 2 diff --git a/code/modules/power/fusion/gyrotron/gyrotron.dm b/code/modules/power/fusion/gyrotron/gyrotron.dm index db11e44f9b1..afb22c62b68 100644 --- a/code/modules/power/fusion/gyrotron/gyrotron.dm +++ b/code/modules/power/fusion/gyrotron/gyrotron.dm @@ -3,7 +3,7 @@ /obj/machinery/emitter/gyrotron name = "gyrotron" icon = 'icons/obj/machines/power/fusion.dmi' - desc = "It is a heavy duty industrial gyrotron suited for powering fusion reactors." + desc = "It is a heavy-duty industrial gyrotron suited for powering fusion reactors." icon_state = "emitter-off" initial_access = list(access_engine) use_power = POWER_USE_IDLE diff --git a/code/modules/power/sensors/powernet_sensor.dm b/code/modules/power/sensors/powernet_sensor.dm index 8a02779ed2a..6a0134664cd 100644 --- a/code/modules/power/sensors/powernet_sensor.dm +++ b/code/modules/power/sensors/powernet_sensor.dm @@ -9,7 +9,7 @@ /obj/machinery/power/sensor name = "powernet sensor" - desc = "Small machine which transmits data about specific powernet." + desc = "A sensor that records and transmits data about its connected power network." anchored = TRUE density = FALSE level = LEVEL_BELOW_PLATING diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index 7966b8e04f9..26090dff1d9 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -99,7 +99,7 @@ /obj/item/ammo_casing/shotgun/pellet name = "shotgun shell" - desc = "A shotshell." + desc = "A shotgun shell." icon_state = "gshell" spent_icon = "gshell-spent" projectile_type = /obj/item/projectile/bullet/pellet/shotgun diff --git a/code/modules/projectiles/guns/energy/secure.dm b/code/modules/projectiles/guns/energy/secure.dm index 64d4cf57727..c8df1f2ea05 100644 --- a/code/modules/projectiles/guns/energy/secure.dm +++ b/code/modules/projectiles/guns/energy/secure.dm @@ -34,7 +34,7 @@ /obj/item/gun/energy/laser/secure name = "laser carbine" - desc = "A G40E carbine, designed to kill with concentrated energy blasts. Fitted with an NT1019 chip to make sure killcount is tracked appropriately." + desc = "A G40E carbine, designed to kill with concentrated energy blasts. Fitted with an NT1019 chip to make sure kill count is tracked appropriately." req_access = list(list(access_brig, access_bridge)) /obj/item/gun/energy/laser/secure/on_update_icon() diff --git a/code/modules/projectiles/guns/launcher/syringe_gun.dm b/code/modules/projectiles/guns/launcher/syringe_gun.dm index 6594d041a58..2750cecee52 100644 --- a/code/modules/projectiles/guns/launcher/syringe_gun.dm +++ b/code/modules/projectiles/guns/launcher/syringe_gun.dm @@ -71,7 +71,7 @@ /obj/item/gun/launcher/syringe name = "syringe gun" - desc = "A spring loaded rifle designed to fit syringes, designed to incapacitate unruly patients from a distance." + desc = "A spring-loaded rifle designed to fit syringes, designed to incapacitate unruly patients from a distance." icon = 'icons/obj/guns/launcher/syringe.dmi' icon_state = ICON_STATE_WORLD w_class = ITEM_SIZE_LARGE diff --git a/code/modules/reagents/reagent_containers/drinks/bottle.dm b/code/modules/reagents/reagent_containers/drinks/bottle.dm index 4da6883ce56..99a5d34379b 100644 --- a/code/modules/reagents/reagent_containers/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/drinks/bottle.dm @@ -290,7 +290,7 @@ /obj/item/chems/drinks/bottle/patron name = "Wrapp Artiste Patron" - desc = "Silver laced tequila, served in space night clubs across the galaxy." + desc = "Silver laced tequila, served in space nightclubs across the galaxy." icon_state = "patronbottle" center_of_mass = @'{"x":16,"y":6}' diff --git a/code/modules/reagents/reagent_containers/food/eggs.dm b/code/modules/reagents/reagent_containers/food/eggs.dm index ea7851b65ed..955ea9d8d10 100644 --- a/code/modules/reagents/reagent_containers/food/eggs.dm +++ b/code/modules/reagents/reagent_containers/food/eggs.dm @@ -96,7 +96,7 @@ /obj/item/food/boiledegg name = "boiled egg" - desc = "A hard boiled egg." + desc = "A hard-boiled egg." icon = 'icons/obj/food/eggs/egg.dmi' icon_state = ICON_STATE_WORLD filling_color = "#ffffff" diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm index d7cb76c4ead..41df847379c 100644 --- a/code/modules/security_levels/keycard_authentication.dm +++ b/code/modules/security_levels/keycard_authentication.dm @@ -194,7 +194,7 @@ if(nuke) visible_message(SPAN_WARNING("\The [src] blinks and displays a message: The nuclear authorization code is [nuke.r_code]"), range=2) else - visible_message(SPAN_WARNING("\The [src] blinks and displays a message: No self destruct terminal found."), range=2) + visible_message(SPAN_WARNING("\The [src] blinks and displays a message: No self-destruct terminal found."), range=2) SSstatistics.add_field("alert_keycard_auth_nukecode",1) /obj/machinery/keycard_auth/proc/is_ert_blocked() diff --git a/code/unit_tests/zas_tests.dm b/code/unit_tests/zas_tests.dm index 7866c78bd62..a3a236167d5 100644 --- a/code/unit_tests/zas_tests.dm +++ b/code/unit_tests/zas_tests.dm @@ -99,7 +99,7 @@ /// Here we move a shuttle then test it's area once the shuttle has arrived. /datum/unit_test/zas_supply_shuttle_moved name = "ZAS: Supply Shuttle (When Moved)" - async = TRUE // We're moving the shuttle using built in procs. + async = TRUE // We're moving the shuttle using built-in procs. ///The shuttle datum of the supply shuttle var/datum/shuttle/autodock/ferry/supply/shuttle = null diff --git a/mods/species/ascent/datum/languages.dm b/mods/species/ascent/datum/languages.dm index ca38c2909b6..d4af47ccc14 100644 --- a/mods/species/ascent/datum/languages.dm +++ b/mods/species/ascent/datum/languages.dm @@ -47,7 +47,7 @@ /decl/language/mantid/nonvocal key = "]" name = "Ascent-Glow" - desc = "A complex visual language of bright bio-luminescent flashes, 'spoken' natively by the Kharmaani of the Ascent." + desc = "A complex visual language of bright bioluminescent flashes, 'spoken' natively by the Kharmaani of the Ascent." colour = "alien" speech_verb = "flashes" ask_verb = "gleams"
      Radio Subspace Transceiver