cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allows the Trader Shuttle to be Manipulated by the Shuttle Manipulator + Very minor other trade shuttle content (#30849)

Browse Source 
* A surprising number of file changes, this needed.

* lateload wooo

* Update centcomm.dmm

* Update centcomm.dmm

* Update shuttles.dm

---------

Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
This commit is contained in:
CRUNCH
2025-11-25 14:57:30 +00:00
committed by GitHub
co-authored by Fordoxia
parent d1d7c7fdcf
commit ef74d4ee5f
21 changed files with 432 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/SSshuttles.dm
+2 -3
View File
@@ -490,12 +490,12 @@ SUBSYSTEM_DEF(shuttle)
var/obj/docking_port/mobile/trader/trade_shuttle = getShuttle("trader")
if(trade_shuttle)
var/obj/docking_port/stationary/docked_id = trade_shuttle.get_docked()
if(docked_id?.id != "trader_base")
if(docked_id?.id != "trader_away")
CRASH("Attempted to load a new trade shuttle while the existing one was not at its home base.")
// Dispose of the old shuttle.
trade_shuttle.jumpToNullSpace()
var/obj/docking_port/mobile/trader/dock = getDock("trader_base")
var/obj/docking_port/mobile/trader/dock = getDock("trader_away")
if(!dock)
CRASH("Unable to load trading shuttle, no trading dock found.")
@@ -510,7 +510,6 @@ SUBSYSTEM_DEF(shuttle)
CRASH("New trading shuttle unable to dock at the trading dock: [result]")
trade_shuttle.dock(dock)
trade_shuttle.register()
// TODO indicate to the user that success happened, rather than just
code/controllers/subsystem/non_firing/SSlate_mapping.dm
+6 -1
View File
@@ -14,7 +14,12 @@ SUBSYSTEM_DEF(late_mapping)
GLOB.air_alarms = sortAtom(GLOB.air_alarms)
GLOB.apcs = sortAtom(GLOB.apcs)
// Load a Gamma Armoury shuttle at Centcom.
if(SSmapping.trader_shuttle_id)
var/template = new SSmapping.trader_shuttle_id()
SSshuttle.set_trader_shuttle(template)
else
WARNING("no valid trader shuttle template was set in SSmapping")
if(SSmapping.gamma_armory_shuttle_id)
SSshuttle.load_initial_gamma_armory_shuttle(SSmapping.gamma_armory_shuttle_id)
else
code/controllers/subsystem/non_firing/SSmapping.dm
+2
View File
@@ -8,6 +8,8 @@ SUBSYSTEM_DEF(mapping)
var/datum/map/next_map
/// What map was used last round?
var/datum/map/last_map
/// The trader shuttle to load at Centcom in late_mapping.
var/datum/map_template/shuttle/trader_shuttle_id = /datum/map_template/shuttle/trader/synthetic
/// The Gamma Armory shuttle to load at Centcom in late_mapping.
var/gamma_armory_shuttle_id = "gamma_armory_base"
/// List of all areas that can be accessed via IC means