From 34cdff0690bdf715c91546dc1c1bd39d34fd2a98 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Wed, 18 Jul 2018 18:18:38 -0300 Subject: [PATCH] Fix a custom item bug (#5008) Turns out if the game can't equip or put the custom item into an inventory, it will just throw the item into space due to the order of where the equip_custom_items is, this should fix this problem. --- code/modules/mob/abstract/new_player/new_player.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/abstract/new_player/new_player.dm b/code/modules/mob/abstract/new_player/new_player.dm index c046df081cf..4b826baf882 100644 --- a/code/modules/mob/abstract/new_player/new_player.dm +++ b/code/modules/mob/abstract/new_player/new_player.dm @@ -305,8 +305,6 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player) 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") @@ -328,6 +326,8 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player) //Find our spawning point. var/join_message = SSjobs.LateSpawn(character, rank) + equip_custom_items(character) + character.lastarea = get_area(loc) // Moving wheelchair if they have one if(character.buckled && istype(character.buckled, /obj/structure/bed/chair/wheelchair))