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

Fixes #7363

Browse Source
This commit is contained in:
mwerezak
2015-03-02 13:24:52 -05:00
parent 1d38246cc1
commit 1a4cedd412
1 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -608,26 +608,29 @@
if(prob(20)) if(prob(20))
src << "<span class='danger'>You feel your face burning and a searing heat in your lungs!</span>" src << "<span class='danger'>You feel your face burning and a searing heat in your lungs!</span>"
switch(breath.temperature) if(breath.temperature > species.heat_level_1)
if(-INFINITY to species.cold_level_3) if(breath.temperature <= species.heat_level_2)
apply_damage(COLD_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Cold")
fire_alert = max(fire_alert, 1)
if(species.cold_level_3 to species.cold_level_2)
apply_damage(COLD_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Cold")
fire_alert = max(fire_alert, 1)
if(species.cold_level_2 to species.cold_level_1)
apply_damage(COLD_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Cold")
fire_alert = max(fire_alert, 1)
if(species.heat_level_1 to species.heat_level_2)
apply_damage(HEAT_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Heat") apply_damage(HEAT_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Heat")
fire_alert = max(fire_alert, 2) fire_alert = max(fire_alert, 2)
if(species.heat_level_2 to species.heat_level_3) else if(breath.temperature <= species.heat_level_3)
apply_damage(HEAT_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Heat") apply_damage(HEAT_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Heat")
fire_alert = max(fire_alert, 2) fire_alert = max(fire_alert, 2)
if(species.heat_level_3 to INFINITY) else
apply_damage(HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Heat") apply_damage(HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Heat")
fire_alert = max(fire_alert, 2) fire_alert = max(fire_alert, 2)
else if(breath.temperature < species.cold_level_1)
if(breath.temperature >= species.cold_level_2)
apply_damage(COLD_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Cold")
fire_alert = max(fire_alert, 1)
else if(breath.temperature >= species.cold_level_3)
apply_damage(COLD_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Cold")
fire_alert = max(fire_alert, 1)
else
apply_damage(COLD_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Cold")
fire_alert = max(fire_alert, 1)
//breathing in hot/cold air also heats/cools you a bit //breathing in hot/cold air also heats/cools you a bit
var/temp_adj = breath.temperature - bodytemperature var/temp_adj = breath.temperature - bodytemperature
if (temp_adj < 0) if (temp_adj < 0)
@@ -704,29 +707,29 @@
//Body temperature is too hot. //Body temperature is too hot.
fire_alert = max(fire_alert, 1) fire_alert = max(fire_alert, 1)
if(status_flags & GODMODE) return 1 //godmode if(status_flags & GODMODE) return 1 //godmode
switch(bodytemperature)
if(species.heat_level_1 to species.heat_level_2) if(bodytemperature <= species.heat_level_2)
take_overall_damage(burn=HEAT_DAMAGE_LEVEL_1, used_weapon = "High Body Temperature") take_overall_damage(burn=HEAT_DAMAGE_LEVEL_1, used_weapon = "High Body Temperature")
fire_alert = max(fire_alert, 2) fire_alert = max(fire_alert, 2)
if(species.heat_level_2 to species.heat_level_3) else if(bodytemperature <= species.heat_level_3)
take_overall_damage(burn=HEAT_DAMAGE_LEVEL_2, used_weapon = "High Body Temperature") take_overall_damage(burn=HEAT_DAMAGE_LEVEL_2, used_weapon = "High Body Temperature")
fire_alert = max(fire_alert, 2) fire_alert = max(fire_alert, 2)
if(species.heat_level_3 to INFINITY) else
take_overall_damage(burn=HEAT_DAMAGE_LEVEL_3, used_weapon = "High Body Temperature") take_overall_damage(burn=HEAT_DAMAGE_LEVEL_3, used_weapon = "High Body Temperature")
fire_alert = max(fire_alert, 2) fire_alert = max(fire_alert, 2)
else if(bodytemperature < species.cold_level_1) else if(bodytemperature < species.cold_level_1)
fire_alert = max(fire_alert, 1) fire_alert = max(fire_alert, 1)
if(status_flags & GODMODE) return 1 //godmode if(status_flags & GODMODE) return 1 //godmode
if(!istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) if(!istype(loc, /obj/machinery/atmospherics/unary/cryo_cell))
switch(bodytemperature) if(bodytemperature >= species.cold_level_2)
if(species.cold_level_2 to species.cold_level_1)
take_overall_damage(burn=COLD_DAMAGE_LEVEL_1, used_weapon = "High Body Temperature") take_overall_damage(burn=COLD_DAMAGE_LEVEL_1, used_weapon = "High Body Temperature")
fire_alert = max(fire_alert, 1) fire_alert = max(fire_alert, 1)
if(species.cold_level_3 to species.cold_level_2) else if(bodytemperature >= species.cold_level_3)
take_overall_damage(burn=COLD_DAMAGE_LEVEL_2, used_weapon = "High Body Temperature") take_overall_damage(burn=COLD_DAMAGE_LEVEL_2, used_weapon = "High Body Temperature")
fire_alert = max(fire_alert, 1) fire_alert = max(fire_alert, 1)
if(-INFINITY to species.cold_level_3) else
take_overall_damage(burn=COLD_DAMAGE_LEVEL_3, used_weapon = "High Body Temperature") take_overall_damage(burn=COLD_DAMAGE_LEVEL_3, used_weapon = "High Body Temperature")
fire_alert = max(fire_alert, 1) fire_alert = max(fire_alert, 1)