From 0de57ddb2bf598e43b4b208111a4863f8f9c87a5 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Thu, 3 Jul 2014 05:10:31 +0930 Subject: [PATCH 1/2] 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 a041ad9be12..04648c39b3e 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -47,7 +47,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]!") @@ -58,7 +61,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) From b690f927ba5cba6d4824c6f38f8f2650276abcc0 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Thu, 3 Jul 2014 05:20:29 +0930 Subject: [PATCH 2/2] Fixes #5472 --- code/modules/mining/drilling/drill.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm index 5dc990ba150..cbfdd53f9a6 100644 --- a/code/modules/mining/drilling/drill.dm +++ b/code/modules/mining/drilling/drill.dm @@ -100,6 +100,7 @@ for(var/metal in ore_types) if(contents.len >= get_storage_capacity()) + system_error("insufficient storage space") active = 0 need_player_check = 1 update_icon()