shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4137 from Citadel-Station-13/upstream-merge-33096

Browse Source 
[MIRROR] Fixes latejoining
This commit is contained in:
LetterJay
2017-11-26 05:20:34 -06:00
committed by GitHub
parent d3b3c54e70 1d8de9dc5f
commit 4eb9e28fb4
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
@@ -393,10 +393,8 @@ SUBSYSTEM_DEF(job)
continue continue
S = sloc S = sloc
break break
if(GLOB.jobspawn_overrides[rank]) if(length(GLOB.jobspawn_overrides[rank]))
var/list/special_spawns = GLOB.jobspawn_overrides[rank] S = pick(GLOB.jobspawn_overrides[rank])
if(special_spawns.len)
S = pick(special_spawns)
if(S) if(S)
SendToAtom(H, S, buckle = FALSE) 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 if(!S) //if there isn't a spawnpoint send them to latejoin, if there's no latejoin go yell at your mapper
@@ -540,11 +538,9 @@ SUBSYSTEM_DEF(job)
M.forceMove(get_turf(A)) M.forceMove(get_turf(A))
/datum/controller/subsystem/job/proc/SendToLateJoin(mob/M, buckle = TRUE) /datum/controller/subsystem/job/proc/SendToLateJoin(mob/M, buckle = TRUE)
if(M.mind && M.mind.assigned_role) //We're doing something special today. if(M.mind && M.mind.assigned_role && length(GLOB.jobspawn_overrides[M.mind.assigned_role])) //We're doing something special today.
var/list/special_spawns = GLOB.jobspawn_overrides[M.mind.assigned_role] SendToAtom(M,pick(GLOB.jobspawn_overrides[M.mind.assigned_role]),FALSE)
if(special_spawns.len) //just in case someone clears these return
SendToAtom(M,pick(special_spawns),FALSE)
return
if(latejoin_trackers.len) if(latejoin_trackers.len)
SendToAtom(M, pick(latejoin_trackers), buckle) SendToAtom(M, pick(latejoin_trackers), buckle)