Fixes multiple issues related to suicides (tgstation#58178)

ViktorVil · Apr 6, 2021 · 3476d18 · 3476d18
1 parent 755ab5b
commit 3476d18
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -32,6 +32,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)