From 09afd40acc9481054b61bc9f55294fa42829e736 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Sun, 2 Jan 2022 20:23:40 +0100 Subject: [PATCH] tm conflict resolution 2 --- code/modules/mob/living/carbon/human/species.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 83486dc0f2..fa46255ee6 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1176,10 +1176,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) var/takes_crit_damage = !HAS_TRAIT(H, TRAIT_NOCRITDAMAGE) if((H.health < H.crit_threshold) && takes_crit_damage) - if(!HAS_TRAIT(H, TRAIT_ROBOTIC_ORGANISM)) - H.adjustBruteLoss(1) - else - H.adjustFireLoss(1) //Robots melt instead of taking brute. + !HAS_TRAIT(H, TRAIT_ROBOTIC_ORGANISM) ? H.adjustBruteLoss(1) : H.adjustFireLoss(1) //Robots melt instead of taking brute. /datum/species/proc/spec_death(gibbed, mob/living/carbon/human/H) if(H)