From 97dc434b2212db12d8926095a110f0b5f5e58206 Mon Sep 17 00:00:00 2001 From: VampyrBytes Date: Sun, 13 Mar 2016 06:29:52 +0000 Subject: [PATCH] fixes move inside verbs (#3843) fixes #3843 fixes the verbs being able to teleport people inside the spacepod or recharge station fixes ghosts being able to use the verbs --- code/game/machinery/rechargestation.dm | 8 +++++++- code/game/vehicles/spacepods/spacepod.dm | 7 +++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index bac66c13cad..31849032067 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -210,10 +210,16 @@ /obj/machinery/recharge_station/verb/move_inside(var/mob/user = usr) set category = "Object" set src in oview(1) - if(!user) return + if (usr.stat != CONSCIOUS) + return + + if(get_dist(src, user) > 2 || get_dist(usr, user) > 1) + usr << "They are too far away to put inside" + return + if (panel_open) usr << "Close the maintenance panel first." return diff --git a/code/game/vehicles/spacepods/spacepod.dm b/code/game/vehicles/spacepods/spacepod.dm index d5e2c45182c..4463c7b61a3 100644 --- a/code/game/vehicles/spacepods/spacepod.dm +++ b/code/game/vehicles/spacepods/spacepod.dm @@ -547,6 +547,13 @@ set name = "Enter Pod" set src in oview(1) + if (usr.stat != CONSCIOUS) + return + + if(get_dist(src, user) > 2 || get_dist(usr, user) > 1) + usr << "They are too far away to put inside" + return + if(!istype(user)) return 0