From e7f8cca24a2a666f8ba81ae365e86b4d425a84dd Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Sun, 3 Mar 2019 11:06:31 -0500 Subject: [PATCH] The World Can Burn For All I Care --- code/game/objects/items/stacks/stack.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index e10ac54fda1..5cab26e062b 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -305,8 +305,9 @@ var/mob/living/silicon/robot/R = loc if(locate(src) in R.module.modules) R.module.modules -= src - if(usr) - usr.unEquip(src, TRUE) + if(ismob(loc)) + var/mob/living/L = loc // At this stage, stack code is so horrible and atrocious, I wouldn't be all surprised ghosts can somehow have stacks. If this happens, then the world deserves to burn. + L.unEquip(src, TRUE) qdel(src) return TRUE return FALSE