cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 07:08:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes latejoins (#33096)

Browse Source 
length() is 0 on null lists.

Update job.dm
This commit is contained in:
kevinz000
2017-11-26 12:11:21 +01:00
committed by AnturK
parent c2e9002a76
commit 02abdb7ba0
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/job.dm
+5 -9
View File
@@ -381,10 +381,8 @@ SUBSYSTEM_DEF(job)
continue
S = sloc
break
if(GLOB.jobspawn_overrides[rank])
var/list/special_spawns = GLOB.jobspawn_overrides[rank]
if(special_spawns.len)
S = pick(special_spawns)
if(length(GLOB.jobspawn_overrides[rank]))
S = pick(GLOB.jobspawn_overrides[rank])
if(S)
SendToAtom(H, S, buckle = FALSE)
if(!S) //if there isn't a spawnpoint send them to latejoin, if there's no latejoin go yell at your mapper
@@ -528,11 +526,9 @@ SUBSYSTEM_DEF(job)
M.forceMove(get_turf(A))
/datum/controller/subsystem/job/proc/SendToLateJoin(mob/M, buckle = TRUE)
if(M.mind && M.mind.assigned_role) //We're doing something special today.
var/list/special_spawns = GLOB.jobspawn_overrides[M.mind.assigned_role]
if(special_spawns.len) //just in case someone clears these
SendToAtom(M,pick(special_spawns),FALSE)
return
if(M.mind && M.mind.assigned_role && length(GLOB.jobspawn_overrides[M.mind.assigned_role])) //We're doing something special today.
SendToAtom(M,pick(GLOB.jobspawn_overrides[M.mind.assigned_role]),FALSE)
return
if(latejoin_trackers.len)
SendToAtom(M, pick(latejoin_trackers), buckle)