Skip to content

Commit

Permalink
Fixes Nebula Docking issues. (#6408)
Browse files Browse the repository at this point in the history
  • Loading branch information
Sorrowfulwinds committed May 1, 2024
1 parent 7c5d002 commit a53140c
Show file tree
Hide file tree
Showing 3 changed files with 353 additions and 280 deletions.
21 changes: 14 additions & 7 deletions code/modules/maps/overmap/space/trade_station/trade_station.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,29 @@
color = "#8F6E4C"

initial_generic_waypoints = list(
"nebula_pad_1",
"nebula_pad_2",
"nebula_space_SW",
"nebula_pad_3",
"nebula_pad_1a",
"nebula_pad_1b",
"nebula_pad_2a",
"nebula_pad_2b",
"nebula_pad_3a",
"nebula_pad_3b",
"nebula_pad_3c",
"nebula_pad_3d",
"nebula_pad_4a",
"nebula_pad_4b",
"nebula_pad_4c",
"nebula_pad_5",
"nebula_pad_6",
"nebula_pad_4d",
"nebula_pad_5a",
"nebula_pad_5b",
"nebula_pad_6a",
"nebula_pad_6b",
"nebula_space_SE",
"nebula_space_S",
"nebula_space_SW"
)

initial_restricted_waypoints = list(
"Beruang Trade Ship" = list("tradeport_hangar"), "Beluga Passenger Liner" = list("nebula_pad_3")
"Beruang Trade Ship" = list("tradeport_hangar")
)
/* // Old Restricted list. Leaving commented out for reference - Bloop
initial_restricted_waypoints = list(
Expand Down
34 changes: 0 additions & 34 deletions maps/sectors/tradeport/shuttles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,37 +30,3 @@

/area/shuttle/trade_ship/cockpit
name = "\improper Beruang Trade Shuttle Cockpit"

// Tradeport Off-Map Visitor shuttle
/datum/shuttle/autodock/overmap/visitor_ship
name = "Beluga Passenger Liner"
warmup_time = 10
shuttle_area = list(/area/shuttle/visitor_ship/general, /area/shuttle/visitor_ship/cockpit)
current_location = "nebula_pad_3"
docking_controller_tag = "visitor_space_lock"
fuel_consumption = 10
move_time = 10

/obj/overmap/entity/visitable/ship/landable/visitor_ship
name = "Beluga Passenger Liner"
desc = "You know our motto: 'Right place right time!'"
color = "#754116" //Brown
fore_dir = WEST
vessel_mass = 10000
vessel_size = SHIP_SIZE_SMALL
shuttle = "Beluga Passenger Liner"

/obj/machinery/computer/shuttle_control/explore/visitor_ship
name = "short jump console"
shuttle_tag = "Beluga Passenger Liner"

/area/shuttle/visitor_ship
requires_power = 1
icon_state = "shuttle2"
area_flags = AREA_RAD_SHIELDED

/area/shuttle/visitor_ship/general
name = "\improper Beluga Passenger Liner"

/area/shuttle/visitor_ship/cockpit
name = "\improper Beluga Passenger Liner Cockpit"
Loading

0 comments on commit a53140c

Please sign in to comment.