break off crit damage

This commit is contained in:
Fox-McCloud
2017-07-19 12:23:31 -04:00
parent e9e1f2de8e
commit 469c5706a6
3 changed files with 2 additions and 6 deletions
+1 -1
View File
@@ -256,7 +256,7 @@
if(!L || L && (L.status & ORGAN_DEAD))
if(health >= config.health_threshold_crit)
adjustOxyLoss(HUMAN_MAX_OXYLOSS + 1)
else if(!(NOCRITDAMAGE in species.species_traits))
else
adjustOxyLoss(HUMAN_CRIT_MAX_OXYLOSS)
failed_last_breath = TRUE
@@ -302,10 +302,6 @@
H.setOxyLoss(0)
H.SetLoseBreath(0)
var/takes_crit_damage = (!(NOCRITDAMAGE in species_traits))
if((H.health <= config.health_threshold_crit) && takes_crit_damage)
H.adjustBruteLoss(1)
/datum/species/proc/handle_dna(var/mob/living/carbon/C, var/remove) //Handles DNA mutations, as that doesn't work at init. Make sure you call genemutcheck on any blocks changed here
return
+1 -1
View File
@@ -74,7 +74,7 @@
if(!breath || (breath.total_moles() == 0))
if(H.health >= config.health_threshold_crit)
H.adjustOxyLoss(HUMAN_MAX_OXYLOSS)
else if(!(NOCRITDAMAGE in species_traits))
else
H.adjustOxyLoss(HUMAN_CRIT_MAX_OXYLOSS)
H.failed_last_breath = TRUE