From ba3ada19fad91fcaf0152af329d196bcf92bd10b Mon Sep 17 00:00:00 2001
From: Heroman <alesha3000@list.ru>
Date: Sun, 13 Aug 2023 15:35:29 +1000
Subject: [PATCH] Adjusts sorting of humanmobs slightly

---
 code/_helpers/unsorted.dm                            |  7 ++++++-
 code/modules/mob/dead/corpse.dm                      |  1 +
 .../carbon/human/ai_controlled/ai_controlled.dm      |  2 ++
 .../mob/living/carbon/human/human_defines_vr.dm      |  1 +
 .../modules/mob/living/carbon/human/human_species.dm | 12 ++++++++++++
 .../living/carbon/human/species/station/monkey_vr.dm | 12 ++++++++++++
 6 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm
index a8dce670f54..6f06e3ca7d6 100644
--- a/code/_helpers/unsorted.dm
+++ b/code/_helpers/unsorted.dm
@@ -442,8 +442,13 @@ Turf and target are seperate in case you want to teleport some distance from a t
 		moblist.Add(M)
 	for(var/mob/living/silicon/robot/M in sortmob)
 		moblist.Add(M)
+	var/list/delaylist = list()
 	for(var/mob/living/carbon/human/M in sortmob)
-		moblist.Add(M)
+		if(M.low_sorting_priority && !M.client)
+			delaylist.Add(M)
+		else
+			moblist.Add(M)
+	moblist.Add(delaylist)
 	for(var/mob/living/carbon/brain/M in sortmob)
 		moblist.Add(M)
 	for(var/mob/living/carbon/alien/M in sortmob)
diff --git a/code/modules/mob/dead/corpse.dm b/code/modules/mob/dead/corpse.dm
index 2b06b23dd2a..2e70945e1e7 100644
--- a/code/modules/mob/dead/corpse.dm
+++ b/code/modules/mob/dead/corpse.dm
@@ -40,6 +40,7 @@
 
 /obj/effect/landmark/mobcorpse/proc/createCorpse() //Creates a mob and checks for gear in each slot before attempting to equip it.
 	var/mob/living/carbon/human/M = new /mob/living/carbon/human (src.loc)
+	M.low_sorting_priority = TRUE
 	if(random_species)
 		var/random_pick = pick(random_species_list)
 		M.set_species(random_pick)
diff --git a/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm b/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm
index 1f15f6a07a8..a028c12e72e 100644
--- a/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm
+++ b/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm
@@ -5,6 +5,8 @@
 
 	a_intent = I_HURT
 
+	low_sorting_priority = TRUE
+
 	var/generate_species = SPECIES_HUMAN
 	var/generate_dead = FALSE
 
diff --git a/code/modules/mob/living/carbon/human/human_defines_vr.dm b/code/modules/mob/living/carbon/human/human_defines_vr.dm
index 1bd8e2f3922..73a0118a0dc 100644
--- a/code/modules/mob/living/carbon/human/human_defines_vr.dm
+++ b/code/modules/mob/living/carbon/human/human_defines_vr.dm
@@ -9,6 +9,7 @@
 	var/wings_hidden = FALSE
 	var/tail_hidden = FALSE
 	var/markings_len = 0 //mostly an arbitrary number
+	var/low_sorting_priority = FALSE
 
 /mob/living/carbon/human/proc/shadekin_get_energy()
 	var/datum/species/shadekin/SK = species
diff --git a/code/modules/mob/living/carbon/human/human_species.dm b/code/modules/mob/living/carbon/human/human_species.dm
index 7350d093e4d..ea2d2981d70 100644
--- a/code/modules/mob/living/carbon/human/human_species.dm
+++ b/code/modules/mob/living/carbon/human/human_species.dm
@@ -119,14 +119,26 @@
 /mob/living/carbon/human/zaddat/Initialize(var/new_loc)
 	return ..(new_loc, SPECIES_ZADDAT)
 
+/mob/living/carbon/human/monkey
+	low_sorting_priority = TRUE
+
 /mob/living/carbon/human/monkey/Initialize(var/new_loc)
 	return ..(new_loc, SPECIES_MONKEY)
 
+/mob/living/carbon/human/farwa
+	low_sorting_priority = TRUE
+
 /mob/living/carbon/human/farwa/Initialize(var/new_loc)
 	return ..(new_loc, SPECIES_MONKEY_TAJ)
 
+/mob/living/carbon/human/neaera
+	low_sorting_priority = TRUE
+
 /mob/living/carbon/human/neaera/Initialize(var/new_loc)
 	return ..(new_loc, SPECIES_MONKEY_SKRELL)
 
+/mob/living/carbon/human/stok
+	low_sorting_priority = TRUE
+
 /mob/living/carbon/human/stok/Initialize(var/new_loc)
 	return ..(new_loc, SPECIES_MONKEY_UNATHI)
diff --git a/code/modules/mob/living/carbon/human/species/station/monkey_vr.dm b/code/modules/mob/living/carbon/human/species/station/monkey_vr.dm
index f8a783b162a..1b82f781014 100644
--- a/code/modules/mob/living/carbon/human/species/station/monkey_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/station/monkey_vr.dm
@@ -56,14 +56,26 @@
 //INSERT CODE HERE SO MONKEYS CAN BE SPAWNED.
 //Also, M was added to the end of the spawn names to signify that it's a monkey, since some names were conflicting.
 
+/mob/living/carbon/human/sharkm
+	low_sorting_priority = TRUE
+
 /mob/living/carbon/human/sharkm/New(var/new_loc)
 	..(new_loc, "Sobaka")
 
+/mob/living/carbon/human/sergallingm
+	low_sorting_priority = TRUE
+
 /mob/living/carbon/human/sergallingm/New(var/new_loc)
 	..(new_loc, "Saru")
 
+/mob/living/carbon/human/sparram
+	low_sorting_priority = TRUE
+
 /mob/living/carbon/human/sparram/New(var/new_loc)
 	..(new_loc, "Sparra")
 
+/mob/living/carbon/human/wolpin
+	low_sorting_priority = TRUE
+
 /mob/living/carbon/human/wolpin/New(var/new_loc)
 	..(new_loc, "Wolpin")
\ No newline at end of file