Merge remote-tracking branch 'upstream/dev-freeze' into dev

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)