From 016536f7c4a3ccf5e3c574d5ef2496edece9dc76 Mon Sep 17 00:00:00 2001
From: Leshana <Leshana@users.noreply.github.com>
Date: Sun, 18 Mar 2018 20:12:47 -0400
Subject: [PATCH] POLARIS: Fix holders to avoid forcemoving held mob to
 nullspace

---
 code/modules/mob/holder.dm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index d09a95af08b..2f3a6d8a63f 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -39,10 +39,13 @@ var/list/holder_mob_icon_cache = list()
 		update_state()
 
 /obj/item/weapon/holder/proc/update_state()
-	if(istype(loc,/turf) || !(contents.len))
+	if(!(contents.len))
+		qdel(src)
+	else if(isturf(loc))
+		drop_items()
 		if(held_mob)
 			held_mob.forceMove(loc)
-		drop_items()
+			held_mob = null
 		qdel(src)
 
 /obj/item/weapon/holder/proc/drop_items()