From cf7ac5b79d8fa98bc64a4054e7394053ca65e459 Mon Sep 17 00:00:00 2001 From: Tad Hardesty Date: Sat, 5 Sep 2020 02:45:25 -0700 Subject: [PATCH] Fix some miscellaneous grammar mistakes (#53414) --- code/game/objects/items/stacks/ammonia_crystals.dm | 4 ++-- code/game/objects/items/stacks/medical.dm | 3 +-- code/game/objects/items/stacks/sheets/hot_ice.dm | 2 +- code/game/objects/items/stacks/sheets/mineral.dm | 4 ++-- code/game/objects/items/stacks/sheets/sheet_types.dm | 4 ++-- code/game/objects/items/stacks/tiles/tile_types.dm | 4 ++-- code/game/objects/structures/signs/signs_warning.dm | 2 +- code/modules/antagonists/eldritch_cult/eldritch_effects.dm | 2 +- code/modules/events/crystal_event.dm | 4 ++-- code/modules/library/skill_learning/skill_station.dm | 4 ++-- 10 files changed, 16 insertions(+), 17 deletions(-) diff --git a/code/game/objects/items/stacks/ammonia_crystals.dm b/code/game/objects/items/stacks/ammonia_crystals.dm index ff26c60b73f..1be04147bc0 100644 --- a/code/game/objects/items/stacks/ammonia_crystals.dm +++ b/code/game/objects/items/stacks/ammonia_crystals.dm @@ -1,6 +1,6 @@ /obj/item/stack/ammonia_crystals - name = "Ammonia Crystals" - singular_name = "Ammonia Crystal" + name = "ammonia crystals" + singular_name = "ammonia crystal" icon = 'icons/obj/stack_objects.dmi' icon_state = "ammonia_crystal" w_class = WEIGHT_CLASS_TINY diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 9703f63fd8d..eb4860812da 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -279,7 +279,7 @@ name = "regenerative mesh" desc = "A bacteriostatic mesh used to dress burns." gender = PLURAL - singular_name = "regenerative mesh" + singular_name = "mesh piece" icon_state = "regen_mesh" self_delay = 30 other_delay = 10 @@ -347,7 +347,6 @@ desc = "An advanced mesh made with aloe extracts and sterilizing chemicals, used to treat burns." gender = PLURAL - singular_name = "advanced regenerative mesh" icon_state = "aloe_mesh" heal_burn = 15 sanitization = 1.25 diff --git a/code/game/objects/items/stacks/sheets/hot_ice.dm b/code/game/objects/items/stacks/sheets/hot_ice.dm index de2a5e9c9a1..08ce2c4a417 100644 --- a/code/game/objects/items/stacks/sheets/hot_ice.dm +++ b/code/game/objects/items/stacks/sheets/hot_ice.dm @@ -2,7 +2,7 @@ name = "hot ice" icon_state = "hot-ice" inhand_icon_state = "hot-ice" - singular_name = "hot ice" + singular_name = "hot ice piece" icon = 'icons/obj/stack_objects.dmi' custom_materials = list(/datum/material/hot_ice=MINERAL_MATERIAL_AMOUNT) grind_results = list(/datum/reagent/toxin/hot_ice = 25) diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 0c27a9b503d..d2fe5cde658 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -485,10 +485,10 @@ GLOBAL_LIST_INIT(metalhydrogen_recipes, list( )) /obj/item/stack/sheet/mineral/metal_hydrogen - name = "Metal Hydrogen" + name = "metal hydrogen" icon_state = "sheet-metalhydrogen" inhand_icon_state = "sheet-metalhydrogen" - singular_name = "Metal Hydrogen sheet" + singular_name = "metal hydrogen sheet" w_class = WEIGHT_CLASS_NORMAL resistance_flags = FIRE_PROOF | LAVA_PROOF | ACID_PROOF | INDESTRUCTIBLE point_value = 100 diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index ff36c94453a..4fd6d1ee338 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -260,7 +260,7 @@ GLOBAL_LIST_INIT(bamboo_recipes, list ( \ /obj/item/stack/sheet/mineral/bamboo name = "bamboo cuttings" desc = "Finely cut bamboo sticks." - singular_name = "cut bamboo" + singular_name = "cut bamboo stick" icon_state = "sheet-bamboo" inhand_icon_state = "sheet-bamboo" icon = 'icons/obj/stack_objects.dmi' @@ -734,7 +734,7 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra /obj/item/stack/sheet/sandblock name = "blocks of sand" desc = "You're too old to be playing with sandcastles. Now you build... sandstations." - singular_name = "block of sand" + singular_name = "sand block" icon_state = "sheet-sandstone" custom_materials = list(/datum/material/sand = MINERAL_MATERIAL_AMOUNT) merge_type = /obj/item/stack/sheet/sandblock diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 170c6a4da0b..03d9b4f6cf6 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -128,7 +128,7 @@ //Carpets /obj/item/stack/tile/carpet name = "carpet" - singular_name = "carpet" + singular_name = "carpet tile" desc = "A piece of carpet. It is the same size as a floor tile." icon_state = "tile-carpet" inhand_icon_state = "tile-carpet" @@ -233,7 +233,7 @@ /obj/item/stack/tile/fakespace name = "astral carpet" - singular_name = "astral carpet" + singular_name = "astral carpet tile" desc = "A piece of carpet with a convincing star pattern." icon_state = "tile_space" inhand_icon_state = "tile-space" diff --git a/code/game/objects/structures/signs/signs_warning.dm b/code/game/objects/structures/signs/signs_warning.dm index 9b0867b5520..d22886da2da 100644 --- a/code/game/objects/structures/signs/signs_warning.dm +++ b/code/game/objects/structures/signs/signs_warning.dm @@ -165,7 +165,7 @@ is_editable = TRUE /obj/structure/sign/warning/chemdiamond - name = "\improper REACTIVE CHEMICALS" + name = "\improper REACTIVE CHEMICALS sign" sign_change_name = "Warning - Hazardous Chemicals sign" desc = "A sign that warns of potentially reactive chemicals nearby, be they explosive, flamable, or acidic." icon_state = "chemdiamond" diff --git a/code/modules/antagonists/eldritch_cult/eldritch_effects.dm b/code/modules/antagonists/eldritch_cult/eldritch_effects.dm index 97466faab10..0715764434c 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_effects.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_effects.dm @@ -226,11 +226,11 @@ explosion.start() /obj/effect/broken_illusion/examine(mob/user) + . = ..() if(!IS_HERETIC(user) && ishuman(user)) var/mob/living/carbon/human/human_user = user to_chat(human_user,"Your brain hurts when you look at this!") human_user.adjustOrganLoss(ORGAN_SLOT_BRAIN,10) - . = ..() /obj/effect/reality_smash name = "/improper reality smash" diff --git a/code/modules/events/crystal_event.dm b/code/modules/events/crystal_event.dm index 368fe90aab7..999a4d5637a 100644 --- a/code/modules/events/crystal_event.dm +++ b/code/modules/events/crystal_event.dm @@ -346,9 +346,9 @@ This section is for the crystal stabilizer item and the crystal from the closed qdel(W) /obj/item/stack/sheet/otherworld_crystal - name = "Otherworld Crystals" + name = "otherworld crystals" icon_state = "otherworld-crystal" - singular_name = "Otherworld Crystal" + singular_name = "otherworld crystal" icon = 'icons/obj/stack_objects.dmi' material_type = /datum/material/otherworld_crystal diff --git a/code/modules/library/skill_learning/skill_station.dm b/code/modules/library/skill_learning/skill_station.dm index b61842784f3..eb8062e566b 100644 --- a/code/modules/library/skill_learning/skill_station.dm +++ b/code/modules/library/skill_learning/skill_station.dm @@ -2,8 +2,8 @@ #define SKILLCHIP_REMOVAL_TIME 30 SECONDS /obj/machinery/skill_station - name = "Skillsoft Station" - desc = "learn skills with only minimal chance for brain damage." + name = "\improper Skillsoft station" + desc = "Learn skills with only minimal chance for brain damage." icon = 'icons/obj/machines/implantchair.dmi' icon_state = "implantchair"