From ca9ef98833685c39e43beea9faeb2932b8be973c Mon Sep 17 00:00:00 2001 From: crazyraio2 <44246096+crazyraio2@users.noreply.github.com> Date: Sun, 26 Jul 2020 19:14:10 -0300 Subject: [PATCH] GIVE ME HIS INTRO --- code/modules/mob/living/life.dm | 2 +- .../mob/living/simple_animal/hostile/megafauna/gladiator.dm | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index fb71693534..92a1cc1603 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -3,7 +3,7 @@ * Splits off into PhysicalLife() and BiologicalLife(). Override those instead of this. */ /mob/living/proc/Life(seconds, times_fired) - SHOULD_NOT_SLEEP(TRUE) + set waitfor = FALSE // yeah hey we're kind of on a subsystem, no sleeping will be tolerated here! if(mob_transforming) return 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 e6487cffd3..bce5f179ff 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,11 @@ 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) /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)