diff --git a/code/datums/datum.dm b/code/datums/datum.dm index e09769af7552d..ed901df2241e9 100644 --- a/code/datums/datum.dm +++ b/code/datums/datum.dm @@ -81,6 +81,3 @@ for(var/target in signal_procs) UnregisterSignal(target, signal_procs[target]) - -/datum/nothing - // Placeholder object, used for ispath checks. Has to be defined to prevent errors, but shouldn't ever be created. diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm index 809dc5eddc7e7..ec92013d609f5 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -57,19 +57,22 @@ Difficulty: Medium transform *= 2 /mob/living/simple_animal/hostile/megafauna/legion/enrage() + if(enraged || ((health / maxHealth) * 100 <= 80)) + return + enraged = TRUE health = 1250 maxHealth = 1250 transform /= 1.5 - loot = list(/datum/nothing) - crusher_loot = list(/datum/nothing) + loot = list() + crusher_loot = list() var/mob/living/simple_animal/hostile/megafauna/legion/legiontwo = new /mob/living/simple_animal/hostile/megafauna/legion(get_turf(src)) - legiontwo.transform /= 1.5 - legiontwo.loot = list(/datum/nothing) - legiontwo.crusher_loot = list(/datum/nothing) + legiontwo.enraged = TRUE legiontwo.health = 1250 legiontwo.maxHealth = 1250 - legiontwo.enraged = TRUE - + legiontwo.transform /= 1.5 + legiontwo.loot = list() + legiontwo.crusher_loot = list() + /mob/living/simple_animal/hostile/megafauna/legion/unrage() . = ..() for(var/mob/living/simple_animal/hostile/megafauna/legion/other in GLOB.mob_list)