From c6e2a4bf26e706974cb5cfe458fa05801ca160e1 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed, 7 Apr 2021 02:13:51 +0200
Subject: [PATCH] [MIRROR] Fixes multiple issues related to suicides (#4710)

* Fixes multiple issues related to suicides (#58178)

* Fixes multiple issues related to suicides

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
---
 code/modules/assembly/signaler.dm    | 2 +-
 code/modules/client/verbs/suicide.dm | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index 2eca104f199..1a2a9243b84 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -39,9 +39,9 @@
 		user.visible_message("<span class='suicide'>[user]'s [src] receives a signal, killing [user.p_them()] instantly!</span>")
 	else
 		user.visible_message("<span class='suicide'>[user]'s [src] receives a signal and [user.p_they()] die[user.p_s()] like a gamer!</span>")
+	user.set_suicide(TRUE)
 	user.adjustOxyLoss(200)//it sends an electrical pulse to their heart, killing them. or something.
 	user.death(0)
-	user.set_suicide(TRUE)
 	user.suicide_log()
 	playsound(user, 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE)
 	qdel(src)
diff --git a/code/modules/client/verbs/suicide.dm b/code/modules/client/verbs/suicide.dm
index 7d9c86104a6..122b4291719 100644
--- a/code/modules/client/verbs/suicide.dm
+++ b/code/modules/client/verbs/suicide.dm
@@ -34,6 +34,9 @@
 	if(!canSuicide())
 		return
 	if(confirm == "Yes")
+		if(suiciding)
+			to_chat(src, "<span class='warning'>You're already trying to commit suicide!</span>")
+			return
 		set_suicide(TRUE) //need to be called before calling suicide_act as fuck knows what suicide_act will do with your suicider
 		var/obj/item/held_item = get_active_held_item()
 		if(held_item)