cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-26 21:46:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2817 from MagmaRam/defib_fix_please_make_this_the_last_one_please_god

Browse Source 
Defibs should revive people now.
This commit is contained in:
Anewbe
2016-11-24 13:26:03 -06:00
committed by GitHub
parent 05d5061b8b 93bac86f04
commit 050aa30eb1
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/defib.dm
+1 -1
View File
@@ -111,7 +111,7 @@
patient.visible_message("<span class='warning'>[patient] convulses!</span>")
playsound(src.loc, 'sound/effects/sparks2.ogg', 75, 1)
//Actual rezzing code
if(prob(chance) && !((world.time - patient.tod) > (10 MINUTES))) //Can only revive within a few minutes
if(prob(chance) && ((world.time - patient.timeofdeath) < (10 MINUTES))) //Can only revive within a few minutes
if(!patient.client && patient.mind) //Don't force the dead person to come back if they don't want to.
for(var/mob/observer/dead/ghost in player_list)
if(ghost.mind == patient.mind)