Restores Per-Map Shuttles (#4736)

## About The Pull Request
Title.
## Why It's Good For The Game
<img width="981" height="881" alt="image"
src="https://github.com/user-attachments/assets/c98b3fe8-a5f3-43bb-9cbf-c53e38141e0d"
/>

<img width="535" height="777" alt="image"
src="https://github.com/user-attachments/assets/107b0004-f878-4c9f-9f7f-0658bd067195"
/>


TG maps typically have per-map shuttles which is very cool. Meaning that
even if buying a shuttle slips the mind, you'd still have one different
from the previous map.



## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>

</details>

## Changelog
🆑
del: Per-Map shuttles are back.
/🆑
This commit is contained in:
Cursor
2025-10-14 18:33:56 +01:00
committed by GitHub
parent c75569d2d5
commit 64325ffb3d
7 changed files with 8 additions and 14 deletions

View File

@@ -6,7 +6,7 @@
"shuttles": { "shuttles": {
"emergency": "emergency_box", "emergency": "emergency_box",
"ferry": "ferry_fancy", "ferry": "ferry_fancy",
"cargo": "cargo_skyrat", "cargo": "cargo_box",
"whiteship": "whiteship_box" "whiteship": "whiteship_box"
}, },
"job_changes": { "job_changes": {

View File

@@ -6,7 +6,7 @@
"shuttles": { "shuttles": {
"emergency": "emergency_delta", "emergency": "emergency_delta",
"ferry": "ferry_fancy", "ferry": "ferry_fancy",
"cargo": "cargo_delta_skyrat", "cargo": "cargo_delta",
"whiteship": "whiteship_delta" "whiteship": "whiteship_delta"
}, },
"job_changes": { "job_changes": {

View File

@@ -9,7 +9,7 @@
"planetary": 1, "planetary": 1,
"give_players_hooks": 1, "give_players_hooks": 1,
"shuttles": { "shuttles": {
"cargo": "cargo_skyrat", "cargo": "cargo_box",
"ferry": "ferry_fancy", "ferry": "ferry_fancy",
"whiteship": "whiteship_box", "whiteship": "whiteship_box",
"emergency": "emergency_box" "emergency": "emergency_box"

View File

@@ -4,7 +4,7 @@
"map_path": "map_files/MetaStation", "map_path": "map_files/MetaStation",
"map_file": "MetaStation.dmm", "map_file": "MetaStation.dmm",
"shuttles": { "shuttles": {
"cargo": "cargo_skyrat", "cargo": "cargo_box",
"ferry": "ferry_fancy", "ferry": "ferry_fancy",
"whiteship": "whiteship_meta", "whiteship": "whiteship_meta",
"emergency": "emergency_meta" "emergency": "emergency_meta"

View File

@@ -51,6 +51,5 @@
"Captain": { "Captain": {
"special_charter": "moon" "special_charter": "moon"
} }
}, }
"emergency_override": 1
} }

View File

@@ -5,7 +5,7 @@
"map_file": "tramstation.dmm", "map_file": "tramstation.dmm",
"give_players_hooks": 1, "give_players_hooks": 1,
"shuttles": { "shuttles": {
"cargo": "cargo_skyrat", "cargo": "cargo_box",
"ferry": "ferry_fancy", "ferry": "ferry_fancy",
"whiteship": "whiteship_tram", "whiteship": "whiteship_tram",
"emergency": "emergency_tram" "emergency": "emergency_tram"

View File

@@ -44,10 +44,10 @@
var/allow_custom_shuttles = TRUE var/allow_custom_shuttles = TRUE
var/shuttles = list( var/shuttles = list(
"cargo" = "cargo_skyrat", "cargo" = "cargo_box",
"ferry" = "ferry_fancy", "ferry" = "ferry_fancy",
"whiteship" = "whiteship_meta", "whiteship" = "whiteship_meta",
"emergency" = "emergency_skyrat", //SKYRAT EDIT CHANGE "emergency" = "emergency_meta",
) )
/// Dictionary of job sub-typepath to template changes dictionary /// Dictionary of job sub-typepath to template changes dictionary
@@ -169,11 +169,6 @@
log_world("map_config shuttles is not a list!") log_world("map_config shuttles is not a list!")
return return
//BUBBERSTATION CHANGE: FIXES DUMB SKYRAT OVERRIDE. HOLY SHIT. THIS WASN'T EVEN MARKED AS MODULAR.
if(!json["emergency_override"])
shuttles["emergency"] = "emergency_skyrat"
//BUBBERSTATION CHANGE END
traits = json["traits"] traits = json["traits"]
// "traits": [{"Linkage": "Cross"}, {"Space Ruins": true}] // "traits": [{"Linkage": "Cross"}, {"Space Ruins": true}]
if (islist(traits)) if (islist(traits))