Merge pull request #15245 from Heroman3003/sort-adjust

Adjusts sorting of humanmobs slightly
This commit is contained in:
Heroman3003
2023-08-14 04:14:03 +10:00
committed by GitHub
6 changed files with 34 additions and 1 deletions
+6 -1
View File
@@ -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)
+1
View File
@@ -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)
@@ -5,6 +5,8 @@
a_intent = I_HURT
low_sorting_priority = TRUE
var/generate_species = SPECIES_HUMAN
var/generate_dead = FALSE
@@ -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
@@ -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)
@@ -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")