From 2053dcbfcc2ef4bd5a56104dd8a1290ea4c168b4 Mon Sep 17 00:00:00 2001 From: Enric Gabriel <43283559+SandPoot@users.noreply.github.com> Date: Sun, 26 Jul 2020 19:00:36 -0300 Subject: [PATCH] until the gladiator is fixed... and makes the loot code better? --- code/modules/mob/living/simple_animal/simple_animal.dm | 7 ++++--- .../living/simple_animal/hostile/megafauna/gladiator.dm | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index fd676d5ee5..5d21d19ab2 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -350,9 +350,10 @@ return 1 /mob/living/simple_animal/proc/drop_loot() - if(loot?.len) - for(var/i in loot) - new i(loc) + if(!length(loot)) + return + for(var/i in loot) + new i(loc) /mob/living/simple_animal/death(gibbed) movement_type &= ~FLYING diff --git a/sandcode/code/modules/mob/living/simple_animal/hostile/megafauna/gladiator.dm b/sandcode/code/modules/mob/living/simple_animal/hostile/megafauna/gladiator.dm index be492a0896..e6487cffd3 100644 --- a/sandcode/code/modules/mob/living/simple_animal/hostile/megafauna/gladiator.dm +++ b/sandcode/code/modules/mob/living/simple_animal/hostile/megafauna/gladiator.dm @@ -67,12 +67,12 @@ They deal 35 brute (armor is considered). . = ..() internal = new /obj/item/gps/internal/gladiator(src) -/mob/living/simple_animal/hostile/megafauna/gladiator/Life() +/* /mob/living/simple_animal/hostile/megafauna/gladiator/Life() . = ..() if(!wander) for(var/mob/living/M in view(4, src)) if(!(M in introduced) && (stat != DEAD)) - introduction(M) +*/ // introduction(M) /mob/living/simple_animal/hostile/megafauna/gladiator/apply_damage(damage, damagetype, def_zone, blocked, forced, bare_wound_bonus = FALSE, sharpness = FALSE, wound_bonus=CANT_WOUND) if(speen)