cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 03:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #180 from Markolie/master

Browse Source 
Shuttle fixes
This commit is contained in:
Fox-McCloud
2015-01-16 20:39:03 -05:00
parent a1b5c0d609 fde761f42a
commit ad1614f737
10 changed files with 157 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_damage.dm
+3 -3
View File
@@ -17,12 +17,12 @@
var/datum/organ/external/H = organs_by_name["head"]
if (!H.amputated)
if ((health >= (config.health_threshold_dead/100*75)) && stat == DEAD) //need to get them 25% away from death point before reviving synthetics
revive()
update_revive()
if (stat == CONSCIOUS && (src in dead_mob_list)) //Defib fix
revive()
update_revive()
return
/mob/living/carbon/human/revive() // handles revival through other means that cloning (defib, IPC repair)
/mob/living/carbon/human/proc/update_revive() // handles revival through other means that cloning or adminbus (defib, IPC repair)
stat = CONSCIOUS
dead_mob_list -= src
living_mob_list |= src