From d2eee6572e045cfe39e8cfc42dfb5493d7ab5b53 Mon Sep 17 00:00:00 2001 From: JJRcop Date: Fri, 13 Dec 2013 21:18:09 -0500 Subject: [PATCH] Adds and removes some checks in transit tubes Adds some safety checks when stuffing people in transit tubes Removes intent check when yanking people out of tubes because it complicates things --- code/game/objects/structures/transit_tubes.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/transit_tubes.dm b/code/game/objects/structures/transit_tubes.dm index 22f20194900..206b03e8e53 100644 --- a/code/game/objects/structures/transit_tubes.dm +++ b/code/game/objects/structures/transit_tubes.dm @@ -121,7 +121,7 @@ obj/structure/ex_act(severity) open_animation() else if(icon_state == "open") - if(pod.contents.len && user.loc != pod && intent_numeric(user.a_intent) > 1) + if(pod.contents.len && user.loc != pod) user.visible_message("[user] starts emptying [pod]'s contents onto the floor!") if(do_after(user, 40)) //So it doesn't default to close_animation() on fail if(pod.loc == loc) @@ -143,7 +143,7 @@ obj/structure/ex_act(severity) var/mob/GM = G.affecting for(var/obj/structure/transit_tube_pod/pod in loc) pod.visible_message("[user] starts putting [GM] into the [pod]!") - if(do_after(user, 60)) + if(do_after(user, 60) && GM && G && G.affecting == GM) GM.Weaken(5) src.Bumped(GM) del(G)