From fdf98860539b40a15e5fc6b6dab4db046968eea4 Mon Sep 17 00:00:00 2001 From: Ravensdale Date: Thu, 15 Jan 2015 14:48:04 -0800 Subject: [PATCH] Fixes Cannot execute null.on removed() --- code/modules/mob/living/carbon/human/inventory.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 545fa41c03..0a504ca148 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -640,9 +640,10 @@ It can still be worn/put on as normal. W.hold.close(usr) usr.put_in_hands(tie) suit.hastie = null*/ - suit.hastie.on_removed(usr) - suit.hastie = null - target.update_inv_w_uniform() + if(suit && suit.hastie) + suit.hastie.on_removed(usr) + suit.hastie = null + target.update_inv_w_uniform() if("id") slot_to_process = slot_wear_id if (target.wear_id)