cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #161 from Markolie/master

Browse Source 
Simplify and cleanup IPC/defib revival after messy fixes
This commit is contained in:
Fox-McCloud
2015-01-13 14:00:20 -05:00
parent af07c79a92 bde14e78b3
commit 05f19808a5
5 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_damage.dm
+12 -18
View File
@@ -16,26 +16,20 @@
if (species.flags & IS_SYNTHETIC)
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 them
living_mob_list -= src
mob_list -= src
dead_mob_list -= src
living_mob_list += src
mob_list += src
stat = CONSCIOUS
ear_deaf = 0
tod = 0
timeofdeath = 0
if ((health >= (config.health_threshold_dead/100*75)) && stat == DEAD) //need to get them 25% away from death point before reviving synthetics
revive()
if (stat == CONSCIOUS && (src in dead_mob_list)) //Defib fix
living_mob_list -= src
mob_list -= src
dead_mob_list -= src
living_mob_list += src
mob_list += src
ear_deaf = 0
tod = 0
timeofdeath = 0
revive()
return
/mob/living/carbon/human/revive() // handles revival through other means that cloning (defib, IPC repair)
stat = CONSCIOUS
dead_mob_list -= src
living_mob_list |= src
mob_list |= src
ear_deaf = 0
tod = 0
timeofdeath = 0
/mob/living/carbon/human/getBrainLoss()
if(species && species.flags & NO_INTORGANS) return