From 747e6322be892b86e311711ea8562990bef0af67 Mon Sep 17 00:00:00 2001
From: Arokha Sieyes <arokha@arokha.com>
Date: Thu, 19 May 2016 17:58:21 -0400
Subject: [PATCH] Removes "Teshari Eraser" Feature

Oops. Didn't quite math that one out in my head I guess.
---
 code/modules/mob/holder.dm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index 28a717dbdbc..121b999d21f 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -39,16 +39,16 @@ var/list/holder_mob_icon_cache = list()
 
 /obj/item/weapon/holder/proc/update_state()
 	if(istype(loc,/turf) || !(contents.len))
-		held_mob = null
+		if(held_mob)
+			held_mob.forceMove(loc)
 		drop_items()
 		qdel(src)
 
 /obj/item/weapon/holder/proc/drop_items()
-	if(contents.len > 1)
-		for(var/atom/movable/M in contents)
-			if(M == held_mob)
-				continue
-			M.forceMove(get_turf(src))
+	for(var/atom/movable/M in contents)
+		if(M == held_mob)
+			continue
+		M.forceMove(get_turf(src))
 
 /obj/item/weapon/holder/GetID()
 	for(var/mob/M in contents)