From dadc677a34b3dee6b11034bb717a724a222edee8 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Wed, 21 Jan 2015 20:40:37 +0100 Subject: [PATCH 1/2] Adds a second teleporter check because I r dumb. --- code/game/machinery/teleporter.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index f2d298ada76..f71212cd57a 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -121,8 +121,10 @@ areaindex[tmpname] = 1 L[tmpname] = I - var/desc = input("Please select a location to lock in.", "Locking Computer") in L - if(get_dist(src, usr) > 1) + var/desc = input("Please select a location to lock in.", "Locking Computer") in L|null + if(!desc) + return + if(get_dist(src, usr) > 1 && !issilicon(usr)) return src.locked = L[desc] From 8c53e30cfac488f80857338b830570ad27c1d324 Mon Sep 17 00:00:00 2001 From: Loganbacca Date: Mon, 26 Jan 2015 19:53:42 +1300 Subject: [PATCH 2/2] Fixes telekinetic cat stealing --- code/modules/mob/living/simple_animal/friendly/cat.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index 4678531947d..046d27d9ad1 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -65,7 +65,7 @@ /mob/living/simple_animal/cat/MouseDrop(atom/over_object) var/mob/living/carbon/H = over_object - if(!istype(H)) return ..() + if(!istype(H) || !Adjacent(H)) return ..() if(H.a_intent == "help") get_scooped(H)