From e1ceb30080ccb15e6334972929727b14c13dfe13 Mon Sep 17 00:00:00 2001 From: Apogee-dev <60533805+Apogee-dev@users.noreply.github.com> Date: Sat, 1 Jun 2024 23:45:42 -0700 Subject: [PATCH] Enables ship-specific access by default & updates some ship configs (#2989) ## About The Pull Request See title. By default, ship airlocks will now only open if you have access for that specific ship. Two ships that specialize in service (Boyardee and Lagoon) have this disabled by default. Additionally, pirate ships have been updated to utilize the unused space_spawn config setting. ## Why It's Good For The Game players have been requesting this for like a year straight and letting features go totally unused sucks ## Changelog :cl: tweak: Ship-specific access restrictions have been enabled. tweak: Pirate ships no longer spawn docked to the outpost. /:cl: --- _maps/configs/independent_boyardee.json | 1 + _maps/configs/independent_lagoon.json | 1 + _maps/configs/pirate_libertatia.json | 1 + _maps/configs/pirate_noderider.json | 1 + code/datums/shuttles.dm | 3 ++- 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/_maps/configs/independent_boyardee.json b/_maps/configs/independent_boyardee.json index f099b23952e95..d4659b14e0acb 100644 --- a/_maps/configs/independent_boyardee.json +++ b/_maps/configs/independent_boyardee.json @@ -16,6 +16,7 @@ "starting_funds": 5000, "map_short_name": "Boyardee-class", "map_path": "_maps/shuttles/independent/independent_boyardee.dmm", + "unique_ship_access": false, "job_slots": { "Bartender": { "outfit": "/datum/outfit/job/independent/bartender", diff --git a/_maps/configs/independent_lagoon.json b/_maps/configs/independent_lagoon.json index 017850eef5559..313b4cd71d95a 100644 --- a/_maps/configs/independent_lagoon.json +++ b/_maps/configs/independent_lagoon.json @@ -13,6 +13,7 @@ ], "map_short_name": "Lagoon-class", "map_path": "_maps/shuttles/independent/independent_lagoon.dmm", + "unique_ship_access": false, "starting_funds": 3000, "job_slots": { "Captain": { diff --git a/_maps/configs/pirate_libertatia.json b/_maps/configs/pirate_libertatia.json index f61e421b0952f..4ed426746512e 100644 --- a/_maps/configs/pirate_libertatia.json +++ b/_maps/configs/pirate_libertatia.json @@ -12,6 +12,7 @@ "PIRATES", "NATURAL_AGGRESSIVE" ], + "space_spawn": true, "job_slots": { "Captain": { "outfit": "/datum/outfit/job/independent/captain/pirate", diff --git a/_maps/configs/pirate_noderider.json b/_maps/configs/pirate_noderider.json index 1341a61976358..7863a9d96896d 100644 --- a/_maps/configs/pirate_noderider.json +++ b/_maps/configs/pirate_noderider.json @@ -15,6 +15,7 @@ "Riot", "Combat" ], + "space_spawn": true, "job_slots": { "Command Node": { "outfit": "/datum/outfit/job/independent/captain/pirate/jupiter", diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 1da1dcd04554e..d7b60476d977c 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -21,7 +21,8 @@ var/prefix = "ISV" /// The full name of the ship's faction. var/faction_name = "Independent" - var/unique_ship_access = FALSE + /// Whether or not players from other ships can open airlocks. + var/unique_ship_access = TRUE /// Set by config JSON. If true, the template's ships' "default" spawn location (when bought by a player or loaded at roundstart) /// will be in the middle of space, instead of at an outpost. var/space_spawn = FALSE