mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 11:43:31 +00:00
- implementing Mloc's suggestions.
- fixing the changelog
This commit is contained in:
@@ -371,60 +371,8 @@
|
|||||||
// charge the changeling chemical cost for stasis
|
// charge the changeling chemical cost for stasis
|
||||||
changeling.chem_charges -= 20
|
changeling.chem_charges -= 20
|
||||||
|
|
||||||
// shut down various types of badness
|
// restore us to health
|
||||||
C.setToxLoss(0)
|
C.rejuvenate()
|
||||||
C.setOxyLoss(0)
|
|
||||||
C.setCloneLoss(0)
|
|
||||||
C.setBrainLoss(0)
|
|
||||||
C.SetParalysis(0)
|
|
||||||
C.SetStunned(0)
|
|
||||||
C.SetWeakened(0)
|
|
||||||
|
|
||||||
// shut down ongoing problems
|
|
||||||
C.radiation = 0
|
|
||||||
C.nutrition = 400
|
|
||||||
C.bodytemperature = 310
|
|
||||||
C.sdisabilities = 0
|
|
||||||
C.disabilities = 0
|
|
||||||
C.blinded = 0
|
|
||||||
|
|
||||||
// fix blindness and deafness
|
|
||||||
C.eye_blind = 0
|
|
||||||
C.eye_blurry = 0
|
|
||||||
C.ear_deaf = 0
|
|
||||||
C.ear_damage = 0
|
|
||||||
|
|
||||||
// head actual damage numbers
|
|
||||||
C.heal_overall_damage(1000, 1000)
|
|
||||||
|
|
||||||
// get rid of the reagents
|
|
||||||
C.reagents.clear_reagents()
|
|
||||||
|
|
||||||
// cure diseases
|
|
||||||
for(var/datum/disease/D in viruses)
|
|
||||||
D.cure(0)
|
|
||||||
|
|
||||||
// fix all the organs
|
|
||||||
C.restore_all_organs()
|
|
||||||
|
|
||||||
// restore blood
|
|
||||||
if(ishuman(C))
|
|
||||||
var/mob/living/carbon/human/human_mob = C
|
|
||||||
human_mob.restore_blood()
|
|
||||||
|
|
||||||
// remove the character from the list of the dead
|
|
||||||
if(C.stat == 2)
|
|
||||||
dead_mob_list -= src
|
|
||||||
living_mob_list += src
|
|
||||||
|
|
||||||
// make us conscious again
|
|
||||||
C.stat = CONSCIOUS
|
|
||||||
|
|
||||||
// remove the time of death
|
|
||||||
C.tod = null
|
|
||||||
|
|
||||||
// fix all the icons
|
|
||||||
C.regenerate_icons()
|
|
||||||
|
|
||||||
// remove our fake death flag
|
// remove our fake death flag
|
||||||
C.status_flags &= ~(FAKEDEATH)
|
C.status_flags &= ~(FAKEDEATH)
|
||||||
|
|||||||
@@ -249,7 +249,18 @@
|
|||||||
/mob/living/proc/restore_all_organs()
|
/mob/living/proc/restore_all_organs()
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/mob/living/proc/revive()
|
/mob/living/proc/revive()
|
||||||
|
rejuvenate()
|
||||||
|
buckled = initial(src.buckled)
|
||||||
|
if(iscarbon(src))
|
||||||
|
var/mob/living/carbon/C = src
|
||||||
|
C.handcuffed = initial(C.handcuffed)
|
||||||
|
|
||||||
|
/mob/living/proc/rejuvenate()
|
||||||
|
|
||||||
|
// shut down various types of badness
|
||||||
setToxLoss(0)
|
setToxLoss(0)
|
||||||
setOxyLoss(0)
|
setOxyLoss(0)
|
||||||
setCloneLoss(0)
|
setCloneLoss(0)
|
||||||
@@ -257,37 +268,43 @@
|
|||||||
SetParalysis(0)
|
SetParalysis(0)
|
||||||
SetStunned(0)
|
SetStunned(0)
|
||||||
SetWeakened(0)
|
SetWeakened(0)
|
||||||
|
|
||||||
|
// shut down ongoing problems
|
||||||
radiation = 0
|
radiation = 0
|
||||||
nutrition = 400
|
nutrition = 400
|
||||||
bodytemperature = 310
|
bodytemperature = T20C
|
||||||
sdisabilities = 0
|
sdisabilities = 0
|
||||||
disabilities = 0
|
disabilities = 0
|
||||||
|
|
||||||
|
// fix blindness and deafness
|
||||||
blinded = 0
|
blinded = 0
|
||||||
eye_blind = 0
|
eye_blind = 0
|
||||||
eye_blurry = 0
|
eye_blurry = 0
|
||||||
eye_stat = 0
|
eye_stat = 0
|
||||||
ear_deaf = 0
|
ear_deaf = 0
|
||||||
ear_damage = 0
|
ear_damage = 0
|
||||||
heal_overall_damage(1000, 1000)
|
heal_overall_damage(getBruteLoss(), getFireLoss())
|
||||||
buckled = initial(src.buckled)
|
|
||||||
if(iscarbon(src))
|
// restore all of a human's blood
|
||||||
var/mob/living/carbon/C = src
|
if(ishuman(src))
|
||||||
C.handcuffed = initial(C.handcuffed)
|
var/mob/living/carbon/human/human_mob = src
|
||||||
|
human_mob.restore_blood()
|
||||||
// restore all of the human's blood
|
|
||||||
if(ishuman(src))
|
// fix all of our organs
|
||||||
var/mob/living/carbon/human/human_mob = src
|
|
||||||
human_mob.restore_blood()
|
|
||||||
|
|
||||||
for(var/datum/disease/D in viruses)
|
|
||||||
D.cure(0)
|
|
||||||
restore_all_organs()
|
restore_all_organs()
|
||||||
|
|
||||||
|
// remove the character from the list of the dead
|
||||||
if(stat == 2)
|
if(stat == 2)
|
||||||
dead_mob_list -= src
|
dead_mob_list -= src
|
||||||
living_mob_list += src
|
living_mob_list += src
|
||||||
|
tod = null
|
||||||
|
|
||||||
|
// restore us to conciousness
|
||||||
stat = CONSCIOUS
|
stat = CONSCIOUS
|
||||||
|
|
||||||
|
// make the icons look correct
|
||||||
regenerate_icons()
|
regenerate_icons()
|
||||||
..()
|
|
||||||
return
|
return
|
||||||
|
|
||||||
/mob/living/proc/UpdateDamageIcon()
|
/mob/living/proc/UpdateDamageIcon()
|
||||||
|
|||||||
1965
html/changelog.html
1965
html/changelog.html
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user