From 55a68ea2f5ffbe79655c4b34b8e3f47308aaa688 Mon Sep 17 00:00:00 2001 From: Tom <8881105+tf-4@users.noreply.github.com> Date: Tue, 24 Jan 2023 22:28:31 +0000 Subject: [PATCH] fixes legion achievement (#18763) Co-authored-by: Sealed101 <75863639+Sealed101@users.noreply.github.com> --- .../living/simple_animal/hostile/megafauna/_megafauna.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm index e0baa203da5..0c3ec44b23f 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm @@ -87,10 +87,12 @@ if(health > 0) return var/datum/status_effect/crusher_damage/crusher_dmg = has_status_effect(/datum/status_effect/crusher_damage) + ///Whether we killed the megafauna with primarily crusher damage or not var/crusher_kill = FALSE - if(crusher_dmg && crusher_loot && crusher_dmg.total_damage >= maxHealth * 0.6) - spawn_crusher_loot() + if(crusher_dmg && crusher_dmg.total_damage >= maxHealth * 0.6) crusher_kill = TRUE + if(crusher_loot) // spawn crusher loot, if any + spawn_crusher_loot() //SKYRAT ADDITION START - ASHWALKER TROPHIES var/datum/status_effect/ashwalker_damage/ashie_damage = has_status_effect(/datum/status_effect/ashwalker_damage) if(!crusher_kill && ashie_damage && crusher_loot && ashie_damage.total_damage >= maxHealth * 0.6)