tm conflict resolution 2

2022-01-02 20:23:40 +01:00
parent 2e3d198c10
commit 09afd40acc
1 changed files with 1 additions and 4 deletions
@@ -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)