Merge branch 'master' into dullahan-2-electric-boogaloo
This commit is contained in:
@@ -468,12 +468,14 @@
|
||||
SSjob.AssignRole(src, rank, 1)
|
||||
|
||||
var/mob/living/character = create_character(TRUE) //creates the human and transfers vars and mind
|
||||
var/datum/job/job = SSjob.GetJob(rank)
|
||||
|
||||
var/equip = SSjob.EquipRank(character, rank, TRUE)
|
||||
job.after_latejoin_spawn(character)
|
||||
|
||||
if(isliving(equip)) //Borgs get borged in the equip, so we need to make sure we handle the new mob.
|
||||
character = equip
|
||||
|
||||
var/datum/job/job = SSjob.GetJob(rank)
|
||||
|
||||
if(job && !job.override_latejoin_spawn(character))
|
||||
SSjob.SendToLateJoin(character)
|
||||
if(!arrivals_docked)
|
||||
|
||||
Reference in New Issue
Block a user