From: Hanz <41141796+Hanzdegloker@users.noreply.github.com> Date: Sat, 27 Jan 2024 17:49:26 +0000 (-0500) Subject: Bartender limited reagents fixup (#24598) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=8fc9650b6e2cd9dbfb1fd05d731c2fad3e0b8165;p=space-station-14.git Bartender limited reagents fixup (#24598) Fixed up bartending after the limited reagents update --- diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml index bebc3fc307..e23a756ca0 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml @@ -87,7 +87,7 @@ cost: 1500 category: Materials group: market - + - type: cargoProduct id: MaterialWaterTank icon: diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml index ab9e1c3235..cc0ee7b996 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml @@ -98,6 +98,26 @@ category: Service group: market +- type: cargoProduct + id: ServiceSodaDispenser + icon: + sprite: Objects/Consumable/Drinks/generic_jug.rsi + state: icon + product: CrateServiceSodaDispenser + cost: 850 + category: Service + group: market + +- type: cargoProduct + id: ServiceBoozeDispenser + icon: + sprite: Objects/Consumable/Drinks/generic_jug.rsi + state: icon + product: CrateServiceBoozeDispenser + cost: 750 + category: Service + group: market + - type: cargoProduct id: ServiceBoxes icon: @@ -116,7 +136,7 @@ product: CrateJanitorBiosuit cost: 800 category: Service - group: market + group: market - type: cargoProduct id: ServiceFoodCartHot @@ -126,7 +146,7 @@ product: FoodCartHot cost: 2000 category: Service - group: market + group: market - type: cargoProduct id: ServiceFoodCartCold @@ -140,7 +160,7 @@ - type: cargoProduct id: ServiceAnimalCarrier - icon: + icon: sprite: Objects/Storage/petcarrier.rsi state: icon product: PetCarrier diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index f78219d33e..707a3929db 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -167,6 +167,54 @@ - id: BookHowToSurvive - id: BookChemicalCompendium +- type: entity + id: CrateServiceSodaDispenser + parent: CrateGenericSteel + name: soda dispenser refill crate + description: Contains refills for soda dispensers. + components: + - type: StorageFill + contents: + - id: DrinkCoffeeJug + - id: DrinkColaBottleFull + - id: DrinkCreamCartonXL + - id: DrinkDrGibbJug + - id: DrinkEnergyDrinkJug + - id: DrinkGreenTeaJug + - id: DrinkIceJug + - id: DrinkJuiceLimeCartonXL + - id: DrinkJuiceOrangeCartonXL + - id: DrinkLemonLimeJug + - id: DrinkRootBeerJug + - id: DrinkSodaWaterBottleFull + - id: DrinkSpaceMountainWindBottleFull + - id: DrinkSpaceUpBottleFull + - id: DrinkSugarJug + - id: DrinkTeaJug + - id: DrinkTonicWaterBottleFull + - id: DrinkWaterMelonJuiceJug + +- type: entity + id: CrateServiceBoozeDispenser + parent: CrateGenericSteel + name: booze dispenser refill crate + description: Contains refills for booze dispensers. + components: + - type: StorageFill + contents: + - id: DrinkAleBottleFullGrowler + - id: DrinkBeerGrowler + - id: DrinkCoffeeLiqueurBottleFull + - id: DrinkCognacBottleFull + - id: DrinkGinBottleFull + - id: DrinkMeadJug + - id: DrinkRumBottleFull + - id: DrinkTequilaBottleFull + - id: DrinkVermouthBottleFull + - id: DrinkVodkaBottleFull + - id: DrinkWhiskeyBottleFull + - id: DrinkWineBottleFull + - type: entity id: CrateServiceBox parent: CratePlastic diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml index ddb7710267..e5dbe2d524 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml @@ -9,6 +9,8 @@ - id: WeaponShotgunDoubleBarreledRubber - id: DrinkShaker - id: ClothingEyesHudBeer + - id: HandLabeler + amount: 1 - id: DrinkBottleBeer prob: 0.5 - id: DrinkBottleBeer diff --git a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml index 62b166ebc1..d337d23f2a 100644 --- a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml +++ b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml @@ -1,43 +1,37 @@ - type: reagentDispenserInventory id: SodaDispenserInventory inventory: - - DrinkIceJug - DrinkCoffeeJug - - DrinkCreamCartonXL - - DrinkTeaJug - - DrinkGreenTeaJug - - DrinkIcedTeaJug - DrinkColaBottleFull - - DrinkSpaceMountainWindBottleFull + - DrinkCreamCartonXL - DrinkDrGibbJug + - DrinkEnergyDrinkJug + - DrinkGreenTeaJug + - DrinkIceJug + - DrinkJuiceLimeCartonXL + - DrinkJuiceOrangeCartonXL + - DrinkLemonLimeJug - DrinkRootBeerJug - - DrinkSpaceUpBottleFull - - DrinkTonicWaterBottleFull - DrinkSodaWaterBottleFull - - DrinkLemonLimeJug + - DrinkSpaceMountainWindBottleFull + - DrinkSpaceUpBottleFull - DrinkSugarJug - - DrinkJuiceOrangeCartonXL - - DrinkJuiceLimeCartonXL + - DrinkTeaJug + - DrinkTonicWaterBottleFull - DrinkWaterMelonJuiceJug - type: reagentDispenserInventory id: BoozeDispenserInventory inventory: - - DrinkLemonLimeJug - - DrinkSugarJug - - DrinkJuiceOrangeCartonXL - - DrinkJuiceLimeCartonXL - - DrinkTonicWaterBottleFull - - DrinkSodaWaterBottleFull + - DrinkAleBottleFullGrowler - DrinkBeerGrowler - DrinkCoffeeLiqueurBottleFull - - DrinkWhiskeyBottleFull - - DrinkWineBottleFull - - DrinkVodkaBottleFull + - DrinkCognacBottleFull - DrinkGinBottleFull + - DrinkMeadJug - DrinkRumBottleFull - DrinkTequilaBottleFull - DrinkVermouthBottleFull - - DrinkCognacBottleFull - - DrinkAleBottleFullGrowler - - DrinkMeadJug + - DrinkVodkaBottleFull + - DrinkWhiskeyBottleFull + - DrinkWineBottleFull diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index 7c6b1bf78f..6c8d9468a2 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -7,6 +7,7 @@ DrinkVacuumFlask: 5 DrinkFlaskBar: 5 DrinkShaker: 5 + CustomDrinkJug: 2 #to allow for custom drinks in the soda/booze dispensers DrinkAbsintheBottleFull: 2 DrinkAleBottleFull: 5 DrinkBeerBottleFull: 5 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index 6c0c719c7a..b90f9ffa5c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -16,7 +16,7 @@ maxVol: 100 - type: Sprite state: icon - sprite: Objects/Consumable/Drinks/water.rsi # fallback to boring water jug + sprite: Objects/Consumable/Drinks/generic_jug.rsi # fallback to generic plastic jug - type: Item size: Normal - type: Damageable @@ -150,6 +150,8 @@ reagents: - ReagentId: Cognac Quantity: 100 + - type: Label + currentLabel: cognac - type: Sprite sprite: Objects/Consumable/Drinks/cognacbottle.rsi @@ -165,6 +167,8 @@ reagents: - ReagentId: Cola Quantity: 100 + - type: Label + currentLabel: cola - type: Sprite sprite: Objects/Consumable/Drinks/colabottle.rsi @@ -199,6 +203,8 @@ reagents: - ReagentId: Gin Quantity: 100 + - type: Label + currentLabel: gin - type: Sprite sprite: Objects/Consumable/Drinks/ginbottle.rsi @@ -229,6 +235,8 @@ reagents: - ReagentId: CoffeeLiqueur Quantity: 100 + - type: Label + currentLabel: coffee liqueur - type: Sprite sprite: Objects/Consumable/Drinks/coffeeliqueurbottle.rsi @@ -307,6 +315,8 @@ - ReagentId: SpaceMountainWind Quantity: 100 - type: Drink + - type: Label + currentLabel: space mountain wind - type: Sprite sprite: Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi @@ -323,6 +333,8 @@ - ReagentId: SpaceUp Quantity: 100 - type: Drink + - type: Label + currentLabel: space-up - type: Sprite sprite: Objects/Consumable/Drinks/space-up_bottle.rsi @@ -372,6 +384,8 @@ reagents: - ReagentId: Vodka Quantity: 100 + - type: Label + currentLabel: vodka - type: Sprite sprite: Objects/Consumable/Drinks/vodkabottle.rsi @@ -442,9 +456,12 @@ reagents: - ReagentId: Beer Quantity: 150 + - type: Label + currentLabel: beer - type: Sprite sprite: Objects/Consumable/Drinks/beer.rsi + - type: entity parent: DrinkBottlePlasticBaseFull id: DrinkAleBottleFull @@ -460,6 +477,7 @@ reagents: - ReagentId: Ale Quantity: 50 + - type: Sprite sprite: Objects/Consumable/Drinks/alebottle.rsi @@ -476,6 +494,8 @@ reagents: - ReagentId: Ale Quantity: 150 + - type: Label + currentLabel: ale - type: Sprite sprite: Objects/Consumable/Drinks/alebottle.rsi @@ -520,6 +540,8 @@ reagents: - ReagentId: SodaWater Quantity: 150 + - type: Label + currentLabel: soda water - type: entity parent: DrinkWaterBottleFull @@ -534,6 +556,8 @@ reagents: - ReagentId: TonicWater Quantity: 150 + - type: Label + currentLabel: tonic water # Cartons, TODO: this needs to be moved elsewhere eventually, since cartons shouldnt smash into glass shards @@ -551,6 +575,8 @@ - ReagentId: JuiceLime Quantity: 150 - type: Drink + - type: Label + currentLabel: lime juice - type: Sprite sprite: Objects/Consumable/Drinks/limejuice.rsi @@ -568,6 +594,8 @@ - ReagentId: JuiceOrange Quantity: 150 - type: Drink + - type: Label + currentLabel: orange juice - type: Sprite sprite: Objects/Consumable/Drinks/orangejuice.rsi @@ -585,6 +613,8 @@ - ReagentId: Cream Quantity: 150 - type: Drink + - type: Label + currentLabel: cream - type: Sprite sprite: Objects/Consumable/Drinks/cream.rsi @@ -620,6 +650,8 @@ - ReagentId: LemonLime Quantity: 300 - type: Drink + - type: Label + currentLabel: lemon-lime - type: entity parent: DrinkBottlePlasticBaseFull @@ -650,6 +682,8 @@ - ReagentId: Ice Quantity: 300 - type: Drink + - type: Label + currentLabel: ice - type: entity parent: DrinkBottlePlasticBaseFull @@ -665,6 +699,8 @@ - ReagentId: Coffee Quantity: 300 - type: Drink + - type: Label + currentLabel: coffee - type: entity parent: DrinkBottlePlasticBaseFull @@ -680,6 +716,8 @@ - ReagentId: Tea Quantity: 300 - type: Drink + - type: Label + currentLabel: tea - type: entity parent: DrinkBottlePlasticBaseFull @@ -695,6 +733,8 @@ - ReagentId: GreenTea Quantity: 300 - type: Drink + - type: Label + currentLabel: green tea - type: entity parent: DrinkBottlePlasticBaseFull @@ -725,6 +765,8 @@ - ReagentId: DrGibb Quantity: 300 - type: Drink + - type: Label + currentLabel: dr gibb - type: entity parent: DrinkBottlePlasticBaseFull @@ -740,6 +782,8 @@ - ReagentId: RootBeer Quantity: 300 - type: Drink + - type: Label + currentLabel: root beer - type: entity parent: DrinkBottlePlasticBaseFull @@ -755,3 +799,34 @@ - ReagentId: JuiceWatermelon Quantity: 300 - type: Drink + - type: Label + currentLabel: watermelon juice + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkEnergyDrinkJug + name: red bool jug + description: A jug of Red Bool, with enough caffine to kill a whole station. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 100 + reagents: + - ReagentId: EnergyDrink + Quantity: 100 + - type: Drink + - type: Label + currentLabel: red bool + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: CustomDrinkJug + name: beverage jug + description: A jug for storing custom made drinks. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + - type: Drink diff --git a/Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/icon.png new file mode 100644 index 0000000000..2cafc197fd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/meta.json new file mode 100644 index 0000000000..db0ac608ed --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Drinks/water.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/water.rsi/icon.png index f1c273ac71..91b094a4df 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/water.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/water.rsi/icon.png differ