[MIRROR] Assorted bug fixes

code/game/machinery/computer/message.dm

@@ -303,14 +303,16 @@
 	name = "Monitor Decryption Key"
 	var/obj/machinery/message_server/server = null
 
-/obj/item/paper/monitorkey/New()
+/obj/item/paper/monitorkey/Initialize()
 	..()
-	spawn(10)
-		if(message_servers)
-			for(var/obj/machinery/message_server/server in message_servers)
-				if(!isnull(server))
-					if(!isnull(server.decryptkey))
-						info = "<center><h2>Daily Key Reset</h2></center><br>The new message monitor key is '[server.decryptkey]'.<br>This key is only intended for personnel granted access to the messaging server. Keep it safe.<br>If necessary, change the password to a more secure one."
-						info_links = info
-						icon_state = "paper_words"
-						break
+	return INITIALIZE_HINT_LATELOAD
+
+/obj/item/paper/monitorkey/LateInitialize(mapload)
+	if(message_servers)
+		for(var/obj/machinery/message_server/server in message_servers)
+			if(!isnull(server))
+				if(!isnull(server.decryptkey))
+					info = "<center><h2>Daily Key Reset</h2></center><br>The new message monitor key is '[server.decryptkey]'.<br>This key is only intended for personnel granted access to the messaging server. Keep it safe.<br>If necessary, change the password to a more secure one."
+					info_links = info
+					icon_state = "paper_words"
+					break

code/game/objects/items/weapons/cards_ids.dm

@@ -301,12 +301,7 @@ var/global/const/NO_EMAG_ACT = -50
 				id_card.formal_name_suffix = "[id_card.formal_name_suffix][culture.get_formal_name_suffix()]"
 
 	id_card.registered_name = real_name
-
-	var/pronouns = "Unset"
-	var/datum/pronouns/P = choose_from_pronouns()
-	if(P)
-		pronouns = P.formal_term
-	id_card.sex = pronouns
+	id_card.sex = get_formal_pronouns()
 	id_card.set_id_photo(src)
 
 	if(dna)

code/modules/mob/mob.dm

@@ -650,6 +650,13 @@
 	return P
 
 
+/mob/proc/get_formal_pronouns()
+	var/datum/pronouns/P = GLOB.pronouns_from_gender[gender]
+	if (pronouns)
+		P = GLOB.pronouns.by_key[pronouns]
+	return P.formal_term
+
+
 /mob/proc/see(message)
 	if(!is_active())
 		return 0

code/modules/modular_computers/file_system/reports/crew_record.dm

@@ -49,12 +49,7 @@ GLOBAL_VAR_INIT(arrest_security_status, "Arrest")
 	set_name(H ? H.real_name : "Unset")
 	set_formal_name(formal_name)
 	set_job(H ? GetAssignment(H) : "Unset")
-	var/pronouns = "Unset"
-	if(H)
-		var/datum/pronouns/P = H.choose_from_pronouns()
-		if(P)
-			pronouns = P.formal_term
-	set_sex(pronouns)
+	set_sex(H ? H.get_formal_pronouns() : "Unset")
 	set_age(H ? H.age : 30)
 	set_status(GLOB.default_physical_status)
 	set_species(H ? H.get_species() : SPECIES_HUMAN)

code/modules/species/station/nabber.dm

@@ -287,11 +287,7 @@
 
 			var/image/threat_image = skin_overlays[image_key]
 			if(!threat_image)
-				var/icon/base_icon = icon(H.stand_icon)
-				var/icon/I = new('icons/mob/human_races/species/nabber/threat.dmi', "threat")
-				base_icon.Blend(COLOR_BLACK, ICON_MULTIPLY)
-				base_icon.Blend(I, ICON_ADD)
-				threat_image  = image(base_icon)
+				threat_image = image('icons/mob/human_races/species/nabber/threat.dmi', "threat")
 				skin_overlays[image_key] = threat_image
 
 			return(threat_image)

test/check-paths.sh

@@ -48,7 +48,7 @@ exactly 24 "text2path uses" 'text2path'
 exactly 4 "update_icon() override" '/update_icon\((.*)\)'  -P
 exactly 4 "goto use" 'goto '
 exactly 1 "NOOP match" 'NOOP'
-exactly 339 "spawn uses" '^\s*spawn\s*\(\s*(-\s*)?\d*\s*\)' -P
+exactly 338 "spawn uses" '^\s*spawn\s*\(\s*(-\s*)?\d*\s*\)' -P
 exactly 0 "tag uses" '\stag = ' -P '**/*.dmm'
 exactly 0 "anchored = 0/1" 'anchored\s*=\s*\d' -P
 exactly 2 "density = 0/1" 'density\s*=\s*\d' -P