cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 21:18:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

improves suicide restraint checks

Browse Source 
gives SOFT_CRIT stat check a to_chat message
grammatically corrects UNCONSCIOUS to_chat message
gives stun check a to_chat message
swaps canmove for IsStun and IsKnockdown
This commit is contained in:
zaracka
2018-08-12 16:36:22 -04:00
parent a8d27c85eb
commit 527034df51
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/verbs/suicide.dm
+14 -8
View File
@@ -205,18 +205,24 @@
log_game("[key_name(src)] (job: [src.job ? "[src.job]" : "None"]) committed suicide at [AREACOORD(src)].")
/mob/living/proc/canSuicide()
if(stat == CONSCIOUS)
return TRUE
else if(stat == DEAD)
to_chat(src, "You're already dead!")
else if(stat == UNCONSCIOUS)
to_chat(src, "You need to be conscious to suicide!")
switch(stat)
if(CONSCIOUS)
return TRUE
if(SOFT_CRIT)
to_chat(src, "You can't commit suicide while in a critical condition!")
if(UNCONSCIOUS)
to_chat(src, "You need to be conscious to commit suicide!")
if(DEAD)
to_chat(src, "You're already dead!")
return
/mob/living/carbon/canSuicide()
if(!..())
return
if(!canmove || restrained()) //just while I finish up the new 'fun' suiciding verb. This is to prevent metagaming via suicide
to_chat(src, "You can't commit suicide whilst restrained! ((You can type Ghost instead however.))")
if(IsStun() || IsKnockdown()) //just while I finish up the new 'fun' suiciding verb. This is to prevent metagaming via suicide
to_chat(src, "You can't commit suicide while stunned! ((You can type Ghost instead however.))")
return
if(restrained())
to_chat(src, "You can't commit suicide while restrained! ((You can type Ghost instead however.))")
return
return TRUE