From cfe71b41c40270f75c24943a44427eb8d13016c1 Mon Sep 17 00:00:00 2001
From: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Date: Mon, 24 Feb 2025 19:28:07 +0500
Subject: [PATCH] Fix Legion megafauna being able to `enrage()` for more than 1
 time and remove `/datum/nothing` (#28509)

* fix

* not a single thing
---
 code/datums/datum.dm                            |  3 ---
 .../simple_animal/hostile/megafauna/legion.dm   | 17 ++++++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

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)