Skip to content

Commit

Permalink
Tradeport Visitor Prefix (#5949)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
As I'm having issues with the new shuttle, and I would really like to
push unrelated changes to the tradeport I'm pushing this prefix PR.
Adds a visitor lobby to the Tradeport. Adjusts the hanger for the future
shuttle addition. Fixes a handful of issues on the Tradeport and
modernizes the map.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Bugfixes are important. Silicons requested the addition for future
off-map visitor spawns.
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog
-Adds a visitor terminal lobby and proper vending to the TradePort
public areas.
-Fixes all windows on the Tradeport to newer autospawners 
-Adds Salt, Pepper, Enzyme to trade kitchens.
-Fixes power wire in Beruang Hanger
-Fixes scubber/vent pipes in Tradeport kitchen.
-Adds more solars to support new shuttle expansion.
<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl: Shadowcat
add: Added visitor terminal lobby and attached vending
add: Added more solars to support future expansion.
fix: Fixed hanger APC power
fix: Fixed kitchen scrubber and vent
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Sorrowfulwinds authored Sep 24, 2023
1 parent 9f4d245 commit 0127d78
Show file tree
Hide file tree
Showing 3 changed files with 7,363 additions and 6,705 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
"nebula_pad_1",
"nebula_pad_2",
"nebula_space_SW",
"nebula_pad_3a",
"nebula_pad_3b",
"nebula_pad_3c",
"nebula_pad_3",
"nebula_pad_4a",
"nebula_pad_4b",
"nebula_pad_4c",
Expand All @@ -26,7 +24,7 @@
)

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

/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 0127d78

Please sign in to comment.