mapping to mining, preparing for mob folder

2018-01-04 00:55:01 -05:00
parent 5dc3f29ad4
commit cffbbbbbd1
14 changed files with 67 additions and 57 deletions
@@ -1,27 +1,27 @@
-/obj/machinery/computer/shuttle/labor
-	name = "labor shuttle console"
-	desc = "Used to call and send the labor camp shuttle."
-	circuit = /obj/item/circuitboard/computer/labor_shuttle
-	shuttleId = "laborcamp"
-	possible_destinations = "laborcamp_home;laborcamp_away"
+/obj/machinery/computer/shuttle/labor
+	name = "labor shuttle console"
+	desc = "Used to call and send the labor camp shuttle."
+	circuit = /obj/item/circuitboard/computer/labor_shuttle
+	shuttleId = "laborcamp"
+	possible_destinations = "laborcamp_home;laborcamp_away"
 	req_access = list(ACCESS_BRIG)
-
-
-/obj/machinery/computer/shuttle/labor/one_way
-	name = "prisoner shuttle console"
-	desc = "A one-way shuttle console, used to summon the shuttle to the labor camp."
-	possible_destinations = "laborcamp_away"
-	circuit = /obj/item/circuitboard/computer/labor_shuttle/one_way
-	req_access = list( )
-
-/obj/machinery/computer/shuttle/labor/one_way/Topic(href, href_list)
-	if(href_list["move"])
-		var/obj/docking_port/mobile/M = SSshuttle.getShuttle("laborcamp")
-		if(!M)
-			to_chat(usr, "<span class='warning'>Cannot locate shuttle!</span>")
-			return 0
-		var/obj/docking_port/stationary/S = M.get_docked()
-		if(S && S.name == "laborcamp_away")
-			to_chat(usr, "<span class='warning'>Shuttle is already at the outpost!</span>")
-			return 0
+
+
+/obj/machinery/computer/shuttle/labor/one_way
+	name = "prisoner shuttle console"
+	desc = "A one-way shuttle console, used to summon the shuttle to the labor camp."
+	possible_destinations = "laborcamp_away"
+	circuit = /obj/item/circuitboard/computer/labor_shuttle/one_way
+	req_access = list( )
+
+/obj/machinery/computer/shuttle/labor/one_way/Topic(href, href_list)
+	if(href_list["move"])
+		var/obj/docking_port/mobile/M = SSshuttle.getShuttle("laborcamp")
+		if(!M)
+			to_chat(usr, "<span class='warning'>Cannot locate shuttle!</span>")
+			return 0
+		var/obj/docking_port/stationary/S = M.get_docked()
+		if(S && S.name == "laborcamp_away")
+			to_chat(usr, "<span class='warning'>Shuttle is already at the outpost!</span>")
+			return 0
 	..()
@@ -102,8 +102,8 @@
 						to_chat(usr, "<span class='notice'>No permission to dock could be granted.</span>")
 					else
 						if(!emagged)
-							Radio.set_frequency(GLOB.SEC_FREQ)
-							Radio.talk_into(src, "[inserted_id.registered_name] has returned to the station. Minerals and Prisoner ID card ready for retrieval.", GLOB.SEC_FREQ, get_spans(), get_default_language())
+							Radio.set_frequency(FREQ_SECURITY)
+							Radio.talk_into(src, "[inserted_id.registered_name] has returned to the station. Minerals and Prisoner ID card ready for retrieval.", FREQ_SECURITY, get_spans(), get_default_language())
 						to_chat(usr, "<span class='notice'>Shuttle received message and will be sent shortly.</span>")

 /obj/machinery/mineral/labor_claim_console/proc/check_auth()