Merge branch 'master' into various-fixes

code/controllers/subsystem/job.dm

@@ -391,6 +391,7 @@ SUBSYSTEM_DEF(job)
 	var/datum/job/job = GetJob(rank)
 
 	H.job = rank
+	equip_loadout(N, H)
 
 	//If we joined at roundstart we should be positioned at our workstation
 	if(!joined_late)
@@ -463,6 +464,10 @@ SUBSYSTEM_DEF(job)
 		if(H.mind)
 			H.mind.memory += "Your account ID is [wageslave.account_id].<BR>"
 
+	if(job && H)
+		job.after_spawn(H, M, joined_late) // note: this happens before the mob has a key! M will always have a client, H might not.
+		equip_loadout(N, H, TRUE)//CIT CHANGE - makes players spawn with in-backpack loadout items properly. A little hacky but it works
+
 	return H