diff --git a/code/modules/events/untie_shoes.dm b/code/modules/events/untie_shoes.dm index 17dd2ca8b2..21a98c31d6 100644 --- a/code/modules/events/untie_shoes.dm +++ b/code/modules/events/untie_shoes.dm @@ -2,7 +2,7 @@ name = "Untied Shoes" typepath = /datum/round_event/untied_shoes weight = 50 - max_occurrences = 10 + max_occurrences = 5 alert_observers = FALSE category = EVENT_CATEGORY_HEALTH description = "Unties people's shoes, with a chance to knot them as well." diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index d06442e544..bfd6c73388 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -647,18 +647,13 @@ var/list/dat = list() if(stat == DEAD) dat += "[p_they(TRUE)] appears to be dead." - if(getBruteLoss()) - if(getBruteLoss() < (maxHealth / 10)) - dat += span_warning("[p_they(TRUE)] looks bruised.") - else if(getBruteLoss() < (maxHealth / 2)) - dat += span_warning("[p_they(TRUE)] looks severely bruised.") + else if(getBruteLoss()) + if(health < (maxHealth * 0.15)) + dat += span_warning("[p_they(TRUE)] looks critically injured.") + else if(health < (maxHealth * 0.5)) + dat += span_warning("[p_they(TRUE)] looks severely injured.") + else if(health < (maxHealth * 0.85)) + dat += span_warning("[p_they(TRUE)] looks injured.") else - dat += span_warning("[p_they(TRUE)] looks critically bruised and damaged.") - if(getFireLoss()) - if(getFireLoss() < (maxHealth / 10)) - dat += span_warning("[p_they(TRUE)] looks burned.") - else if(getFireLoss() < (maxHealth / 2)) - dat += span_warning("[p_they(TRUE)] looks severely burned.") - else - dat += span_warning("[p_they(TRUE)] looks critically burned and blistered.") + dat += span_warning("[p_they(TRUE)] looks slightly injured.") return dat