cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 10:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Meta whiteship redesign (#39438)

Browse Source 
Redesigned the white ship for metastation, this one's a salvage/cargo vessel!
The salvage pod is currently missing, however, as it doesn't work right now.
I'll add it further down the line. This ship is also filled with a few syndies
protecting it, one of them is ranged, the others are unarmed melee.
This commit is contained in:
WJohn
2018-07-30 01:37:59 -04:00
committed by Tad Hardesty
parent 48f3b9c8a8
commit c67a698c7e
6 changed files with 3371 additions and 1699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
_maps/map_files/MetaStation/MetaStation.dmm
View File

@@ -76426,10 +76426,10 @@
/obj/docking_port/stationary{
dir = 2;
dwidth = 11;
height = 15;
height = 22;
id = "whiteship_home";
name = "SS13: Auxiliary Dock, Station-Port";
width = 28
width = 35
},
/turf/open/space/basic,
/area/space)

5012
_maps/shuttles/whiteship_meta.dmm
View File

File diff suppressed because it is too large Load Diff

11
code/datums/shuttles.dm
View File

@@ -325,11 +325,11 @@
/datum/map_template/shuttle/whiteship/box
suffix = "box"
name = "NT Medical Ship"
name = "Hospital Ship"
/datum/map_template/shuttle/whiteship/meta
suffix = "meta"
name = "NT Recovery Whiteship"
name = "Salvage Ship"
/datum/map_template/shuttle/whiteship/pubby
suffix = "pubby"
@@ -341,8 +341,11 @@
/datum/map_template/shuttle/whiteship/delta
suffix = "delta"
name = "Unnamed NT Vessel"
admin_notes = "The Delta whiteship doesn't have a name, apparently."
name = "NT Luxury Frigate"
/datum/map_template/shuttle/whiteship/pod
suffix = "whiteship_pod"
name = "Salvage Pod"
/datum/map_template/shuttle/cargo/box
suffix = "box"

10
code/game/area/areas/shuttles.dm
View File

@@ -67,31 +67,29 @@
/area/shuttle/abandoned
name = "Abandoned Ship"
blob_allowed = FALSE
requires_power = TRUE
canSmoothWithAreas = /area/shuttle/abandoned
/area/shuttle/abandoned/bridge
name = "Abandoned Ship Bridge"
requires_power = TRUE
/area/shuttle/abandoned/engine
name = "Abandoned Ship Engine"
requires_power = TRUE
/area/shuttle/abandoned/bar
name = "Abandoned Ship Bar"
requires_power = TRUE
/area/shuttle/abandoned/crew
name = "Abandoned Ship Crew Quarters"
requires_power = TRUE
/area/shuttle/abandoned/cargo
name = "Abandoned Ship Cargo Bay"
requires_power = TRUE
/area/shuttle/abandoned/medbay
name = "Abandoned Ship Medbay"
requires_power = TRUE
/area/shuttle/abandoned/pod
name = "Abandoned Ship Pod"
////////////////////////////Single-area shuttles////////////////////////////

8
code/game/objects/items/circuitboards/computer_circuitboards.dm
View File

@@ -280,6 +280,14 @@
name = "White Ship (Computer Board)"
build_path = /obj/machinery/computer/shuttle/white_ship
/obj/item/circuitboard/computer/white_ship/pod
name = "Salvage Pod (Computer Board)"
build_path = /obj/machinery/computer/shuttle/white_ship/pod
/obj/item/circuitboard/computer/white_ship/pod/recall
name = "Salvage Pod Recall (Computer Board)"
build_path = /obj/machinery/computer/shuttle/white_ship/pod/recall
/obj/item/circuitboard/computer/auxillary_base
name = "Auxillary Base Management Console (Computer Board)"
build_path = /obj/machinery/computer/auxillary_base

25
code/modules/shuttle/white_ship.dm
View File

@@ -5,6 +5,19 @@
shuttleId = "whiteship"
possible_destinations = "whiteship_away;whiteship_home;whiteship_z4;whiteship_lavaland;whiteship_custom"
/obj/machinery/computer/shuttle/white_ship/pod
name = "Salvage Pod Console"
desc = "Used to control the Salvage Pod."
circuit = /obj/item/circuitboard/computer/white_ship/pod
shuttleId = "whiteship_pod"
possible_destinations = "whiteship_pod_home;whiteship_pod_custom"
/obj/machinery/computer/shuttle/white_ship/pod/recall
name = "Salvage Pod Recall Console"
desc = "Used to recall the Salvage Pod."
circuit = /obj/item/circuitboard/computer/white_ship/pod/recall
possible_destinations = "whiteship_pod_home"
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship
name = "White Ship Navigation Computer"
desc = "Used to designate a precise transit location for the White Ship."
@@ -18,6 +31,18 @@
y_offset = -10
designate_time = 100
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship/pod
name = "Salvage Pod Navigation Computer"
desc = "Used to designate a precise transit location for the Salvage Pod."
shuttleId = "whiteship_pod"
shuttlePortId = "whiteship_pod_custom"
shuttlePortName = "Custom Location"
jumpto_ports = list("whiteship_pod_home" = 1)
view_range = 7
x_offset = -2
y_offset = 0
designate_time = 0
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship/Initialize()
. = ..()
GLOB.jam_on_wardec += src