diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 363fe91a96a..cf2f443dcff 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -4,6 +4,7 @@ var/global/datum/controller/occupations/job_master var //List of all jobs list/occupations = list() + list/occupations2 = list() //Players who need jobs list/unassigned = list() //Debug info @@ -159,7 +160,7 @@ var/global/datum/controller/occupations/job_master if(unassigned.len == 0) return 0 //Shuffle players and jobs unassigned = shuffle(unassigned) - occupations = shuffle(occupations) + occupations2 = shuffle(occupations) //Assistants are checked first Debug("DO, Running Assistant Check 1") @@ -185,7 +186,7 @@ var/global/datum/controller/occupations/job_master //Other jobs are now checked Debug("DO, Running Standard Check") for(var/level = 1 to 3) - for(var/datum/job/job in occupations) + for(var/datum/job/job in occupations2) Debug("Checking job: [job]") if(!job) continue if(!unassigned.len) break diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 5c505b5fcd4..5d4bf4d1cbb 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -24,6 +24,9 @@ if(!loc) // Fixing a null error that occurs when the mob isn't found in the world -- TLE return + if(stat == 2) + return + life_tick++ var/datum/gas_mixture/environment = loc.return_air() diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index dc23896f9eb..79c722f023f 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -216,8 +216,9 @@ var/global/list/uneatable = list( step_towards(X,src) else if(istype(X,/mob/living/carbon/human)) var/mob/living/carbon/human/H = X - H << "\red The singularity has you in it's gravitational pull! It's hard to break free!" - H.grav_delay = 20 //No running this time! + if(prob(25)) + H << "\red The singularity has you in it's gravitational pull! It's hard to break free!" + H.grav_delay = 15 //No running this time! if(istype(H.shoes,/obj/item/clothing/shoes/magboots) && !(src.current_size >= 9)) var/obj/item/clothing/shoes/magboots/M = H.shoes if(M.magpulse)