From 3900225f53abeda5208ff5957d3c397a8631de9a Mon Sep 17 00:00:00 2001 From: Leshana Date: Wed, 1 Mar 2017 15:53:26 -0500 Subject: [PATCH] Fix custom items appearing in random space turfs * If a custom item can't be equipped to a character's inventory it is dropped on the ground. For late join characters, equip_custom_item() was called before the mob was placed at their starting locations; their coordinates were still 1,1,1. Which is the edge of a map so they get bounced to another z level. * Fix: Equip custom items AFTER job_master.LateSpawn places the mob at the starting location, so it flows in same order as roundstart join characters. --- code/modules/mob/new_player/new_player.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 066fd5b0a4..c052a76d3e 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -335,7 +335,6 @@ var/mob/living/character = create_character() //creates the human and transfers vars and mind character = job_master.EquipRank(character, rank, 1) //equips the human UpdateFactionList(character) - equip_custom_items(character) // AIs don't need a spawnpoint, they must spawn at an empty core if(character.mind.assigned_role == "AI") @@ -357,6 +356,8 @@ //Find our spawning point. var/join_message = job_master.LateSpawn(character, rank) + // Equip our custom items only AFTER deploying to spawn points eh? + equip_custom_items(character) character.lastarea = get_area(loc) // Moving wheelchair if they have one