From 4ccb6af41f956742acffafec2a21145e2c68006a Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Thu, 2 Jun 2016 04:23:48 -0700 Subject: [PATCH 1/2] Fixes things applying to the lighting object that shouldn't. --- code/__DEFINES/is_helpers.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index a2cfea4645d..463691580de 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -77,6 +77,9 @@ #define ismovableatom(A) (istype(A, /atom/movable)) +#define isobj(thing) istype(thing, /obj) //override the byond proc because it returns true on childs of /atom/movable that aren't objs + + // ASSEMBLY HELPERS #define isassembly(O) (istype(O, /obj/item/device/assembly)) From d86ff169ef49d966da10445330c4f0d6cf7f5df4 Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Fri, 3 Jun 2016 03:07:26 -0700 Subject: [PATCH 2/2] Does the remie --- code/__DEFINES/is_helpers.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 463691580de..459e8912bec 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -77,8 +77,7 @@ #define ismovableatom(A) (istype(A, /atom/movable)) -#define isobj(thing) istype(thing, /obj) //override the byond proc because it returns true on childs of /atom/movable that aren't objs - +#define isobj(A) istype(A, /obj) //override the byond proc because it returns true on children of /atom/movable that aren't objs // ASSEMBLY HELPERS