cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10006 from PsiOmegaDelta/150703-Rejuvenate

Browse Source 
Rejuvenation now clears chemicals in mobs.
This commit is contained in:
Chinsky
2015-07-05 23:08:01 +03:00
parent 0ea44fe5c9 fb60cfde4c
commit 0b22c65eca
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mob/living/carbon/carbon.dm
View File

@@ -23,6 +23,12 @@
qdel(food) qdel(food)
return ..() return ..()
/mob/living/carbon/rejuvenate()
bloodstr.clear_reagents()
ingested.clear_reagents()
touching.clear_reagents()
..()
/mob/living/carbon/Move(NewLoc, direct) /mob/living/carbon/Move(NewLoc, direct)
. = ..() . = ..()
if(.) if(.)

4
code/modules/mob/living/carbon/human/life.dm
View File

@@ -1753,5 +1753,9 @@
if (thermal_protection < 1 && bodytemperature < burn_temperature) if (thermal_protection < 1 && bodytemperature < burn_temperature)
bodytemperature += round(BODYTEMP_HEATING_MAX*(1-thermal_protection), 1) bodytemperature += round(BODYTEMP_HEATING_MAX*(1-thermal_protection), 1)
/mob/living/carbon/human/rejuvenate()
restore_blood()
..()
#undef HUMAN_MAX_OXYLOSS #undef HUMAN_MAX_OXYLOSS
#undef HUMAN_CRIT_MAX_OXYLOSS #undef HUMAN_CRIT_MAX_OXYLOSS

10
code/modules/mob/living/living.dm
View File

@@ -399,6 +399,7 @@ default behaviour is:
fire_stacks = 0 fire_stacks = 0
/mob/living/proc/rejuvenate() /mob/living/proc/rejuvenate()
reagents.clear_reagents()
// shut down various types of badness // shut down various types of badness
setToxLoss(0) setToxLoss(0)
@@ -424,16 +425,11 @@ default behaviour is:
ear_damage = 0 ear_damage = 0
heal_overall_damage(getBruteLoss(), getFireLoss()) heal_overall_damage(getBruteLoss(), getFireLoss())
// restore all of a human's blood
if(ishuman(src))
var/mob/living/carbon/human/human_mob = src
human_mob.restore_blood()
// fix all of our organs // fix all of our organs
restore_all_organs() restore_all_organs()
// remove the character from the list of the dead // remove the character from the list of the dead
if(stat == 2) if(stat == DEAD)
dead_mob_list -= src dead_mob_list -= src
living_mob_list += src living_mob_list += src
tod = null tod = null
@@ -609,7 +605,7 @@ default behaviour is:
/mob/living/proc/escape_inventory(obj/item/weapon/holder/H) /mob/living/proc/escape_inventory(obj/item/weapon/holder/H)
if(H != src.loc) return if(H != src.loc) return
var/mob/M = H.loc //Get our mob holder (if any). var/mob/M = H.loc //Get our mob holder (if any).
if(istype(M)) if(istype(M))