From b3fc3a4a15ea5f9fdff4a14329839796270c5fee Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Thu, 3 Jul 2014 05:10:31 +0930 Subject: [PATCH] Fucking Hell I'm an idiot. --- code/game/objects/structures.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index c1600dbd901..1c4cdbb8fdd 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -52,7 +52,10 @@ if (!can_touch(user) || !climbable) return - var/obj/machinery/door/poddoor/shutters/S = locate() in src.contents + var/turf/T = src.loc + if(!T || !istype(T)) return + + var/obj/machinery/door/poddoor/shutters/S = locate() in T.contents if(S && S.density) return usr.visible_message("[user] starts climbing onto \the [src]!") @@ -63,7 +66,7 @@ if (!can_touch(user) || !climbable) return - S = locate() in src.contents + S = locate() in T.contents if(S && S.density) return usr.loc = get_turf(src)