From 77baffb96808f2a68e67fa5a61ea2724d82d5e7b Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Fri, 8 Mar 2019 12:38:30 +0100 Subject: [PATCH] Update mobjects.dm --- code/modules/mob/living/simple_animal/mobject/mobjects.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/mobject/mobjects.dm b/code/modules/mob/living/simple_animal/mobject/mobjects.dm index 3dc46f13a7..cdb63f2776 100644 --- a/code/modules/mob/living/simple_animal/mobject/mobjects.dm +++ b/code/modules/mob/living/simple_animal/mobject/mobjects.dm @@ -3,13 +3,14 @@ //Basically this will set some vars to use across them like "obj_icon" and "obj_on" mob/living/simple_animal/mobject - name = "Mobject" + name = "Metamorphic fox" desc = "Something about this seems, off." var/animal_icon = 'icons/mob/vore.dmi' var/animal_icon_state = "fennec" var/obj_icon = 'icons/mob/pai.dmi' var/obj_icon_state = "fox" var/obj_on + var/PandL = 1 //Run both Process() and Life //Since Process takes Priority turning the mob off will also turn off Life() var/willanchor = 0 //Var that decides if obj state is anchored or not var/norest = 1 //Var that makes mobject in animal state unrest automatically //simple workaround to infinite resting var/on = 1 //Just another var to turn off the mob object processing @@ -59,6 +60,8 @@ mob/living/simple_animal/mobject/Life() if(willanchor) anchored = 1 process() + if(PandL) + ..() else if(norest && resting) resting = !resting @@ -68,6 +71,6 @@ mob/living/simple_animal/mobject/Life() mob/living/simple_animal/mobject/proc/process() //proccess performed instead of Life in OBJ form. if(!on) - return //A way to disable process() + return //A way to disable process() //for PandL this will also disable Life() //Mobject engineering will Probably be first, basically a Synthetic Mob that can be wrenched into active object mode