More fixes.

code/modules/DetectiveWork/scanner.dm

@@ -84,7 +84,7 @@
 
 		//General
 		if ((!A.fingerprints || !A.fingerprints.len) && !A.suit_fibers && !A.blood_DNA)
-			user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.get_gender_form("it")] humming[prob(70) ? " gently." : "."]" ,\
+			user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.get_visible_gender() == MALE ? "him" : H.get_visible_gender() == FEMALE ? "her" : "them"] humming[prob(70) ? " gently." : "."]" ,\
 			"\blue Unable to locate any fingerprints, materials, fibers, or blood on [A]!",\
 			"You hear a faint hum of electrical equipment.")
 			return 0
@@ -123,12 +123,12 @@
 				for(var/blood in A.blood_DNA)
 					user << "Blood type: \red [A.blood_DNA[blood]] \t \black DNA: \red [blood]"
 		if(prob(80) || !A.fingerprints)
-			user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.get_gender_form("it")] humming[prob(70) ? " gently." : "."]" ,\
+			user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.get_visible_gender() == MALE ? "him" : H.get_visible_gender() == FEMALE ? "her" : "them"] humming[prob(70) ? " gently." : "."]" ,\
 			"You finish scanning \the [A].",\
 			"You hear a faint hum of electrical equipment.")
 			return 0
 		else
-			user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.get_gender_form("it")] humming[prob(70) ? " gently." : "."]\n[user.get_gender_form("It")] seems to perk up slightly at the readout." ,\
+			user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.get_visible_gender() == MALE ? "him" : H.get_visible_gender() == FEMALE ? "her" : "them"] humming[prob(70) ? " gently." : "."]\n[user.get_visible_gender() == MALE ? "He" : H.get_visible_gender() == FEMALE ? "She" : "They"] seems to perk up slightly at the readout." ,\
 			"The results of the scan pique your interest.",\
 			"You hear a faint hum of electrical equipment, and someone making a thoughtful noise.")
 			return 0

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

@@ -204,7 +204,7 @@
 		if(src == M && istype(src, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = M
 			var/list/damaged = H.get_damaged_organs(1,1)
-			visible_message("\blue [src] examines [get_gender_form("itself")].", \
+			visible_message("\blue [src] examines [get_visible_gender() == MALE ? "himself" : get_visible_gender() == FEMALE ? "herself" : "themselves"].", \
 				"\blue You check yourself for injuries.", \
 				"You hear a rustle, as someone checks about their person.")
 

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

@@ -27,19 +27,37 @@
 		skipears = src.head.flags_inv & HIDEEARS
 
 	// crappy hacks because you can't do \his[src] etc. I'm sorry this proc is so unreadable, blame the text macros :<
-	var/list/proper_forms = get_visible_gender()
-	var/t_He = proper_forms["It"] //capitalised for use at the start of each line.
-	var/t_his = proper_forms["its"]
-	var/t_him = proper_forms["it"]
-	var/t_has = proper_forms["has"]
-	var/t_is = proper_forms["is"]
+	var/t_He = "It" //capitalised for use at the start of each line.
+	var/t_his = "its"
+	var/t_him = "it"
+	var/t_has = "has"
+	var/t_is = "is"
+
+	var/msg = "<span class='info'>*---------*\nThis is "
+	if(src.icon)
+		msg += "\icon[src.icon] " //fucking BYOND: this should stop dreamseeker crashing if we -somehow- examine somebody before their icon is generated
+	else
+		switch(get_visible_gender())
+			if(MALE)
+				t_He = "He"
+				t_his = "his"
+				t_him = "him"
+			if(FEMALE)
+				t_He = "She"
+				t_his = "her"
+				t_him = "her"
+			if(NEUTER)
+				t_He = "They"
+				t_his = "their"
+				t_him = "them"
+				t_has = "have"
+				t_is = "are"
 
 	if(mutantrace == "lizard")
 		examine_text = "one of those lizard-like Soghuns"
 	if(mutantrace == "skrell")
 		examine_text = "one of those gelatinous Skrells"
 
-	var/msg = "<span class='info'>*---------*\nThis is "
 	if(icon)
 		msg += "\icon[icon] " //fucking BYOND: this should stop dreamseeker crashing if we -somehow- examine somebody before their icon is generated
 

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

@@ -2782,12 +2782,6 @@ It can still be worn/put on as normal.
 		src.tkdisable = 0
 
 /mob/living/carbon/human/get_visible_gender()
-	var/skip_gender = (wear_suit && wear_suit.flags_inv & HIDEJUMPSUIT && ((head && head.flags_inv & HIDEMASK) || wear_mask))
-
-	if( !skip_gender ) //big suits/masks make it hard to tell their gender
-		switch(gender)
-			if(MALE)
-				return list("It" = "He", "its" = "his", "it" = "he", "has" = "has", "is" = "is", "itself" = "himself")
-			if(FEMALE)
-				return list("It" = "She", "its" = "her", "it" = "she", "has" = "has", "is" = "is", "itself" = "herself")
-	return list("It" = "They", "its" = "their", "it" = "them", "has" = "have", "is" = "are", "itself" = "themselves")
+	if(wear_suit && wear_suit.flags_inv & HIDEJUMPSUIT && ((head && head.flags_inv & HIDEMASK) || wear_mask))
+		return NEUTER
+	return gender

code/modules/mob/mob.dm

@@ -1115,11 +1115,4 @@ note dizziness decrements automatically in the mob's Life() proc.
 	..()
 
 /mob/proc/get_visible_gender()
-	//Returns the proper words to use based on the mob's visible gender.  Used in text creation.
-	return list("It" = "It", "its" = "its", "it" = "it", "has" = "has", "is" = "is", "itself" = "itself")
-
-/mob/proc/get_gender_form(var/form)
-	if(!istext(form))
-		return
-	var/list/proper_forms = get_visible_gender()
-	return proper_forms[form]
+	return gender