From 44e5e53f82a0d2a60fe9d307a08c6b9d0de60a86 Mon Sep 17 00:00:00 2001 From: Lzimann Date: Mon, 10 Oct 2016 14:04:16 -0300 Subject: [PATCH] Removes my changes from topic.dm and add a cancel to teleporter console. --- code/game/machinery/teleporter.dm | 4 ++-- code/modules/admin/topic.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 914071708d9..d8bb001d457 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -199,7 +199,7 @@ areaindex[tmpname] = 1 L[tmpname] = I - var/desc = input("Please select a location to lock in.", "Locking Computer") in L + var/desc = input("Please select a location to lock in.", "Locking Computer") as null|anything in L target = L[desc] else @@ -221,7 +221,7 @@ else areaindex[tmpname] = 1 L[tmpname] = R - var/desc = input("Please select a station to lock in.", "Locking Computer") in L + var/desc = input("Please select a station to lock in.", "Locking Computer") as null|anything in L target = L[desc] if(target) var/obj/machinery/teleport/station/trg = target diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 214b938b918..a5157a25298 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -476,13 +476,13 @@ return minutes = CMinutes + mins duration = GetExp(minutes) - reason = input(usr,"Please State Reason.","Reason",reason2) as null|message + reason = input(usr,"Please State Reason.","Reason",reason2) as message if(!reason) return if("No") temp = 0 duration = "Perma" - reason = input(usr,"Please State Reason.","Reason",reason2) as null|message + reason = input(usr,"Please State Reason.","Reason",reason2) as message if(!reason) return