From b6ae6f6567bad64b9c427625573ab8f484cb7476 Mon Sep 17 00:00:00 2001
From: "Marc R. Uchniat" <logan5@feem.net>
Date: Sun, 11 Oct 2015 15:54:03 -0700
Subject: [PATCH 1/4] re-enable tank suicide, but retain body and all objects

---
 code/game/objects/items/weapons/tanks/tanks.dm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index 5e086bc46de..0184efd4811 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -21,8 +21,25 @@
 	var/volume = 70
 
 /obj/item/weapon/tank/suicide_act(mob/user)
+	var/mob/living/carbon/human/H = user
 	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))
+			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))
+		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
+
 	return (BRUTELOSS)
 
 /obj/item/weapon/tank/New()

From 811a4ddd3f7afcc21be124b429ccd7f96e205d1d Mon Sep 17 00:00:00 2001
From: "Marc R. Uchniat" <logan5@feem.net>
Date: Sun, 11 Oct 2015 16:46:13 -0700
Subject: [PATCH 2/4] clean up and simplify, thanks @remierichards

---
 code/game/objects/items/weapons/tanks/tanks.dm | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index 0184efd4811..0a282d9f1dc 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)
 

From d48396f2abe5f35a292a9903168e7f85785e374d Mon Sep 17 00:00:00 2001
From: "Marc R. Uchniat" <logan5@feem.net>
Date: Sun, 11 Oct 2015 16:49:44 -0700
Subject: [PATCH 3/4] place for under spawn

---
 code/game/objects/items/weapons/tanks/tanks.dm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index 0a282d9f1dc..332ea1e1369 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -26,10 +26,10 @@
 	playsound(loc, 'sound/effects/spray.ogg', 10, 1, -3)
 	if (H && !qdeleted(H))
 		spawn(0)
-		for(var/obj/item/W in H)
-			H.unEquip(W)
-			if(prob(50))
-				step(W, pick(alldirs))
+			for(var/obj/item/W in H)
+				H.unEquip(W)
+				if(prob(50))
+					step(W, pick(alldirs))
 		H.hair_style = "Bald"
 		H.update_hair()
 		H.blood_max = 5

From 35d3aae16b38006db91caff0a416d2b7d3d60903 Mon Sep 17 00:00:00 2001
From: "Marc R. Uchniat" <logan5@feem.net>
Date: Mon, 12 Oct 2015 15:00:26 -0700
Subject: [PATCH 4/4] took the spawn back out because @aranclanos said to

---
 code/game/objects/items/weapons/tanks/tanks.dm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index 332ea1e1369..3434d2da31c 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -25,11 +25,10 @@
 	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))
-		spawn(0)
-			for(var/obj/item/W in H)
-				H.unEquip(W)
-				if(prob(50))
-					step(W, pick(alldirs))
+		for(var/obj/item/W in H)
+			H.unEquip(W)
+			if(prob(50))
+				step(W, pick(alldirs))
 		H.hair_style = "Bald"
 		H.update_hair()
 		H.blood_max = 5