mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-09 07:46:20 +00:00
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:
@@ -6,7 +6,7 @@
|
||||
"shuttles": {
|
||||
"emergency": "emergency_box",
|
||||
"ferry": "ferry_fancy",
|
||||
"cargo": "cargo_skyrat",
|
||||
"cargo": "cargo_box",
|
||||
"whiteship": "whiteship_box"
|
||||
},
|
||||
"job_changes": {
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
"shuttles": {
|
||||
"emergency": "emergency_delta",
|
||||
"ferry": "ferry_fancy",
|
||||
"cargo": "cargo_delta_skyrat",
|
||||
"cargo": "cargo_delta",
|
||||
"whiteship": "whiteship_delta"
|
||||
},
|
||||
"job_changes": {
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
"planetary": 1,
|
||||
"give_players_hooks": 1,
|
||||
"shuttles": {
|
||||
"cargo": "cargo_skyrat",
|
||||
"cargo": "cargo_box",
|
||||
"ferry": "ferry_fancy",
|
||||
"whiteship": "whiteship_box",
|
||||
"emergency": "emergency_box"
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
"map_path": "map_files/MetaStation",
|
||||
"map_file": "MetaStation.dmm",
|
||||
"shuttles": {
|
||||
"cargo": "cargo_skyrat",
|
||||
"cargo": "cargo_box",
|
||||
"ferry": "ferry_fancy",
|
||||
"whiteship": "whiteship_meta",
|
||||
"emergency": "emergency_meta"
|
||||
|
||||
@@ -51,6 +51,5 @@
|
||||
"Captain": {
|
||||
"special_charter": "moon"
|
||||
}
|
||||
},
|
||||
"emergency_override": 1
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
"map_file": "tramstation.dmm",
|
||||
"give_players_hooks": 1,
|
||||
"shuttles": {
|
||||
"cargo": "cargo_skyrat",
|
||||
"cargo": "cargo_box",
|
||||
"ferry": "ferry_fancy",
|
||||
"whiteship": "whiteship_tram",
|
||||
"emergency": "emergency_tram"
|
||||
|
||||
@@ -44,10 +44,10 @@
|
||||
|
||||
var/allow_custom_shuttles = TRUE
|
||||
var/shuttles = list(
|
||||
"cargo" = "cargo_skyrat",
|
||||
"cargo" = "cargo_box",
|
||||
"ferry" = "ferry_fancy",
|
||||
"whiteship" = "whiteship_meta",
|
||||
"emergency" = "emergency_skyrat", //SKYRAT EDIT CHANGE
|
||||
"emergency" = "emergency_meta",
|
||||
)
|
||||
|
||||
/// Dictionary of job sub-typepath to template changes dictionary
|
||||
@@ -169,11 +169,6 @@
|
||||
log_world("map_config shuttles is not a list!")
|
||||
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": [{"Linkage": "Cross"}, {"Space Ruins": true}]
|
||||
if (islist(traits))
|
||||
|
||||
Reference in New Issue
Block a user