From 176a45b2806e4cfa59e1449971ed8ccb953cd93f Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 11 Nov 2020 03:51:01 +0100 Subject: [PATCH] [MIRROR] Fixes mob_holders not going into storage (#1669) * Fixes mob_holders not going into storage (#54837) #53305 made it so clothing objects without an icon_state on initialize were given ABSTRACT flags. unfortunately for mob_holder objs, they gained their icon after that step of initialization. this PR just moves the parent call to after the icon_state is updated, preventing them from incorrectly gaining the abstract flag. Fixes #53872 * Fixes mob_holders not going into storage Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> --- code/modules/mob/living/inhand_holder.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/inhand_holder.dm b/code/modules/mob/living/inhand_holder.dm index 9162e929784..5cc139549df 100644 --- a/code/modules/mob/living/inhand_holder.dm +++ b/code/modules/mob/living/inhand_holder.dm @@ -10,7 +10,6 @@ var/destroying = FALSE /obj/item/clothing/head/mob_holder/Initialize(mapload, mob/living/M, worn_state, head_icon, lh_icon, rh_icon, worn_slot_flags = NONE) - . = ..() if(head_icon) worn_icon = head_icon if(worn_state) @@ -22,6 +21,7 @@ if(worn_slot_flags) slot_flags = worn_slot_flags deposit(M) + . = ..() /obj/item/clothing/head/mob_holder/Destroy() destroying = TRUE