Fix monastery shuttle + Pods (#30375)

This commit is contained in:
pubby
2017-09-04 11:00:07 -03:00
committed by Leo
parent ab211e164b
commit 283da7778c
4 changed files with 4 additions and 31 deletions
@@ -43442,7 +43442,7 @@
dir = 2;
network = list("SS13")
},
/obj/item/circuitboard/computer/shuttle/monastery_shuttle,
/obj/item/circuitboard/computer/monastery_shuttle,
/turf/open/floor/plasteel/darkgreen,
/area/storage/tech)
"bQx" = (
@@ -1,7 +1,7 @@
/obj/machinery/computer/shuttle/monastery_shuttle
name = "monastery shuttle console"
desc = "Used to control the monastery shuttle."
circuit = /obj/item/circuitboard/computer/shuttle/monastery_shuttle
circuit = /obj/item/circuitboard/computer/monastery_shuttle
shuttleId = "pod1"
possible_destinations = "monastery_shuttle_asteroid;monastery_shuttle_station"
no_destination_swap = TRUE
@@ -257,22 +257,6 @@
build_path = /obj/machinery/computer/telecomms/server
origin_tech = "programming=3;magnets=3;bluespace=2"
/obj/item/circuitboard/computer/shuttle
name = "Shuttle (Computer Board)"
build_path = /obj/machinery/computer/shuttle
var/shuttleId
var/possible_destinations = ""
/obj/item/circuitboard/computer/shuttle/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/device/multitool))
var/chosen_id = round(input(usr, "Choose an ID number (-1 for reset):", "Input an Integer", null) as num|null)
if(chosen_id >= 0)
shuttleId = chosen_id
else
shuttleId = initial(shuttleId)
else
return ..()
/obj/item/circuitboard/computer/labor_shuttle
name = "Labor Shuttle (Computer Board)"
build_path = /obj/machinery/computer/shuttle/labor
@@ -339,7 +323,7 @@
build_path = /obj/machinery/computer/apc_control
origin_tech = "programming=3;engineering=3;powerstorage=2"
/obj/item/circuitboard/computer/shuttle/monastery_shuttle
/obj/item/circuitboard/computer/monastery_shuttle
name = "Monastery Shuttle (Computer Board)"
build_path = /obj/machinery/computer/shuttle/monastery_shuttle
@@ -365,4 +349,4 @@
/obj/item/circuitboard/computer/sat_control
name = "Satellite Network Control (Computer Board)"
build_path = /obj/machinery/computer/sat_control
origin_tech = "engineering=3"
origin_tech = "engineering=3"
-11
View File
@@ -4,22 +4,11 @@
icon_keyboard = "tech_key"
light_color = LIGHT_COLOR_CYAN
req_access = list( )
circuit = /obj/item/circuitboard/computer/shuttle
var/shuttleId
var/possible_destinations = ""
var/admin_controlled
var/no_destination_swap = 0
/obj/machinery/computer/shuttle/Initialize()
..()
return INITIALIZE_HINT_LATELOAD
/obj/machinery/computer/shuttle/LateInitialize()
if(istype(circuit, /obj/item/circuitboard/computer/shuttle))
var/obj/item/circuitboard/computer/shuttle/C = circuit
possible_destinations = C.possible_destinations
shuttleId = C.shuttleId
/obj/machinery/computer/shuttle/attack_hand(mob/user)
if(..(user))
return