From 94960eaefc1864df9ba38781c7bc67b407bcb60f Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 20 Aug 2020 02:06:36 +0200 Subject: [PATCH] [MIRROR] Fixed type2parent behaving incorrectly for /mob and /turf (#418) * Fixed type2parent behaving incorrectly for /mob and /turf (#53035) * Fixed type2parent behaving incorrectly for /mob and /turf Co-authored-by: pali <6pali6@gmail.com> --- code/__HELPERS/type2type.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index ec4523ea27c..2e7ffd49133 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -459,9 +459,9 @@ GLOBAL_LIST_INIT(modulo_angle_to_dir, list(NORTH,NORTHEAST,EAST,SOUTHEAST,SOUTH, switch(child) if(/datum) return null - if(/obj || /mob) + if(/obj, /mob) return /atom/movable - if(/area || /turf) + if(/area, /turf) return /atom else return /datum