From a523d44c540b350ad5c8edf3416cd0362f2ed911 Mon Sep 17 00:00:00 2001 From: Ansari Date: Sun, 22 Oct 2017 15:03:55 +0800 Subject: [PATCH 1/5] Stop assuming gender. --- code/game/objects/items/devices/flash.dm | 2 +- code/game/objects/items/weapons/cosmetics.dm | 4 ++-- code/game/objects/items/weapons/garrote.dm | 4 ++-- code/modules/mob/living/carbon/human/examine.dm | 2 +- code/modules/mob/living/carbon/superheroes.dm | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 1a1ed2b4c5e..2ed06a12773 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -122,7 +122,7 @@ for(var/obj/item/borg/combat/shield/S in R.module.modules) if(R.activated(S)) add_logs(user, M, "flashed", object="[src.name]") - user.visible_message("[user] tries to overloads [M]'s sensors with the [src.name], but if blocked by [M]'s shield!", "You try to overload [M]'s sensors with the [src.name], but are blocked by his shield!") + user.visible_message("[user] tries to overloads [M]'s sensors with the [src.name], but is blocked by [M]'s shield!", "You try to overload [M]'s sensors with the [src.name], but are blocked by \his shield!") return 1 add_logs(user, M, "flashed", object="[src.name]") if(M.flash_eyes(affect_silicon = 1)) diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index 96d48c55b83..a090985b78e 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -109,7 +109,7 @@ user.visible_message("[user] starts to shave their facial hair with \the [src].", \ "You take a moment shave your facial hair with \the [src].") if(do_after(user, 50 * toolspeed, target = H)) - user.visible_message("[user] shaves his facial hair clean with the [src].", \ + user.visible_message("[user] shaves \his facial hair clean with the [src].", \ "You finish shaving with the [src]. Fast and clean!") C.f_style = "Shaved" H.update_fhair() @@ -143,7 +143,7 @@ user.visible_message("[user] starts to shave their head with \the [src].", \ "You start to shave your head with \the [src].") if(do_after(user, 50 * toolspeed, target = H)) - user.visible_message("[user] shaves his head with the [src].", \ + user.visible_message("[user] shaves \his head with the [src].", \ "You finish shaving with the [src].") C.h_style = "Skinhead" H.update_hair() diff --git a/code/game/objects/items/weapons/garrote.dm b/code/game/objects/items/weapons/garrote.dm index be96e29f97a..042e0d707f1 100644 --- a/code/game/objects/items/weapons/garrote.dm +++ b/code/game/objects/items/weapons/garrote.dm @@ -134,7 +134,7 @@ G = user.r_hand else - user.visible_message("[user] loses his grip on [strangling]'s neck.", \ + user.visible_message("[user] loses \his grip on [strangling]'s neck.", \ "You lose your grip on [strangling]'s neck.") strangling = null @@ -144,7 +144,7 @@ return if(!G.affecting) - user.visible_message("[user] loses his grip on [strangling]'s neck.", \ + user.visible_message("[user] loses \his grip on [strangling]'s neck.", \ "You lose your grip on [strangling]'s neck.") strangling = null diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 299006c102d..d970b696ca4 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -245,7 +245,7 @@ wound_flavor_text["[E.limb_name]"] = "[t_He] [t_has] a robotic [E.name]!\n" else if(E.status & ORGAN_SPLINTED) - wound_flavor_text["[E.limb_name]"] = "[t_He] [t_has] a splint on his [E.name]!\n" + wound_flavor_text["[E.limb_name]"] = "[t_He] [t_has] a splint on [t_his] [E.name]!\n" for(var/obj/item/I in E.embedded_objects) msg += "[t_He] [t_has] \a [bicon(I)] [I] embedded in [t_his] [E.name]!\n" diff --git a/code/modules/mob/living/carbon/superheroes.dm b/code/modules/mob/living/carbon/superheroes.dm index b6b2c707ddb..b4677c5526a 100644 --- a/code/modules/mob/living/carbon/superheroes.dm +++ b/code/modules/mob/living/carbon/superheroes.dm @@ -188,7 +188,7 @@ switch(progress) if(1) to_chat(user, "You begin by introducing yourself and explaining what you're about.") - user.visible_message("[user]'s introduces himself and explains his plans.") + user.visible_message("[user]'s introduces himself and explains \his plans.") if(2) to_chat(user, "You begin the recruitment of [target].") user.visible_message("[user] leans over towards [target], whispering excitedly as he gives a speech.") @@ -214,7 +214,7 @@ recruiting = 0 to_chat(user, "You have recruited [target] as your henchman!") to_chat(target, "You have decided to enroll as a henchman for [user]. You are now part of the feared 'Greyshirts'.") - to_chat(target, "You must follow the orders of [user], and help him succeed in his dastardly schemes.") + to_chat(target, "You must follow the orders of [user], and help him succeed in \his dastardly schemes.") to_chat(target, "You may not harm other Greyshirt or [user]. However, you do not need to obey other Greyshirts.") ticker.mode.greyshirts += target.mind target.set_species("Human") From dfd1c177682386dd231261a332f733097710b196 Mon Sep 17 00:00:00 2001 From: Ansari Date: Sun, 22 Oct 2017 17:05:59 +0800 Subject: [PATCH 2/5] Change flash pronoun to theirs --- code/game/objects/items/devices/flash.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 2ed06a12773..52472afcb3d 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -122,7 +122,7 @@ for(var/obj/item/borg/combat/shield/S in R.module.modules) if(R.activated(S)) add_logs(user, M, "flashed", object="[src.name]") - user.visible_message("[user] tries to overloads [M]'s sensors with the [src.name], but is blocked by [M]'s shield!", "You try to overload [M]'s sensors with the [src.name], but are blocked by \his shield!") + user.visible_message("[user] tries to overloads [M]'s sensors with the [src.name], but is blocked by [M]'s shield!", "You try to overload [M]'s sensors with the [src.name], but are blocked by their shield!") return 1 add_logs(user, M, "flashed", object="[src.name]") if(M.flash_eyes(affect_silicon = 1)) From 83a81e01dd1b46d2c8cf8f1f7402247f9c2b6390 Mon Sep 17 00:00:00 2001 From: Ansari Date: Fri, 27 Oct 2017 19:48:06 +0800 Subject: [PATCH 3/5] \himself --- code/modules/mob/living/carbon/superheroes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/superheroes.dm b/code/modules/mob/living/carbon/superheroes.dm index b4677c5526a..af4e6f75aa2 100644 --- a/code/modules/mob/living/carbon/superheroes.dm +++ b/code/modules/mob/living/carbon/superheroes.dm @@ -188,7 +188,7 @@ switch(progress) if(1) to_chat(user, "You begin by introducing yourself and explaining what you're about.") - user.visible_message("[user]'s introduces himself and explains \his plans.") + user.visible_message("[user]'s introduces \himself and explains \his plans.") if(2) to_chat(user, "You begin the recruitment of [target].") user.visible_message("[user] leans over towards [target], whispering excitedly as he gives a speech.") From c22534dd28f64c7d13351cef2708049d2534d2c3 Mon Sep 17 00:00:00 2001 From: Ansari Date: Mon, 30 Oct 2017 07:51:29 +0800 Subject: [PATCH 4/5] \the --- code/game/objects/items/weapons/cosmetics.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index a090985b78e..583f3e08c11 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -143,8 +143,8 @@ user.visible_message("[user] starts to shave their head with \the [src].", \ "You start to shave your head with \the [src].") if(do_after(user, 50 * toolspeed, target = H)) - user.visible_message("[user] shaves \his head with the [src].", \ - "You finish shaving with the [src].") + user.visible_message("[user] shaves \his head with \the [src].", \ + "You finish shaving with\the [src].") C.h_style = "Skinhead" H.update_hair() playsound(src.loc, usesound, 40, 1) From da924006a62074a986443af821d3aede27d319a7 Mon Sep 17 00:00:00 2001 From: Ansari Date: Thu, 2 Nov 2017 11:20:37 +0800 Subject: [PATCH 5/5] guess i spaced out during this one --- code/game/objects/items/weapons/cosmetics.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index 583f3e08c11..6fa11d839c7 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -144,7 +144,7 @@ "You start to shave your head with \the [src].") if(do_after(user, 50 * toolspeed, target = H)) user.visible_message("[user] shaves \his head with \the [src].", \ - "You finish shaving with\the [src].") + "You finish shaving with \the [src].") C.h_style = "Skinhead" H.update_hair() playsound(src.loc, usesound, 40, 1)