diff --git a/code/__HELPERS/pronouns.dm b/code/__HELPERS/pronouns.dm
index 697d541f32c..607ba3495d3 100644
--- a/code/__HELPERS/pronouns.dm
+++ b/code/__HELPERS/pronouns.dm
@@ -192,57 +192,33 @@
 
 //humans need special handling, because they can have their gender hidden
 /mob/living/carbon/human/p_they(capitalized, temp_gender)
-	var/list/obscured = check_obscured_slots()
-	var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE))
-	if((slot_w_uniform in obscured) && skipface)
-		temp_gender = PLURAL
+	temp_gender = get_visible_gender()
 	return ..()
 
 /mob/living/carbon/human/p_their(capitalized, temp_gender)
-	var/list/obscured = check_obscured_slots()
-	var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE))
-	if((slot_w_uniform in obscured) && skipface)
-		temp_gender = PLURAL
+	temp_gender = get_visible_gender()
 	return ..()
 
 /mob/living/carbon/human/p_them(capitalized, temp_gender)
-	var/list/obscured = check_obscured_slots()
-	var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE))
-	if((slot_w_uniform in obscured) && skipface)
-		temp_gender = PLURAL
+	temp_gender = get_visible_gender()
 	return ..()
 
 /mob/living/carbon/human/p_have(temp_gender)
-	var/list/obscured = check_obscured_slots()
-	var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE))
-	if((slot_w_uniform in obscured) && skipface)
-		temp_gender = PLURAL
+	temp_gender = get_visible_gender()
 	return ..()
 
 /mob/living/carbon/human/p_are(temp_gender)
-	var/list/obscured = check_obscured_slots()
-	var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE))
-	if((slot_w_uniform in obscured) && skipface)
-		temp_gender = PLURAL
+	temp_gender = get_visible_gender()
 	return ..()
 
 /mob/living/carbon/human/p_were(temp_gender)
-	var/list/obscured = check_obscured_slots()
-	var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE))
-	if((slot_w_uniform in obscured) && skipface)
-		temp_gender = PLURAL
+	temp_gender = get_visible_gender()
 	return ..()
 
 /mob/living/carbon/human/p_do(temp_gender)
-	var/list/obscured = check_obscured_slots()
-	var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE))
-	if((slot_w_uniform in obscured) && skipface)
-		temp_gender = PLURAL
+	temp_gender = get_visible_gender()
 	return ..()
 
 /mob/living/carbon/human/p_s(temp_gender)
-	var/list/obscured = check_obscured_slots()
-	var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE))
-	if((slot_w_uniform in obscured) && skipface)
-		temp_gender = PLURAL
+	temp_gender = get_visible_gender()
 	return ..()
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 1da73d02c23..d23c5e7ee93 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1114,8 +1114,10 @@
 	return 1
 
 /mob/living/carbon/human/proc/get_visible_gender()
-	if(wear_suit && wear_suit.flags_inv & HIDEJUMPSUIT && ((head && head.flags_inv & HIDEMASK) || wear_mask))
-		return NEUTER
+	var/list/obscured = check_obscured_slots()
+	var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE))
+	if((slot_w_uniform in obscured) && skipface)
+		return PLURAL
 	return gender
 
 /mob/living/carbon/human/proc/increase_germ_level(n)