cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-07-20 04:32:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7035 from VOREStation/vplk-shuttle-construction

Browse Source 
[PORT] Ship/Shuttle Console Construction
This commit is contained in:
Atermonera
2020-04-25 13:22:12 -07:00
committed by GitHub
parent 27ec7ab68a 0f58907857
commit abb66e24ed
13 changed files with 130 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/overmap/ships/computers/engine_control.dm
+1
View File
@@ -4,6 +4,7 @@
name = "engine control console"
icon_keyboard = "tech_key"
icon_screen = "engines"
circuit = /obj/item/weapon/circuitboard/engine
var/display_state = "status"
/obj/machinery/computer/ship/engines/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
code/modules/overmap/ships/computers/helm.dm
+3
View File
@@ -19,6 +19,7 @@ GLOBAL_LIST_EMPTY(all_waypoints)
icon_keyboard = "teleport_key"
icon_screen = "helm"
light_color = "#7faaff"
circuit = /obj/item/weapon/circuitboard/helm
core_skill = /datum/skill/pilot
var/autopilot = 0
var/list/known_sectors = list()
@@ -225,6 +226,7 @@ GLOBAL_LIST_EMPTY(all_waypoints)
name = "navigation console"
icon_keyboard = "generic_key"
icon_screen = "helm"
circuit = /obj/item/weapon/circuitboard/nav
/obj/machinery/computer/ship/navigation/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
if(!linked)
@@ -273,6 +275,7 @@ GLOBAL_LIST_EMPTY(all_waypoints)
icon_state = "tele_nav"
icon_keyboard = null
icon_screen = null
circuit = /obj/item/weapon/circuitboard/nav/tele
density = 0
/obj/machinery/computer/ship/navigation/telescreen/update_icon()
code/modules/overmap/ships/computers/sensors.dm
+1
View File
@@ -3,6 +3,7 @@
icon_keyboard = "teleport_key"
icon_screen = "teleport"
light_color = "#77fff8"
circuit = /obj/item/weapon/circuitboard/sensors
extra_view = 4
var/obj/machinery/shipsensors/sensors
code/modules/overmap/ships/computers/ship.dm
+6 -3
View File
@@ -16,11 +16,14 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov
linked = sector
return 1
/obj/machinery/computer/ship/proc/sync_linked()
/obj/machinery/computer/ship/proc/sync_linked(var/user = null)
var/obj/effect/overmap/visitable/ship/sector = map_sectors["[z]"]
if(!sector)
return
return attempt_hook_up_recursive(sector)
. = attempt_hook_up_recursive(sector)
if(. && linked && user)
to_chat(user, "<span class='notice'>[src] reconnected to [linked]</span>")
user << browse(null, "window=[src]") // close reconnect dialog
/obj/machinery/computer/ship/proc/attempt_hook_up_recursive(obj/effect/overmap/visitable/ship/sector)
if(attempt_hook_up(sector))
@@ -43,7 +46,7 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov
if(..())
return TOPIC_HANDLED
if(href_list["sync"])
sync_linked()
sync_linked(user)
return TOPIC_REFRESH
if(href_list["close"])
unlook(user)
code/modules/overmap/ships/computers/shuttle.dm
+1
View File
@@ -1,6 +1,7 @@
//Shuttle controller computer for shuttles going between sectors
/obj/machinery/computer/shuttle_control/explore
name = "general shuttle control console"
circuit = /obj/item/weapon/circuitboard/shuttle_console/explore
ui_template = "shuttle_control_console_exploration.tmpl"
/obj/machinery/computer/shuttle_control/explore/get_ui_data(var/datum/shuttle/autodock/overmap/shuttle)