From b00a9a721b85fbcaafa4ee6a80f6c8e24cec11de Mon Sep 17 00:00:00 2001 From: Field Command <159087063+FieldCommand@users.noreply.github.com> Date: Thu, 17 Apr 2025 13:08:16 +0200 Subject: [PATCH] Command Boozeomat (#3493) * Command Boozeomat * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Fixes --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .../Service/vending_machine_restock.yml | 2 + .../Inventories/commandboozeomat.yml | 39 +++++++++++++++++++ .../Inventories/unlockedboozeomat.yml | 1 + .../Structures/Machines/vending_machines.yml | 12 +++++- 4 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/commandboozeomat.yml diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml index eaedb9cbb0..595b2f180d 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -53,6 +53,8 @@ - type: VendingMachineRestock canRestock: - BoozeOMatInventory + - BoozeOMatUnlockedInventory # DeltaV - Make maint booz-o-mat refillable + - BoozeOMatCommandInventory # DeltaV - Make command booz-o-mat refillable - type: Sprite layers: - state: base diff --git a/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/commandboozeomat.yml b/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/commandboozeomat.yml new file mode 100644 index 0000000000..a95d811c19 --- /dev/null +++ b/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/commandboozeomat.yml @@ -0,0 +1,39 @@ +- type: vendingMachineInventory + id: BoozeOMatCommandInventory + startingInventory: + DrinkGlass: 10 #Kept glasses at top for ease to differentiate from booze. + DrinkShotGlass: 5 + DrinkGlassCoupeShaped: 5 + DrinkVacuumFlask: 2 + DrinkFlaskBar: 2 + DrinkShaker: 2 + DrinkJigger: 1 + DrinkIceBucket: 1 + BarSpoon: 1 + CustomDrinkJug: 1 #to allow for custom drinks in the soda/booze dispensers + DrinkAbsintheBottleFull: 1 + DrinkBlueCuracaoBottleFull: 1 + DrinkCognacBottleFull: 2 + DrinkCoconutWaterCarton: 1 + DrinkMilkCarton: 1 + DrinkCreamCarton: 2 + DrinkGinBottleFull: 2 + DrinkGildlagerBottleFull: 1 #if champagne gets less because its premium, then gildlager should match this and have two + DrinkGrenadineBottleFull: 1 + DrinkJuiceLimeCarton: 2 + DrinkJuiceLemonCarton: 2 + DrinkJuiceOrangeCarton: 2 + DrinkJuiceTomatoCarton: 1 + DrinkCoffeeLiqueurBottleFull: 1 + DrinkMelonLiquorBottleFull: 2 + DrinkPatronBottleFull: 1 + DrinkRumBottleFull: 2 + DrinkSodaWaterCan: 4 + DrinkTequilaBottleFull: 1 + DrinkTonicWaterCan: 4 + DrinkVermouthBottleFull: 1 + DrinkVodkaBottleFull: 1 + DrinkWhiskeyBottleFull: 2 + DrinkWineBottleFull: 3 + DrinkChampagneBottleFull: 1 #because the premium drink + DrinkAngobittersBottleFull: 1 #Angostura Bitters Bottle diff --git a/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/unlockedboozeomat.yml b/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/unlockedboozeomat.yml index b2393fe9db..2825e11f88 100644 --- a/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/unlockedboozeomat.yml +++ b/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/unlockedboozeomat.yml @@ -7,6 +7,7 @@ DrinkVacuumFlask: 1 DrinkFlaskBar: 1 DrinkShaker: 4 + BarSpoon: 1 #quality of life CustomDrinkJug: 2 #to allow for custom drinks in the soda/booze dispensers DrinkAleBottleFull: 8 DrinkBeerBottleFull: 8 diff --git a/Resources/Prototypes/_DV/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_DV/Entities/Structures/Machines/vending_machines.yml index ae5679ba13..c6d004fab8 100644 --- a/Resources/Prototypes/_DV/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_DV/Entities/Structures/Machines/vending_machines.yml @@ -29,9 +29,19 @@ - type: entity parent: VendingMachineBooze id: VendingMachineBoozeUnlocked - suffix: Unlocked + suffix: Unlocked, Maint components: - type: VendingMachine pack: BoozeOMatUnlockedInventory - type: AccessReader enabled: false + +- type: entity + parent: VendingMachineBooze + id: VendingMachineBoozeCommand + suffix: Command + components: + - type: VendingMachine + pack: BoozeOMatCommandInventory + - type: AccessReader + access: [["Command"]]