Merge pull request #8288 from mwerezak/topicfix

Topic Fixes

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")

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")

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")

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")

code/modules/detectivework/scanning_console.dm

@@ -213,6 +213,7 @@
 	onclose(user,"fscanner")
 
 /obj/machinery/computer/forensic_scanning/Topic(href,href_list)
+	if(..()) return 1
 	switch(href_list["operation"])
 		if("login")
 			var/mob/M = usr

code/modules/holodeck/HolodeckControl.dm

@@ -106,7 +106,7 @@ var/global/list/holodeck_programs = list(
 
 /obj/machinery/computer/HolodeckControl/Topic(href, href_list)
 	if(..())
-		return
+		return 1
 	if((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
 		usr.set_machine(src)
 

code/modules/mining/machine_processing.dm

@@ -67,7 +67,7 @@
 
 /obj/machinery/mineral/processing_unit_console/Topic(href, href_list)
 	if(..())
-		return
+		return 1
 	usr.set_machine(src)
 	src.add_fingerprint(usr)
 

code/modules/mining/machine_stacking.dm

@@ -43,7 +43,7 @@
 
 /obj/machinery/mineral/stacking_unit_console/Topic(href, href_list)
 	if(..())
-		return
+		return 1
 
 	if(href_list["change_stack"])
 		var/choice = input("What would you like to set the stack amount to?") as null|anything in list(1,5,10,20,50)

code/modules/mining/mint.dm

@@ -116,7 +116,7 @@
 
 /obj/machinery/mineral/mint/Topic(href, href_list)
 	if(..())
-		return
+		return 1
 	usr.set_machine(src)
 	src.add_fingerprint(usr)
 	if(processing==1)

code/modules/mining/money_bag.dm

@@ -62,7 +62,7 @@
 
 /obj/item/weapon/moneybag/Topic(href, href_list)
 	if(..())
-		return
+		return 1
 	usr.set_machine(src)
 	src.add_fingerprint(usr)
 	if(href_list["remove"])

code/modules/overmap/ships/computers/engine_control.dm

@@ -59,7 +59,7 @@
 
 /obj/machinery/computer/engines/Topic(href, href_list)
 	if(..())
-		return
+		return 1
 
 	if(href_list["state"])
 		state = href_list["state"]

code/modules/overmap/ships/computers/helm.dm

@@ -110,7 +110,7 @@
 
 /obj/machinery/computer/helm/Topic(href, href_list)
 	if(..())
-		return
+		return 1
 
 	if (!linked)
 		return

code/modules/overmap/ships/computers/shuttle.dm

@@ -113,7 +113,7 @@
 
 /obj/machinery/computer/shuttle_control/explore/Topic(href, href_list)
 	if(..())
-		return
+		return 1
 
 	usr.set_machine(src)
 	src.add_fingerprint(usr)

code/modules/projectiles/guns/energy/temperature.dm

@@ -42,7 +42,7 @@
 
 /obj/item/weapon/gun/energy/temperature/Topic(href, href_list)
 	if (..())
-		return
+		return 1
 	usr.set_machine(src)
 	src.add_fingerprint(usr)
 

code/modules/projectiles/guns/projectile/dartgun.dm

@@ -165,6 +165,7 @@
 	return 0
 
 /obj/item/weapon/gun/projectile/dartgun/Topic(href, href_list)
+	if(..()) return 1
 	src.add_fingerprint(usr)
 	if(href_list["stop_mix"])
 		var/index = text2num(href_list["stop_mix"])

code/modules/research/rdconsole.dm

@@ -162,7 +162,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 
 /obj/machinery/computer/rdconsole/Topic(href, href_list)
 	if(..())
-		return
+		return 1
 
 	add_fingerprint(usr)
 

code/modules/research/server.dm

@@ -205,7 +205,7 @@
 
 /obj/machinery/computer/rdservercontrol/Topic(href, href_list)
 	if(..())
-		return
+		return 1
 
 	add_fingerprint(usr)
 	usr.set_machine(src)

code/modules/research/xenoarchaeology/genetics/reconstitutor.dm

@@ -181,6 +181,7 @@ datum/genesequence
 	onclose(user, "reconstitutor")
 
 /obj/machinery/computer/reconstitutor/animal/Topic(href, href_list)
+	if(..()) return 1
 	if(href_list["clone"])
 		var/sequence_num = text2num(href_list["sequence_num"])
 		var/datum/genesequence/cloned_genesequence = completed_genesequences[sequence_num]
@@ -201,10 +202,9 @@ datum/genesequence
 				pod1.biomass -= CLONE_BIOMASS
 		else
 			usr << "\red \icon[src] Unable to locate cloning pod!"
-	else
-		..()
 
 /obj/machinery/computer/reconstitutor/Topic(href, href_list)
+	if(..()) return 1
 	if(href_list["insertpos"])
 		//world << "inserting gene for genesequence [href_list["insertgenome"]] at pos [text2num(href_list["insertpos"])]"
 		var/sequence_num = text2num(href_list["sequence_num"])
@@ -252,9 +252,6 @@ datum/genesequence
 		usr.unset_machine(src)
 		usr << browse(null, "window=reconstitutor")
 
-	else
-		..()
-
 /obj/machinery/computer/reconstitutor/proc/scan_fossil(var/obj/item/weapon/fossil/scan_fossil)
 	//see whether we accept these kind of fossils
 	if(accepted_fossil_types.len && !accepted_fossil_types.Find(scan_fossil.type))

code/modules/shuttles/escape_pods.dm

@@ -43,7 +43,7 @@
 		ui.set_auto_update(1)
 
 /obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/Topic(href, href_list)
-	if(..())	//I hate this "return 1 to indicate they are not allowed to use the controller" crap, but not sure how else to do it without being able to call machinery/Topic() directly.
+	if(..())
 		return 1
 	
 	if("manual_arm")

code/modules/shuttles/shuttle_console.dm

@@ -67,7 +67,7 @@
 
 /obj/machinery/computer/shuttle_control/Topic(href, href_list)
 	if(..())
-		return
+		return 1
 
 	usr.set_machine(src)
 	src.add_fingerprint(usr)

code/modules/shuttles/shuttle_emergency.dm

@@ -221,7 +221,7 @@
 
 /obj/machinery/computer/shuttle_control/emergency/Topic(href, href_list)
 	if(..())
-		return
+		return 1
 
 	if(href_list["removeid"])
 		var/dna_hash = href_list["removeid"]

code/modules/shuttles/shuttles_multi.dm

@@ -78,7 +78,7 @@
 
 /obj/machinery/computer/shuttle_control/multi/Topic(href, href_list)
 	if(..())
-		return
+		return 1
 
 	usr.set_machine(src)
 	src.add_fingerprint(usr)

code/modules/virus2/centrifuge.dm

@@ -92,7 +92,7 @@
 			isolate()
 
 /obj/machinery/computer/centrifuge/Topic(href, href_list)
-	if (..()) return 0
+	if (..()) return 1
 
 	var/mob/user = usr
 	var/datum/nanoui/ui = nanomanager.get_open_ui(user, src, "main")

code/modules/virus2/curer.dm

@@ -80,7 +80,7 @@
 
 /obj/machinery/computer/curer/Topic(href, href_list)
 	if(..())
-		return
+		return 1
 	usr.machine = src
 
 	if (href_list["antibody"])
@@ -91,7 +91,6 @@
 
 	src.add_fingerprint(usr)
 	src.updateUsrDialog()
-	return
 
 
 /obj/machinery/computer/curer/proc/createcure(var/obj/item/weapon/reagent_containers/container)

code/modules/virus2/diseasesplicer.dm

@@ -122,7 +122,7 @@
 			nanomanager.update_uis(src)
 
 /obj/machinery/computer/diseasesplicer/Topic(href, href_list)
-	if(..()) return 0
+	if(..()) return 1
 
 	var/mob/user = usr
 	var/datum/nanoui/ui = nanomanager.get_open_ui(user, src, "main")

code/modules/virus2/dishincubator.dm

@@ -139,7 +139,7 @@
 			nanomanager.update_uis(src)
 
 /obj/machinery/disease2/incubator/Topic(href, href_list)
-	if (..()) return 0
+	if (..()) return 1
 
 	var/mob/user = usr
 	var/datum/nanoui/ui = nanomanager.get_open_ui(user, src, "main")

code/modules/virus2/isolator.dm

@@ -120,7 +120,7 @@
 			update_icon()
 
 /obj/machinery/disease2/isolator/Topic(href, href_list)
-	if (..()) return 0
+	if (..()) return 1
 
 	var/mob/user = usr
 	var/datum/nanoui/ui = nanomanager.get_open_ui(user, src, "main")

code/modules/virus2/items_devices.dm

@@ -73,7 +73,7 @@
 
 /obj/item/weapon/virusdish/Topic(href, href_list)
 	. = ..()
-	if(.) return
+	if(.) return 1
 
 	if(href_list["info"])
 		usr << browse(info, "window=info_\ref[src]")