From d57299ca016936d6ac84f08cfb952856e5f9fab8 Mon Sep 17 00:00:00 2001
From: monster860 <mnmaxim@gmail.com>
Date: Tue, 28 Jun 2016 15:54:57 -0400
Subject: [PATCH] Fix #4801 (#4802)

* Fix #4801

* Apparently, that made the problem worse... This should work better.
---
 code/modules/shuttle/shuttle.dm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 586d9945c56..db38c6be68b 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -683,7 +683,7 @@
 
 /obj/machinery/computer/shuttle/Topic(href, href_list)
 	if(..())
-		return
+		return 1
 	usr.set_machine(src)
 	src.add_fingerprint(usr)
 	if(!allowed(usr))
@@ -726,7 +726,8 @@
 	admin_controlled = 1
 
 /obj/machinery/computer/shuttle/ferry/request/Topic(href, href_list)
-	..()
+	if(..())
+		return 1
 	if(href_list["request"])
 		if(cooldown)
 			return
@@ -801,7 +802,8 @@ var/global/trade_dockrequest_timelimit = 0
 	..(user)
 
 /obj/machinery/computer/shuttle/trade/Topic(href, href_list)
-	..()
+	if(..())
+		return 1
 	if(href_list["request"])
 		if(world.time < trade_dockrequest_timelimit || world.time < trade_dock_timelimit)
 			return