mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Merge pull request #10006 from PsiOmegaDelta/150703-Rejuvenate
Rejuvenation now clears chemicals in mobs.
This commit is contained in:
@@ -23,6 +23,12 @@
|
||||
qdel(food)
|
||||
return ..()
|
||||
|
||||
/mob/living/carbon/rejuvenate()
|
||||
bloodstr.clear_reagents()
|
||||
ingested.clear_reagents()
|
||||
touching.clear_reagents()
|
||||
..()
|
||||
|
||||
/mob/living/carbon/Move(NewLoc, direct)
|
||||
. = ..()
|
||||
if(.)
|
||||
|
||||
@@ -1753,5 +1753,9 @@
|
||||
if (thermal_protection < 1 && bodytemperature < burn_temperature)
|
||||
bodytemperature += round(BODYTEMP_HEATING_MAX*(1-thermal_protection), 1)
|
||||
|
||||
/mob/living/carbon/human/rejuvenate()
|
||||
restore_blood()
|
||||
..()
|
||||
|
||||
#undef HUMAN_MAX_OXYLOSS
|
||||
#undef HUMAN_CRIT_MAX_OXYLOSS
|
||||
|
||||
@@ -399,6 +399,7 @@ default behaviour is:
|
||||
fire_stacks = 0
|
||||
|
||||
/mob/living/proc/rejuvenate()
|
||||
reagents.clear_reagents()
|
||||
|
||||
// shut down various types of badness
|
||||
setToxLoss(0)
|
||||
@@ -424,16 +425,11 @@ default behaviour is:
|
||||
ear_damage = 0
|
||||
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
|
||||
restore_all_organs()
|
||||
|
||||
// remove the character from the list of the dead
|
||||
if(stat == 2)
|
||||
if(stat == DEAD)
|
||||
dead_mob_list -= src
|
||||
living_mob_list += src
|
||||
tod = null
|
||||
@@ -609,7 +605,7 @@ default behaviour is:
|
||||
|
||||
/mob/living/proc/escape_inventory(obj/item/weapon/holder/H)
|
||||
if(H != src.loc) return
|
||||
|
||||
|
||||
var/mob/M = H.loc //Get our mob holder (if any).
|
||||
|
||||
if(istype(M))
|
||||
|
||||
Reference in New Issue
Block a user