cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into pAI-Drone-Port

Browse Source
This commit is contained in:
DZD
2015-01-07 15:48:29 -05:00
parent d6e13b506d b7ec7c2c99
commit 7239fc2c40
452 changed files with 29149 additions and 40077 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/verbs/suicide.dm
+7
View File
@@ -61,6 +61,9 @@
//If something went wrong, just do normal oxyloss
if(!(damagetype | BRUTELOSS) && !(damagetype | FIRELOSS) && !(damagetype | TOXLOSS) && !(damagetype | OXYLOSS))
adjustOxyLoss(max(175 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
var/datum/organ/external/affected = get_organ("head")
affected.add_autopsy_data("Suicide by [held_item]", 175)
updatehealth()
return
@@ -71,6 +74,10 @@
"\red <b>[src] is twisting \his own neck! It looks like \he's trying to commit suicide.</b>", \
"\red <b>[src] is holding \his breath! It looks like \he's trying to commit suicide.</b>")
adjustOxyLoss(max(175 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
var/datum/organ/external/affected = get_organ("head")
affected.add_autopsy_data("Suicide", 175)
updatehealth()
/mob/living/carbon/brain/verb/suicide()