cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 15:37:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #296 from mwerezak/paradise-docking

Browse Source 
Updates docking controllers
This commit is contained in:
ZomgPonies
2014-07-17 01:36:28 -04:00
parent 371fd82f54 3e12d5028c
commit a76f51b479
5 changed files with 244 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttles/departmental.dm
+31 -1
View File
@@ -14,4 +14,34 @@
name = "research shuttle console"
shuttle_tag = "Research"
//req_access = list(access_research)
circuit = /obj/item/weapon/circuitboard/research_shuttle
circuit = /obj/item/weapon/circuitboard/research_shuttle
/obj/machinery/computer/shuttle_control/labor_camp
name = "labor camp shuttle console"
shuttle_tag = "Labor"
req_access = list(access_brig)
/obj/machinery/computer/shuttle_control/labor_camp/one_way
name = "prisoner shuttle console"
req_access = list()
/obj/machinery/computer/shuttle_control/labor_camp/one_way/launch()
var/datum/shuttle/ferry/shuttle = shuttle_controller.shuttles[shuttle_tag]
if (!istype(shuttle))
return
if (shuttle.location)
src.visible_message("\blue Shuttle is already at the outpost.")
return
..()
/obj/machinery/computer/shuttle_control/labor_camp/one_way/force_launch()
var/datum/shuttle/ferry/shuttle = shuttle_controller.shuttles[shuttle_tag]
if (!istype(shuttle))
return
if (shuttle.location)
src.visible_message("\blue Shuttle is already at the outpost.")
return
..()
/obj/machinery/computer/shuttle_control/labor_camp/one_way/cancel_launch()
src.visible_message("\red That command has been disabled.")
code/modules/shuttles/shuttle_console.dm
+20 -6
View File
@@ -72,16 +72,30 @@
usr.set_machine(src)
src.add_fingerprint(usr)
if(href_list["move"])
launch()
if(href_list["force"])
force_launch()
else if(href_list["cancel"])
cancel_launch()
/obj/machinery/computer/shuttle_control/proc/launch()
var/datum/shuttle/ferry/shuttle = shuttle_controller.shuttles[shuttle_tag]
if (!istype(shuttle))
return
shuttle.launch(src)
/obj/machinery/computer/shuttle_control/proc/force_launch()
var/datum/shuttle/ferry/shuttle = shuttle_controller.shuttles[shuttle_tag]
if (!istype(shuttle))
return
shuttle.force_launch(src)
if(href_list["move"])
shuttle.launch(src)
if(href_list["force"])
shuttle.force_launch(src)
else if(href_list["cancel"])
shuttle.cancel_launch(src)
/obj/machinery/computer/shuttle_control/proc/cancel_launch()
var/datum/shuttle/ferry/shuttle = shuttle_controller.shuttles[shuttle_tag]
if (!istype(shuttle))
return
shuttle.cancel_launch(src)
/obj/machinery/computer/shuttle_control/attackby(obj/item/weapon/W as obj, mob/user as mob)