diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index 0184efd4811f3..0a282d9f1dc8a 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -25,20 +25,16 @@
 	user.visible_message("<span class='suicide'>[user] is putting the [src]'s valve to their lips! I don't think they're gonna stop!</span>")
 	playsound(loc, 'sound/effects/spray.ogg', 10, 1, -3)
 	if (H && !qdeleted(H))
-		for(var/obj/item/W in (H.contents))
+		spawn(0)
+		for(var/obj/item/W in H)
 			H.unEquip(W)
-			if (H.client)
-				H.client.screen -= W
-			if (W)
-				W.loc = H.loc
-				W.dropped(H)
-				if(prob(50))
-					step(W, pick(alldirs))
+			if(prob(50))
+				step(W, pick(alldirs))
 		H.hair_style = "Bald"
 		H.update_hair()
 		H.blood_max = 5
 		gibs(H.loc, H.viruses, H.dna)
-		H.adjustBruteLoss(9001) //to make the body super-bloody
+		H.adjustBruteLoss(1000) //to make the body super-bloody
 
 	return (BRUTELOSS)