From 1fc0f235ef071d2d77295b77f7dd7af1266e0c14 Mon Sep 17 00:00:00 2001 From: Krausus Date: Mon, 8 Jun 2015 23:32:44 -0400 Subject: [PATCH] Fixes plurality of stacks and updates miss message Some stacks didn't have their gender set to plural, despite having a pluralized item name. --- code/game/objects/items/stacks/sheets/light.dm | 1 + code/game/objects/items/stacks/sheets/sheet_types.dm | 1 + code/game/objects/items/stacks/tiles/light.dm | 1 + code/game/objects/items/stacks/tiles/plasteel.dm | 1 + code/game/objects/items/stacks/tiles/tile_types.dm | 2 ++ code/modules/mob/living/carbon/human/human_defense.dm | 4 +++- 6 files changed, 9 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm index 7b2b30660ec..8bb97f4f256 100644 --- a/code/game/objects/items/stacks/sheets/light.dm +++ b/code/game/objects/items/stacks/sheets/light.dm @@ -1,5 +1,6 @@ /obj/item/stack/light_w name = "wired glass tiles" + gender = PLURAL singular_name = "wired glass floor tile" desc = "A glass tile, which is wired, somehow." icon_state = "glass_wire" diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index bbfb06db029..af8ac8cc04f 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -153,6 +153,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \ /obj/item/stack/sheet/wood name = "wooden planks" desc = "One can only guess that this is a bunch of wood." + gender = PLURAL singular_name = "wood plank" icon_state = "sheet-wood" origin_tech = "materials=1;biotech=1" diff --git a/code/game/objects/items/stacks/tiles/light.dm b/code/game/objects/items/stacks/tiles/light.dm index 3931aa8f444..943e593183e 100644 --- a/code/game/objects/items/stacks/tiles/light.dm +++ b/code/game/objects/items/stacks/tiles/light.dm @@ -8,6 +8,7 @@ /obj/item/stack/tile/light name = "light tiles" + gender = PLURAL singular_name = "light floor tile" desc = "A floor tile, made out off glass. Use a multitool on it to change its color." icon_state = "tile_light blue" diff --git a/code/game/objects/items/stacks/tiles/plasteel.dm b/code/game/objects/items/stacks/tiles/plasteel.dm index ee9c5832f72..33e55268d6f 100644 --- a/code/game/objects/items/stacks/tiles/plasteel.dm +++ b/code/game/objects/items/stacks/tiles/plasteel.dm @@ -1,5 +1,6 @@ /obj/item/stack/tile/plasteel name = "floor tiles" + gender = PLURAL singular_name = "floor tile" desc = "Those could work as a pretty decent throwing weapon" icon_state = "tile" diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index b6ae03aa271..f54f2481bb6 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -10,6 +10,7 @@ */ /obj/item/stack/tile/grass name = "grass tiles" + gender = PLURAL singular_name = "grass floor tile" desc = "A patch of grass like they often use on golf courses" icon_state = "tile_grass" @@ -27,6 +28,7 @@ */ /obj/item/stack/tile/wood name = "wood floor tiles" + gender = PLURAL singular_name = "wood floor tile" desc = "an easy to fit wood floor tile" icon_state = "tile-wood" diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 155b4e0e501..f3936682e98 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -380,7 +380,9 @@ emp_act var/obj/item/organ/external/affecting = get_organ(zone) if(!affecting) - visible_message("\blue \The [O] misses [src] narrowly!") + var/missverb = (O.gender == PLURAL) ? "whizz" : "whizzes" + visible_message("\The [O] [missverb] past [src]'s missing [parse_zone(zone)]!", + "\The [O] [missverb] past your missing [parse_zone(zone)]!") return var/hit_area = affecting.name