From 7608c4d2484e8d97ffdd69367d8efef35fa0ad82 Mon Sep 17 00:00:00 2001 From: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Date: Thu, 13 Nov 2025 08:49:32 -0600 Subject: [PATCH] Added hardsuit lockers for logistics officer (#4643) * Added hardsuit lockers for logistics officer * Removed the Rhino suit from the normal entity table, since it is its own thing now. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Updated maps' LockerQuarterMasterFilled to LockerQuarterMasterFilledHardsuit * Forgot submarine. * Put parent before id --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- Resources/Maps/academy.yml | 2 +- Resources/Maps/arena.yml | 2 +- Resources/Maps/asterisk.yml | 2 +- Resources/Maps/byoin.yml | 2 +- Resources/Maps/division.yml | 2 +- Resources/Maps/edge.yml | 2 +- Resources/Maps/elegance.yml | 6 ++--- Resources/Maps/glacier.yml | 2 +- Resources/Maps/hammurabi.yml | 2 +- Resources/Maps/hive.yml | 2 +- Resources/Maps/lighthouse.yml | 2 +- Resources/Maps/micro.yml | 2 +- Resources/Maps/pebble.yml | 2 +- Resources/Maps/shoukou.yml | 2 +- Resources/Maps/submarine.yml | 2 +- Resources/Maps/terra.yml | 6 ++--- Resources/Maps/tortuga.yml | 2 +- .../_DV/Catalog/Fills/Lockers/cargo.yml | 25 +++++++++++++++++++ .../_DV/Catalog/Fills/Lockers/heads.yml | 1 - .../Catalog/Fills/Lockers/suit_storage.yml | 12 +++++++++ 20 files changed, 58 insertions(+), 22 deletions(-) diff --git a/Resources/Maps/academy.yml b/Resources/Maps/academy.yml index 8046f3ce37..169c581699 100644 --- a/Resources/Maps/academy.yml +++ b/Resources/Maps/academy.yml @@ -140509,7 +140509,7 @@ entities: - type: Transform pos: -40.5,-32.5 parent: 2 -- proto: LockerQuarterMasterFilled +- proto: LockerQuarterMasterFilledHardsuit entities: - uid: 7594 components: diff --git a/Resources/Maps/arena.yml b/Resources/Maps/arena.yml index 6473217fef..13fedf5fc7 100644 --- a/Resources/Maps/arena.yml +++ b/Resources/Maps/arena.yml @@ -131207,7 +131207,7 @@ entities: showEnts: False occludes: True ent: null -- proto: LockerQuarterMasterFilled +- proto: LockerQuarterMasterFilledHardsuit entities: - uid: 9424 components: diff --git a/Resources/Maps/asterisk.yml b/Resources/Maps/asterisk.yml index 4ea35aee21..e6a4df78f6 100644 --- a/Resources/Maps/asterisk.yml +++ b/Resources/Maps/asterisk.yml @@ -56248,7 +56248,7 @@ entities: - type: Transform pos: 34.5,-9.5 parent: 2 -- proto: LockerQuarterMasterFilled +- proto: LockerQuarterMasterFilledHardsuit entities: - uid: 4168 components: diff --git a/Resources/Maps/byoin.yml b/Resources/Maps/byoin.yml index 1a40da8159..1b5b004d4a 100644 --- a/Resources/Maps/byoin.yml +++ b/Resources/Maps/byoin.yml @@ -92217,7 +92217,7 @@ entities: - type: Transform pos: 8.5,-32.5 parent: 2 -- proto: LockerQuarterMasterFilled +- proto: LockerQuarterMasterFilledHardsuit entities: - uid: 11912 components: diff --git a/Resources/Maps/division.yml b/Resources/Maps/division.yml index b08a9b483b..41153299a2 100644 --- a/Resources/Maps/division.yml +++ b/Resources/Maps/division.yml @@ -118699,7 +118699,7 @@ entities: - type: Transform pos: -11.5,3.5 parent: 2 -- proto: LockerQuarterMasterFilled +- proto: LockerQuarterMasterFilledHardsuit entities: - uid: 18264 components: diff --git a/Resources/Maps/edge.yml b/Resources/Maps/edge.yml index ac0d34221e..41942a5f55 100644 --- a/Resources/Maps/edge.yml +++ b/Resources/Maps/edge.yml @@ -89368,7 +89368,7 @@ entities: - type: Transform pos: 25.5,8.5 parent: 2 -- proto: LockerQuarterMasterFilled +- proto: LockerQuarterMasterFilledHardsuit entities: - uid: 14741 components: diff --git a/Resources/Maps/elegance.yml b/Resources/Maps/elegance.yml index 6f04fcc7ea..6014213434 100644 --- a/Resources/Maps/elegance.yml +++ b/Resources/Maps/elegance.yml @@ -217140,7 +217140,7 @@ entities: - type: Transform pos: 60.5,41.5 parent: 2 -- proto: LockerQuarterMasterFilled +- proto: LockerQuarterMasterFilledHardsuit entities: - uid: 16143 components: @@ -226710,10 +226710,10 @@ entities: [color=#1a8e22][bold]===================================================[/color][/bold] - Greetings, Elegance Atmospheric Technicians. We hope you are enjoying the complete overhaul of the Engineering department. If not, please feel free to forward your complaints to Central Command. You have a lot more space to tinker with than before, but at the cost of the Thermo-Electric Generator. + Greetings, Elegance Atmospheric Technicians. We hope you are enjoying the complete overhaul of the Engineering department. If not, please feel free to forward your complaints to Central Command. You have a lot more space to tinker with than before, but at the cost of the Thermo-Electric Generator. - We advise that you, generally, should refrain from mindlessly connecting the Water Vapor Inlet to the Distribution Line. While Feroxi may benefit from such a setup, Slimefolk will suffer. + We advise that you, generally, should refrain from mindlessly connecting the Water Vapor Inlet to the Distribution Line. While Feroxi may benefit from such a setup, Slimefolk will suffer. To clarify, this is merely [italic]advice[/italic], of course, but a very important suggestion nonetheless. Again, please feel free to forward any complaints to Central Command. We hope to make Lady Elegance great for all. diff --git a/Resources/Maps/glacier.yml b/Resources/Maps/glacier.yml index 0851e08e08..2afd66317e 100644 --- a/Resources/Maps/glacier.yml +++ b/Resources/Maps/glacier.yml @@ -84243,7 +84243,7 @@ entities: - type: Transform pos: 0.5,17.5 parent: 2 -- proto: LockerQuarterMasterFilled +- proto: LockerQuarterMasterFilledHardsuit entities: - uid: 11146 components: diff --git a/Resources/Maps/hammurabi.yml b/Resources/Maps/hammurabi.yml index 69d46cfc5e..e0b28c5315 100644 --- a/Resources/Maps/hammurabi.yml +++ b/Resources/Maps/hammurabi.yml @@ -197749,7 +197749,7 @@ entities: showEnts: False occludes: True ent: null -- proto: LockerQuarterMasterFilled +- proto: LockerQuarterMasterFilledHardsuit entities: - uid: 13174 components: diff --git a/Resources/Maps/hive.yml b/Resources/Maps/hive.yml index bb97e36326..a531b2615e 100644 --- a/Resources/Maps/hive.yml +++ b/Resources/Maps/hive.yml @@ -139915,7 +139915,7 @@ entities: - type: Transform pos: 77.5,-6.5 parent: 1 -- proto: LockerQuarterMasterFilled +- proto: LockerQuarterMasterFilledHardsuit entities: - uid: 6768 components: diff --git a/Resources/Maps/lighthouse.yml b/Resources/Maps/lighthouse.yml index 2ff360810e..190fa9e1cb 100644 --- a/Resources/Maps/lighthouse.yml +++ b/Resources/Maps/lighthouse.yml @@ -96976,7 +96976,7 @@ entities: - type: Transform pos: -52.5,65.5 parent: 100 -- proto: LockerQuarterMasterFilled +- proto: LockerQuarterMasterFilledHardsuit entities: - uid: 8253 components: diff --git a/Resources/Maps/micro.yml b/Resources/Maps/micro.yml index a4fd939962..00f3b996fd 100644 --- a/Resources/Maps/micro.yml +++ b/Resources/Maps/micro.yml @@ -56704,7 +56704,7 @@ entities: - type: Transform pos: -35.5,9.5 parent: 2 -- proto: LockerQuarterMasterFilled +- proto: LockerQuarterMasterFilledHardsuit entities: - uid: 8659 components: diff --git a/Resources/Maps/pebble.yml b/Resources/Maps/pebble.yml index 8a2939953a..da9ce52700 100644 --- a/Resources/Maps/pebble.yml +++ b/Resources/Maps/pebble.yml @@ -67602,7 +67602,7 @@ entities: - type: Transform pos: -35.5,-29.5 parent: 2 -- proto: LockerQuarterMasterFilled +- proto: LockerQuarterMasterFilledHardsuit entities: - uid: 7618 components: diff --git a/Resources/Maps/shoukou.yml b/Resources/Maps/shoukou.yml index e099939624..e1713c90d7 100644 --- a/Resources/Maps/shoukou.yml +++ b/Resources/Maps/shoukou.yml @@ -73224,7 +73224,7 @@ entities: - type: Transform pos: 15.5,-30.5 parent: 2 -- proto: LockerQuarterMasterFilled +- proto: LockerQuarterMasterFilledHardsuit entities: - uid: 10078 components: diff --git a/Resources/Maps/submarine.yml b/Resources/Maps/submarine.yml index b70f8d860b..9f45148606 100644 --- a/Resources/Maps/submarine.yml +++ b/Resources/Maps/submarine.yml @@ -191603,7 +191603,7 @@ entities: - type: Transform pos: -13.5,-11.5 parent: 2 -- proto: LockerQuarterMasterFilled +- proto: LockerQuarterMasterFilledHardsuit entities: - uid: 15891 components: diff --git a/Resources/Maps/terra.yml b/Resources/Maps/terra.yml index e39f9df460..b5eb40d01a 100644 --- a/Resources/Maps/terra.yml +++ b/Resources/Maps/terra.yml @@ -126212,7 +126212,7 @@ entities: - type: Transform pos: -9.5,38.5 parent: 2 -- proto: LockerQuarterMasterFilled +- proto: LockerQuarterMasterFilledHardsuit entities: - uid: 18678 components: @@ -128998,11 +128998,11 @@ entities: - type: Paper content: >2- - [color=#1b67a5]█▄ █ ▀█▀ + [color=#1b67a5]█▄ █ ▀█▀ █ ▀█     █ [/color] [head=2]Cryogenics Setup Instructions[/head] ───────────────────────────────────────── - Setting up the cryo tubes is actually fairly simple once you learn! For the two filters that you see near the table... set one of them to filter out carbon dioxide, and the other for nitrous oxide. + Setting up the cryo tubes is actually fairly simple once you learn! For the two filters that you see near the table... set one of them to filter out carbon dioxide, and the other for nitrous oxide. On the other side of the piping there is a gas pump. Just turn it on, a pressure of 101.3 kpa is ideal. diff --git a/Resources/Maps/tortuga.yml b/Resources/Maps/tortuga.yml index 859c8bdccd..ecec5517de 100644 --- a/Resources/Maps/tortuga.yml +++ b/Resources/Maps/tortuga.yml @@ -148901,7 +148901,7 @@ entities: showEnts: False occludes: True ent: null -- proto: LockerQuarterMasterFilled +- proto: LockerQuarterMasterFilledHardsuit entities: - uid: 11309 components: diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/cargo.yml index 086aa49535..9d4cf8ba3b 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/cargo.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/cargo.yml @@ -16,6 +16,31 @@ - id: LunchboxLogisticsFilledRandom prob: 0.3 +- type: entityTable + id: LockerFillQuarterMasterHardsuit + table: !type:AllSelector + children: + - id: ClothingOuterHardsuitRhino + - id: ClothingShoesBootsMag + - id: OxygenTankFilled + - id: NitrogenTankFilled + - id: ClothingMaskBreath + +- type: entity + parent: LockerQuarterMaster + id: LockerQuarterMasterFilledHardsuit # I know we don't use Quartermaster but I'm trying to be consistent with LockerQuarterMasterFilled + suffix: Filled, Hardsuit + + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - !type:NestedSelector + tableId: LockerFillQuarterMaster + - !type:NestedSelector + tableId: LockerFillQuarterMasterHardsuit + - type: entity parent: [SalvageGunSafeBaseSecure, BaseSecurityCargoContraband] id: SalvageGunSafeSniperGrand diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml index 3bea526041..2dd1c0b8c7 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml @@ -11,7 +11,6 @@ - id: MiningShuttleConsoleCircuitboard - id: StockTradingCartridge - id: LogisticsTechFabCircuitboard - - id: ClothingOuterHardsuitRhino # LO suit and steal objective - id: SalvageExpeditionsComputerCircuitboard - id: FundingAllocationComputerCircuitboard # To be removed when it's in techvault on all maps - id: LunchboxCommandFilledRandom diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/suit_storage.yml index b967679add..aecf242720 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/suit_storage.yml @@ -61,3 +61,15 @@ - id: ClothingOuterHardsuitCombatCorpsman - id: ClothingMaskBreath - id: ClothingShoesBootsSecurityMagboots #Added security magboots. + +- type: entity + parent: SuitStorageBase + id: SuitStorageQM + suffix: Logistics Officer + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: LockerFillQuarterMasterHardsuit + - type: AccessReader + access: [["Quartermaster"]]