From 2f0ad7958956440f8dcbd391731eaf9674b04b75 Mon Sep 17 00:00:00 2001
From: Mahzel <mahzel@icqmail.com>
Date: Tue, 2 Feb 2016 21:09:25 +0100
Subject: [PATCH] Revert "Baystation issue #46"

This reverts commit 9f79035c4d105dc5bd65cfd2347ce9cfec3ed680.
---
 baystation12.int                   | 3 +--
 code/modules/assembly/infrared.dm  | 2 +-
 code/modules/assembly/proximity.dm | 2 +-
 code/modules/assembly/signaler.dm  | 2 +-
 code/modules/assembly/timer.dm     | 4 ++--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/baystation12.int b/baystation12.int
index 9db09d554fa..b82874fded5 100644
--- a/baystation12.int
+++ b/baystation12.int
@@ -1,7 +1,6 @@
 // BEGIN_INTERNALS
 /*
-DIR: code code\datums code\datums\wires code\game code\game\objects code\game\objects\items code\game\objects\items\devices code\modules code\modules\assembly code\modules\nano code\modules\nano\interaction code\modules\nano\modules icons icons\obj sound sound\machines 
-AUTO_FILE_DIR: OFF
 MAP_ICON_TYPE: 0
+AUTO_FILE_DIR: OFF
 */
 // END_INTERNALS
diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index b1dc44a5037..d163a9d29f5 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -120,7 +120,7 @@
 
 
 	Topic(href, href_list)
-		..()
+		if(..()) return 1
 		if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
 			usr << browse(null, "window=infra")
 			onclose(usr, "infra")
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index cf9f2a26732..39bf3f2fcc1 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -129,7 +129,7 @@
 
 
 	Topic(href, href_list)
-		..()
+		if(..()) return 1
 		if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
 			usr << browse(null, "window=prox")
 			onclose(usr, "prox")
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index 24e527d17b2..4d93ad26ee8 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -70,7 +70,7 @@
 
 
 	Topic(href, href_list)
-		..()
+		if(..()) return 1
 
 		if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
 			usr << browse(null, "window=radio")
diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm
index 5ca119e3095..d4fb73a764d 100644
--- a/code/modules/assembly/timer.dm
+++ b/code/modules/assembly/timer.dm
@@ -83,7 +83,7 @@
 
 
 	Topic(href, href_list)
-		..()
+		if(..()) return 1
 		if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
 			usr << browse(null, "window=timer")
 			onclose(usr, "timer")
@@ -105,4 +105,4 @@
 		if(usr)
 			attack_self(usr)
 
-		return
\ No newline at end of file
+		return