diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 0922a2dc481..a5be96912d5 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -114,11 +114,6 @@
action = "pushed"
if(I_HURT)
action = "punched"
- var/t_him = "it"
- if (src.gender == MALE)
- t_him = "him"
- else if (src.gender == FEMALE)
- t_him = "her"
var/show_ssd
var/mob/living/carbon/human/H
if(ishuman(src))
@@ -130,7 +125,7 @@
else if(!vr_mob)
visible_message(SPAN_NOTICE("[M] [action] [src], but they do not respond... Maybe they have S.S.D?"))
else if(client && willfully_sleeping)
- visible_message(SPAN_NOTICE("[M] [action] [src] waking [t_him] up!"))
+ visible_message(SPAN_NOTICE("[M] [action] [src] waking [get_pronoun("him")] up!"))
sleeping = 0
willfully_sleeping = FALSE
@@ -260,11 +255,6 @@
if((isskeleton(H)) && (!H.w_uniform) && (!H.wear_suit))
H.play_xylophone()
else
- var/t_him = "it"
- if (src.gender == MALE)
- t_him = "him"
- else if (src.gender == FEMALE)
- t_him = "her"
if (istype(src,/mob/living/carbon/human) && src:w_uniform)
var/mob/living/carbon/human/H = src
H.w_uniform.add_fingerprint(M)
@@ -278,13 +268,13 @@
if(H.bg)
to_chat(H, SPAN_WARNING("You sense some disturbance to your physical body, like someone is trying to wake you up."))
else if(!vr_mob)
- M.visible_message(SPAN_NOTICE("[M] shakes [src] trying to wake [t_him] up!"), \
+ M.visible_message(SPAN_NOTICE("[M] shakes [src] trying to wake [get_pronoun("him")] up!"), \
SPAN_NOTICE("You shake [src], but they do not respond... Maybe they have S.S.D?"))
else if(lying)
if(src.sleeping)
src.sleeping = max(0,src.sleeping-5)
- M.visible_message(SPAN_NOTICE("[M] shakes [src] trying to wake [t_him] up!"), \
- SPAN_NOTICE("You shake [src] trying to wake [t_him] up!"))
+ M.visible_message(SPAN_NOTICE("[M] shakes [src] trying to wake [get_pronoun("him")] up!"), \
+ SPAN_NOTICE("You shake [src] trying to wake [get_pronoun("him")] up!"))
else
M.help_up_offer = !M.help_up_offer
if(M.help_up_offer)
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index ae7e3d4b9be..acb90d4056a 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -7,11 +7,6 @@
/mob/living/carbon/hitby(atom/movable/AM as mob|obj,var/speed = THROWFORCE_SPEED_DIVISOR)
..(AM, speed)
- var/t_him = "it"
- if (src.gender == MALE)
- t_him = "him"
- else if (src.gender == FEMALE)
- t_him = "her"
var/show_ssd
var/mob/living/carbon/human/H
if(ishuman(src))
@@ -19,7 +14,7 @@
show_ssd = H.species.show_ssd
if(H && show_ssd && !client && !teleop)
if(H.bg)
- visible_message(SPAN_DANGER("[src] is hit by [AM] waking [t_him] up!"))
+ visible_message(SPAN_DANGER("[src] is hit by [AM] waking [get_pronoun("him")] up!"))
if(H.health / H.maxHealth < 0.5)
H.bg.awaken_impl(TRUE)
sleeping = 0
@@ -29,17 +24,12 @@
else if(!vr_mob)
visible_message(SPAN_DANGER("[src] is hit by [AM], but they do not respond... Maybe they have S.S.D?"))
else if(client && willfully_sleeping)
- visible_message(SPAN_DANGER("[src] is hit by [AM] waking [t_him] up!"))
+ visible_message(SPAN_DANGER("[src] is hit by [AM] waking [get_pronoun("him")] up!"))
sleeping = 0
willfully_sleeping = FALSE
/mob/living/carbon/bullet_act(var/obj/item/projectile/P, var/def_zone)
..(P, def_zone)
- var/t_him = "it"
- if (src.gender == MALE)
- t_him = "him"
- else if (src.gender == FEMALE)
- t_him = "her"
var/show_ssd
var/mob/living/carbon/human/H
if(ishuman(src))
@@ -47,7 +37,7 @@
show_ssd = H.species.show_ssd
if(H && show_ssd && !client && !teleop)
if(H.bg)
- visible_message("[P] hit [src] waking [t_him] up!")
+ visible_message("[P] hit [src] waking [get_pronoun("him")] up!")
if(H.health / H.maxHealth < 0.5)
H.bg.awaken_impl(TRUE)
sleeping = 0
@@ -57,16 +47,11 @@
else if(!vr_mob)
visible_message("[P] hit [src], but they do not respond... Maybe they have S.S.D?")
else if(client && willfully_sleeping)
- visible_message("[P] hit [src] waking [t_him] up!")
+ visible_message("[P] hit [src] waking [get_pronoun("him")] up!")
sleeping = 0
willfully_sleeping = FALSE
/mob/living/carbon/standard_weapon_hit_effects(obj/item/I, mob/living/user, var/effective_force, var/hit_zone)
- var/t_him = "it"
- if (src.gender == MALE)
- t_him = "him"
- else if (src.gender == FEMALE)
- t_him = "her"
var/show_ssd
var/mob/living/carbon/human/H
if(ishuman(src))
@@ -81,11 +66,11 @@
else
to_chat(H, SPAN_DANGER("You sense great disturbance to your physical body!"))
else if(!vr_mob)
- user.visible_message("[user] attacks [src] with [I] waking [t_him] up!", \
+ user.visible_message("[user] attacks [src] with [I] waking [get_pronoun("him")] up!", \
"You attack [src] with [I], but they do not respond... Maybe they have S.S.D?")
else if(client && willfully_sleeping)
- user.visible_message("[user] attacked [src] with [I] waking [t_him] up!", \
- "You attack [src] with [I], waking [t_him] up!")
+ user.visible_message("[user] attacked [src] with [I] waking [get_pronoun("him")] up!", \
+ "You attack [src] with [I], waking [get_pronoun("him")] up!")
sleeping = 0
willfully_sleeping = FALSE
diff --git a/html/changelogs/FlamingLily-diversityWin.yml b/html/changelogs/FlamingLily-diversityWin.yml
new file mode 100644
index 00000000000..38d7b486a33
--- /dev/null
+++ b/html/changelogs/FlamingLily-diversityWin.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: FlamingLily
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - bugfix: "Fixed a few inadvertent misgenderings."