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"