Skip to content

Commit

Permalink
Fix Legion megafauna being able to enrage() for more than 1 time an…
Browse files Browse the repository at this point in the history
…d remove `/datum/nothing` (#28509)

* fix

* not a single thing
  • Loading branch information
kyunkyunkyun authored Feb 24, 2025
1 parent 6e5260b commit cfe71b4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
3 changes: 0 additions & 3 deletions code/datums/datum.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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.
17 changes: 10 additions & 7 deletions code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit cfe71b4

Please sign in to comment.