From 10de2370cf4348fe66657d5d56b6073ffe91b1f5 Mon Sep 17 00:00:00 2001
From: skoglol <33292112+kriskog@users.noreply.github.com>
Date: Tue, 10 Dec 2019 08:44:28 +0100
Subject: [PATCH] New disarm intent suicide (#47902)

About The Pull Request

Adds a new disarm intent suicide. Fixes the intent logic, it will now run different suicides for disarm and grab. Added some ghostize that I overlooked last time.

https://streamable.com/ifx25
Why It's Good For The Game

Fixes, silly new content
Changelog

cl Skoglol
fix: All human intent suicides now work properly
add: New disarm intent suicide
/cl
---
 code/modules/client/verbs/suicide.dm          |  18 ++++++++++++++----
 .../mob/living/carbon/human/suicides.dm       |  17 +++++++++++++++++
 sound/effects/cartoon_pop.ogg                 | Bin 0 -> 6452 bytes
 sound/effects/license.txt                     |   3 +++
 tgstation.dme                                 |   1 +
 5 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 code/modules/mob/living/carbon/human/suicides.dm
 create mode 100644 sound/effects/cartoon_pop.ogg

diff --git a/code/modules/client/verbs/suicide.dm b/code/modules/client/verbs/suicide.dm
index 58b11cddfbc..2fbb591e889 100644
--- a/code/modules/client/verbs/suicide.dm
+++ b/code/modules/client/verbs/suicide.dm
@@ -75,20 +75,23 @@
 					adjustOxyLoss(max(200 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
 
 				death(FALSE)
+				ghostize(FALSE)	// Disallows reentering body and disassociates mind
 
 				return
 
 		var/suicide_message
 
 		if(a_intent == INTENT_DISARM)
+			if(prob(25))
+				disarm_suicide()	// Snowflake suicide for a tired joke.
+				return	//above proc handles logging and death
 			suicide_message = pick("[src] is attempting to push [p_their()] own head off [p_their()] shoulders! It looks like [p_theyre()] trying to commit suicide.", \
-								"[src] is pushing [p_their()] thumbs into [p_their()] eye sockets! It looks like [p_theyre()] trying to commit suicide.", \
-								"[src] is ripping [p_their()] own arms off! It looks like [p_theyre()] trying to commit suicide.")//heheh get it?
-		if(a_intent == INTENT_GRAB)
+								"[src] is pushing [p_their()] thumbs into [p_their()] eye sockets! It looks like [p_theyre()] trying to commit suicide.")
+		else if(a_intent == INTENT_GRAB)
 			suicide_message = pick("[src] is attempting to pull [p_their()] own head off! It looks like [p_theyre()] trying to commit suicide.", \
 									"[src] is aggressively grabbing [p_their()] own neck! It looks like [p_theyre()] trying to commit suicide.", \
 									"[src] is pulling [p_their()] eyes out of their sockets! It looks like [p_theyre()] trying to commit suicide.")
-		if(a_intent == INTENT_HELP)
+		else if(a_intent == INTENT_HELP)
 			suicide_message = pick("[src] is hugging [p_them()]self to death! It looks like [p_theyre()] trying to commit suicide.", \
 									"[src] is high-fiving [p_them()]self to death! It looks like [p_theyre()] trying to commit suicide.", \
 									"[src] is getting too high on life! It looks like [p_theyre()] trying to commit suicide.")
@@ -121,6 +124,7 @@
 		suicide_log()
 
 		death(FALSE)
+		ghostize(FALSE)	// Disallows reentering body and disassociates mind
 
 /mob/living/carbon/monkey/verb/suicide()
 	set hidden = 1
@@ -138,6 +142,7 @@
 
 		adjustOxyLoss(max(200- getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
 		death(FALSE)
+		ghostize(FALSE)	// Disallows reentering body and disassociates mind
 
 /mob/living/silicon/ai/verb/suicide()
 	set hidden = 1
@@ -156,6 +161,7 @@
 		//put em at -175
 		adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
 		death(FALSE)
+		ghostize(FALSE)	// Disallows reentering body and disassociates mind
 
 /mob/living/silicon/robot/verb/suicide()
 	set hidden = 1
@@ -174,6 +180,7 @@
 		//put em at -175
 		adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
 		death(FALSE)
+		ghostize(FALSE)	// Disallows reentering body and disassociates mind
 
 /mob/living/silicon/pai/verb/suicide()
 	set hidden = 1
@@ -186,6 +193,7 @@
 		suicide_log()
 
 		death(FALSE)
+		ghostize(FALSE)	// Disallows reentering body and disassociates mind
 	else
 		to_chat(src, "Aborting suicide attempt.")
 
@@ -207,6 +215,7 @@
 		//put em at -175
 		adjustOxyLoss(max(200 - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
 		death(FALSE)
+		ghostize(FALSE)	// Disallows reentering body and disassociates mind
 
 /mob/living/simple_animal/verb/suicide()
 	set hidden = 1
@@ -223,6 +232,7 @@
 		suicide_log()
 
 		death(FALSE)
+		ghostize(FALSE)	// Disallows reentering body and disassociates mind
 
 /mob/living/proc/suicide_log()
 	log_message("committed suicide as [src.type]", LOG_ATTACK)
diff --git a/code/modules/mob/living/carbon/human/suicides.dm b/code/modules/mob/living/carbon/human/suicides.dm
new file mode 100644
index 00000000000..bde239a36d4
--- /dev/null
+++ b/code/modules/mob/living/carbon/human/suicides.dm
@@ -0,0 +1,17 @@
+/mob/living/carbon/human/proc/delayed_suicide()
+	suicide_log()
+	adjustBruteLoss(max(200 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
+	death(FALSE)
+	ghostize(FALSE)	// Disallows reentering body and disassociates mind
+
+/mob/living/carbon/human/proc/disarm_suicide()
+	var/suicide_message = "[src] is ripping [p_their()] own arms off! It looks like [p_theyre()] trying to commit suicide." //heheh get it?
+	visible_message("<span class='danger'>[suicide_message]</span>", "<span class='userdanger'>[suicide_message]</span>")
+
+	var/timer = 15
+	for(var/obj/item/bodypart/thing in bodyparts)
+		if(thing.body_part == ARM_LEFT || thing.body_part == ARM_RIGHT)
+			addtimer(CALLBACK(thing, /obj/item/bodypart/.proc/dismember), timer)
+			addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, src, 'sound/effects/cartoon_pop.ogg', 70), timer)
+			timer += 15
+	addtimer(CALLBACK(src, /mob/living/carbon/human/.proc/delayed_suicide, FALSE), timer-10)
diff --git a/sound/effects/cartoon_pop.ogg b/sound/effects/cartoon_pop.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..aca8c7ade4eae1570522ca0f0dc77c2eeccd2155
GIT binary patch
literal 6452
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

literal 0
HcmV?d00001

diff --git a/sound/effects/license.txt b/sound/effects/license.txt
index c928a9872f3..27133b26697 100644
--- a/sound/effects/license.txt
+++ b/sound/effects/license.txt
@@ -1,2 +1,5 @@
 hit_punch.ogg and hit_kick.ogg are made by Taira Komori
 (https://taira-komori.jpn.org/freesounden.html)
+
+cartoon_pop.ogg by Tobiasz 'unfa' Karoń
+(https://freesound.org/people/unfa/sounds/245645/)
diff --git a/tgstation.dme b/tgstation.dme
index 78c31cd256e..2c6fd487a0b 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2108,6 +2108,7 @@
 #include "code\modules\mob\living\carbon\human\say.dm"
 #include "code\modules\mob\living\carbon\human\species.dm"
 #include "code\modules\mob\living\carbon\human\status_procs.dm"
+#include "code\modules\mob\living\carbon\human\suicides.dm"
 #include "code\modules\mob\living\carbon\human\update_icons.dm"
 #include "code\modules\mob\living\carbon\human\species_types\abductors.dm"
 #include "code\modules\mob\living\carbon\human\species_types\android.dm"