diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 8d789763375..ad71a626180 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -316,8 +316,7 @@ job_master.AssignRole(src, rank, 1) var/mob/living/character = create_character() //creates the human and transfers vars and mind - character = job_master.EquipRank(character, rank, 1) //equips the human - EquipCustomItems(character) + // AIs don't need a spawnpoint, they must spawn at an empty core if(character.mind.assigned_role == "AI") @@ -365,6 +364,9 @@ ticker.mode.latespawn(character) + character = job_master.EquipRank(character, rank, 1) //equips the human + EquipCustomItems(character) + if(character.mind.assigned_role == "Cyborg") AnnounceCyborg(character, rank, join_message) callHook("latespawn", list(character))