[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>
This commit is contained in:
SkyratBot
2021-04-07 01:13:51 +01:00
committed by GitHub
co-authored by ArcaneDefence
parent b2a44cd220
commit c6e2a4bf26
2 changed files with 4 additions and 1 deletions
+1 -1
View File
@@ -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)
+3
View File
@@ -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)