From a7448b3d2cb34a95f2c9d4c87e85c2030afe4ed9 Mon Sep 17 00:00:00 2001 From: SomeguyManperson <24857008+SomeguyManperson@users.noreply.github.com> Date: Tue, 18 Jun 2024 19:07:53 +0300 Subject: [PATCH] [MIRROR] Mob trophies will no longer attempt to drop if there aren't any --- .../living/simple_animal/hostile/mining_mobs/mining_mobs.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm index b66c71fd58b2..f884945e9359 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm @@ -75,8 +75,14 @@ spawn_crusher_loot() ..(gibbed) +<<<<<<< ours /mob/living/simple_animal/hostile/asteroid/proc/spawn_crusher_loot() butcher_results[crusher_loot] = 1 +======= +/mob/living/simple_animal/hostile/asteroid/proc/spawn_mob_trophy() + if(mob_trophy) + butcher_results[mob_trophy] = 1 +>>>>>>> theirs /mob/living/simple_animal/hostile/asteroid/handle_temperature_damage() if(bodytemperature < minbodytemp)