Fixes pronoun issues. (#9780)

code/modules/client/preference_setup/general/01_basic.dm

@@ -199,7 +199,7 @@
 
 		var/datum/category_item/player_setup_item/general/equipment/equipment_item = category.items[4]
 		equipment_item.sanitize_character()	// sanitize equipment
-		return TOPIC_UPDATE_PREVIEW
+		return TOPIC_REFRESH_UPDATE_PREVIEW
 
 	else if(href_list["age"])
 		var/new_age = input(user, "Choose your character's age:\n([pref.getMinAge()]-[pref.getMaxAge()])", "Character Preference", pref.age) as num|null

code/modules/emotes/emote_define.dm

@@ -52,7 +52,7 @@
 			use_1p = get_emote_message_1p(user, target, extra_params)
 			use_1p = replacetext(use_1p, "TARGET_THEM", target.get_pronoun("him"))
 			use_1p = replacetext(use_1p, "TARGET_THEIR", target.get_pronoun("his"))
-			use_1p = replacetext(use_1p, "TARGET_SELF", target.get_pronoun("self"))
+			use_1p = replacetext(use_1p, "TARGET_SELF", target.get_pronoun("himself"))
 			use_1p = replacetext(use_1p, "TARGET", "<b>\the [target]</b>")
 		else
 			use_1p = get_emote_message_1p(user, null, extra_params)
@@ -63,13 +63,13 @@
 			use_3p = get_emote_message_3p(user, target, extra_params)
 			use_3p = replacetext(use_3p, "TARGET_THEM", target.get_pronoun("him"))
 			use_3p = replacetext(use_3p, "TARGET_THEIR", target.get_pronoun("his"))
-			use_3p = replacetext(use_3p, "TARGET_SELF", target.get_pronoun("self"))
+			use_3p = replacetext(use_3p, "TARGET_SELF", target.get_pronoun("himself"))
 			use_3p = replacetext(use_3p, "TARGET", "<b>\the [target]</b>")
 		else
 			use_3p = get_emote_message_3p(user, null, extra_params)
 		use_3p = replacetext(use_3p, "USER_THEM", user.get_pronoun("him"))
 		use_3p = replacetext(use_3p, "USER_THEIR", user.get_pronoun("his"))
-		use_3p = replacetext(use_3p, "USER_SELF", user.get_pronoun("self"))
+		use_3p = replacetext(use_3p, "USER_SELF", user.get_pronoun("himself"))
 		use_3p = replacetext(use_3p, "USER", "<b>\the [user]</b>")
 		use_3p = capitalize(use_3p)
 

code/modules/mob/gender.dm

@@ -19,7 +19,7 @@ var/list/datum/gender/gender_datums = list()
 	var/has  = "have"
 	var/is   = "are"
 	var/does = "do"
-	var/self = "themselves"
+	var/himself = "themselves"
 	var/end = ""
 
 /datum/gender/male
@@ -35,7 +35,7 @@ var/list/datum/gender/gender_datums = list()
 	has  = "has"
 	is   = "is"
 	does = "does"
-	self = "himself"
+	himself = "himself"
 	end = "s"
 
 /datum/gender/female
@@ -51,7 +51,7 @@ var/list/datum/gender/gender_datums = list()
 	has  = "has"
 	is   = "is"
 	does = "does"
-	self = "herself"
+	himself = "herself"
 	end = "s"
 
 /datum/gender/neuter
@@ -67,13 +67,12 @@ var/list/datum/gender/gender_datums = list()
 	has  = "has"
 	is   = "is"
 	does = "does"
-	self = "itself"
+	himself = "itself"
 	end = "s"
 
 /atom/proc/get_gender() // This is on /atom/ for compatibility reasons, e.g. for emotes to not have to typecheck.
 	return gender
 
-/atom/proc/get_pronoun(var/type)
+/atom/proc/get_pronoun(var/wordtype)
 	var/gender_to_use = get_gender()
-	if (type in gender_datums[gender_to_use])
-		return gender_datums[gender_to_use][type]
+	return gender_datums[gender_to_use][wordtype]

code/modules/mob/living/carbon/human/human.dm

@@ -1222,7 +1222,7 @@
 	var/skipitems = get_covered_clothes()
 	var/skipbody = get_covered_body_parts()
 	. = ..()
-	if((skipbody & FACE || (skipitems & (HIDEMASK|HIDEFACE))) && (skipbody & (UPPER_TORSO | LOWER_TORSO) || (skipitems & HIDEJUMPSUIT))) //big suits/masks/helmets make it hard to tell their gender
+	if((skipbody & FACE || (skipitems & (HIDEMASK|HIDEFACE))) && ((skipbody & UPPER_TORSO && skipbody & LOWER_TORSO) || (skipitems & HIDEJUMPSUIT))) //big suits/masks/helmets make it hard to tell their gender
 		. = PLURAL
 
 /mob/living/carbon/human/proc/increase_germ_level(n)

html/changelogs/MDP-gender-ii-2-still-genderin.yml

@@ -0,0 +1,43 @@
+################################
+# 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: MoondancerPony
+
+# 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: "Fixes gender not updating correctly on change."
+  - bugfix: "Fixes pronouns not showing up."
+  - bugfix: "Makes it so exposing either your chest or lower body un-conceals pronouns, as opposed to needing both."