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

Added a few config options regarding health thresholds and the availability of various ways of revival.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2363 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
uporotiy
2011-10-15 16:45:27 +00:00
parent 109ca19378
commit b8b6268ce1
20 changed files with 159 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
View File

@@ -88,9 +88,9 @@
if(src.resting)
src.weakened = max(src.weakened, 5)
if(health < -100 || src.brain_op_stage == 4.0)
if(health < config.health_threshold_dead || src.brain_op_stage == 4.0)
death()
else if(src.health < 0)
else if(src.health < config.health_threshold_crit)
if(src.health <= 20 && prob(1)) spawn(0) emote("gasp")
//if(!src.rejuv) src.oxyloss++

4
code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
View File

@@ -89,9 +89,9 @@
if(src.resting)
src.weakened = max(src.weakened, 5)
if(health < -100 || src.brain_op_stage == 4.0)
if(health < config.health_threshold_dead || src.brain_op_stage == 4.0)
death()
else if(src.health < 0)
else if(src.health < config.health_threshold_crit)
if(src.health <= 20 && prob(1)) spawn(0) emote("gasp")
//if(!src.rejuv) src.oxyloss++

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

@@ -408,9 +408,9 @@
if(src.resting)
src.weakened = max(src.weakened, 5)
if(health < -100 || src.brain_op_stage == 4.0)
if(health < config.health_threshold_dead || src.brain_op_stage == 4.0)
death()
else if(src.health < 0)
else if(src.health < config.health_threshold_crit)
if(src.health <= 20 && prob(1)) spawn(0) emote("gasp")
//if(!src.rejuv) src.oxyloss++

4
code/modules/mob/living/carbon/alien/humanoid/queen.dm
View File

@@ -90,9 +90,9 @@
if(src.resting)
src.weakened = max(src.weakened, 5)
if(health < -100 || src.brain_op_stage == 4.0)
if(health < config.health_threshold_dead || src.brain_op_stage == 4.0)
death()
else if(src.health < 0)
else if(src.health < config.health_threshold_crit)
if(src.health <= 20 && prob(1)) spawn(0) emote("gasp")
//if(!src.rejuv) src.oxyloss++

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

@@ -335,9 +335,9 @@
if(resting)
weakened = max(weakened, 5)
if(health < -100 || brain_op_stage == 4.0)
if(health < config.health_threshold_dead || brain_op_stage == 4.0)
death()
else if(health < 0)
else if(health < config.health_threshold_crit)
if(health <= 20 && prob(1)) spawn(0) emote("gasp")
//if(!rejuv) oxyloss++

1
code/modules/mob/living/carbon/brain/brain.dm
View File

@@ -1,6 +1,7 @@
/mob/living/carbon/brain
var
obj/item/device/mmi/container = null
timeofhostdeath = 0
New()
var/datum/reagents/R = new/datum/reagents(1000)

2
code/modules/mob/living/carbon/brain/death.dm
View File

@@ -1,5 +1,5 @@
/mob/living/carbon/brain/death(gibbed)
if(!gibbed&&container)//If not gibbed but in a container.
if(!gibbed && container)//If not gibbed but in a container.
for(var/mob/O in viewers(container, null))
O.show_message(text("\red <B>[]'s MMI flatlines!</B>", src), 1, "\red You hear something flatline.", 2)
container.icon_state = "mmi_dead"

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

@@ -155,9 +155,9 @@
if(resting)
weakened = max(weakened, 5)
if(health < -100 && stat != 2)
if(stat != 2 && (!container && (health < config.health_threshold_dead || (config.revival_brain_life >= 0 && ((world.time - timeofhostdeath) > config.revival_brain_life )))))
death()
else if(health < 0)
else if(health < config.health_threshold_crit)
if(health <= 20 && prob(1)) spawn(0) emote("gasp")
//if(!rejuv) oxyloss++

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

@@ -663,9 +663,9 @@
if(resting)
weakened = max(weakened, 3)
if(health < -100 || brain_op_stage == 4.0)
if(health < config.health_threshold_dead || brain_op_stage == 4.0)
death()
else if(health < 0)
else if(health < config.health_threshold_crit)
if(health <= 20 && prob(1)) spawn(0) emote("gasp")
//if(!rejuv) oxyloss++

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

@@ -403,11 +403,11 @@
if(health < -100)
if(health < config.health_threshold_dead && stat != 2)
death()
return
else if(src.health < -50)
else if(src.health < config.health_threshold_crit)
// if(src.health <= 20 && prob(1)) spawn(0) emote("gasp")
//if(!src.rejuv) src.oxyloss++

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

@@ -408,9 +408,9 @@
if(src.resting)
src.weakened = max(src.weakened, 5)
if(health < -100)
if(health < config.health_threshold_dead && stat != 2)
death()
else if(src.health < 0)
else if(src.health < config.health_threshold_crit)
if(src.health <= 20 && prob(1)) spawn(0) emote("gasp")
//if(!src.rejuv) src.oxyloss++

4
code/modules/mob/living/silicon/ai/life.dm
View File

@@ -36,10 +36,10 @@
if (src.health <= -100.0)
if (src.health <= config.health_threshold_dead)
death()
return
// else if (src.health < 0 && !istype(src.loc, /obj/machinery/computer/aifixer)) //Removing this for now, as it's bloody annoying. We'll see how it works -- Urist
// else if (src.health < config.health_threshold_crit && !istype(src.loc, /obj/machinery/computer/aifixer)) //Removing this for now, as it's bloody annoying. We'll see how it works -- Urist
// src.oxyloss++
if (src.machine)

2
code/modules/mob/living/silicon/decoy/life.dm
View File

@@ -2,7 +2,7 @@
if (src.stat == 2)
return
else
if (src.health <= -100.0 && src.stat != 2)
if (src.health <= config.health_threshold_dead && src.stat != 2)
death()
return

4
code/modules/mob/living/silicon/robot/life.dm
View File

@@ -87,7 +87,7 @@
if(src.stat)
src.camera.status = 0
health = 300 - (oxyloss + fireloss + bruteloss)
health = 200 - (oxyloss + fireloss + bruteloss)
if(oxyloss > 50) paralysis = max(paralysis, 3)
@@ -98,7 +98,7 @@
if(src.resting)
src.weakened = max(src.weakened, 5)
if(health < 0 && src.stat != 2) //die only once
if(health < config.health_threshold_dead && src.stat != 2) //die only once
death()
if (src.stat != 2) //Alive.