Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Bartender limited reagents fixup (#24598)

Browse Source 
Fixed up bartending after the limited reagents update
This commit is contained in:
Hanz
2024-01-27 12:49:26 -05:00
committed by GitHub
parent 82fa771859
commit 8fc9650b6e
10 changed files with 171 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
View File

@@ -87,7 +87,7 @@
cost: 1500 cost: 1500
category: Materials category: Materials
group: market group: market
- type: cargoProduct - type: cargoProduct
id: MaterialWaterTank id: MaterialWaterTank
icon: icon:

26
Resources/Prototypes/Catalog/Cargo/cargo_service.yml
View File

@@ -98,6 +98,26 @@
category: Service category: Service
group: market 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 - type: cargoProduct
id: ServiceBoxes id: ServiceBoxes
icon: icon:
@@ -116,7 +136,7 @@
product: CrateJanitorBiosuit product: CrateJanitorBiosuit
cost: 800 cost: 800
category: Service category: Service
group: market group: market
- type: cargoProduct - type: cargoProduct
id: ServiceFoodCartHot id: ServiceFoodCartHot
@@ -126,7 +146,7 @@
product: FoodCartHot product: FoodCartHot
cost: 2000 cost: 2000
category: Service category: Service
group: market group: market
- type: cargoProduct - type: cargoProduct
id: ServiceFoodCartCold id: ServiceFoodCartCold
@@ -140,7 +160,7 @@
- type: cargoProduct - type: cargoProduct
id: ServiceAnimalCarrier id: ServiceAnimalCarrier
icon: icon:
sprite: Objects/Storage/petcarrier.rsi sprite: Objects/Storage/petcarrier.rsi
state: icon state: icon
product: PetCarrier product: PetCarrier

48
Resources/Prototypes/Catalog/Fills/Crates/service.yml
View File

@@ -167,6 +167,54 @@
- id: BookHowToSurvive - id: BookHowToSurvive
- id: BookChemicalCompendium - 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 - type: entity
id: CrateServiceBox id: CrateServiceBox
parent: CratePlastic parent: CratePlastic

2
Resources/Prototypes/Catalog/Fills/Lockers/service.yml
View File

@@ -9,6 +9,8 @@
- id: WeaponShotgunDoubleBarreledRubber - id: WeaponShotgunDoubleBarreledRubber
- id: DrinkShaker - id: DrinkShaker
- id: ClothingEyesHudBeer - id: ClothingEyesHudBeer
- id: HandLabeler
amount: 1
- id: DrinkBottleBeer - id: DrinkBottleBeer
prob: 0.5 prob: 0.5
- id: DrinkBottleBeer - id: DrinkBottleBeer

44
Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
View File

@@ -1,43 +1,37 @@
- type: reagentDispenserInventory - type: reagentDispenserInventory
id: SodaDispenserInventory id: SodaDispenserInventory
inventory: inventory:
- DrinkIceJug
- DrinkCoffeeJug - DrinkCoffeeJug
- DrinkCreamCartonXL
- DrinkTeaJug
- DrinkGreenTeaJug
- DrinkIcedTeaJug
- DrinkColaBottleFull - DrinkColaBottleFull
- DrinkSpaceMountainWindBottleFull - DrinkCreamCartonXL
- DrinkDrGibbJug - DrinkDrGibbJug
- DrinkRootBeerJug - DrinkEnergyDrinkJug
- DrinkSpaceUpBottleFull - DrinkGreenTeaJug
- DrinkTonicWaterBottleFull - DrinkIceJug
- DrinkSodaWaterBottleFull
- DrinkLemonLimeJug
- DrinkSugarJug
- DrinkJuiceOrangeCartonXL
- DrinkJuiceLimeCartonXL - DrinkJuiceLimeCartonXL
- DrinkJuiceOrangeCartonXL
- DrinkLemonLimeJug
- DrinkRootBeerJug
- DrinkSodaWaterBottleFull
- DrinkSpaceMountainWindBottleFull
- DrinkSpaceUpBottleFull
- DrinkSugarJug
- DrinkTeaJug
- DrinkTonicWaterBottleFull
- DrinkWaterMelonJuiceJug - DrinkWaterMelonJuiceJug
- type: reagentDispenserInventory - type: reagentDispenserInventory
id: BoozeDispenserInventory id: BoozeDispenserInventory
inventory: inventory:
- DrinkLemonLimeJug - DrinkAleBottleFullGrowler
- DrinkSugarJug
- DrinkJuiceOrangeCartonXL
- DrinkJuiceLimeCartonXL
- DrinkTonicWaterBottleFull
- DrinkSodaWaterBottleFull
- DrinkBeerGrowler - DrinkBeerGrowler
- DrinkCoffeeLiqueurBottleFull - DrinkCoffeeLiqueurBottleFull
- DrinkWhiskeyBottleFull - DrinkCognacBottleFull
- DrinkWineBottleFull
- DrinkVodkaBottleFull
- DrinkGinBottleFull - DrinkGinBottleFull
- DrinkMeadJug
- DrinkRumBottleFull - DrinkRumBottleFull
- DrinkTequilaBottleFull - DrinkTequilaBottleFull
- DrinkVermouthBottleFull - DrinkVermouthBottleFull
- DrinkCognacBottleFull - DrinkVodkaBottleFull
- DrinkAleBottleFullGrowler - DrinkWhiskeyBottleFull
- DrinkMeadJug - DrinkWineBottleFull

1
Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
View File

@@ -7,6 +7,7 @@
DrinkVacuumFlask: 5 DrinkVacuumFlask: 5
DrinkFlaskBar: 5 DrinkFlaskBar: 5
DrinkShaker: 5 DrinkShaker: 5
CustomDrinkJug: 2 #to allow for custom drinks in the soda/booze dispensers
DrinkAbsintheBottleFull: 2 DrinkAbsintheBottleFull: 2
DrinkAleBottleFull: 5 DrinkAleBottleFull: 5
DrinkBeerBottleFull: 5 DrinkBeerBottleFull: 5

77
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
View File

@@ -16,7 +16,7 @@
maxVol: 100 maxVol: 100
- type: Sprite - type: Sprite
state: icon 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 - type: Item
size: Normal size: Normal
- type: Damageable - type: Damageable
@@ -150,6 +150,8 @@
reagents: reagents:
- ReagentId: Cognac - ReagentId: Cognac
Quantity: 100 Quantity: 100
- type: Label
currentLabel: cognac
- type: Sprite - type: Sprite
sprite: Objects/Consumable/Drinks/cognacbottle.rsi sprite: Objects/Consumable/Drinks/cognacbottle.rsi
@@ -165,6 +167,8 @@
reagents: reagents:
- ReagentId: Cola - ReagentId: Cola
Quantity: 100 Quantity: 100
- type: Label
currentLabel: cola
- type: Sprite - type: Sprite
sprite: Objects/Consumable/Drinks/colabottle.rsi sprite: Objects/Consumable/Drinks/colabottle.rsi
@@ -199,6 +203,8 @@
reagents: reagents:
- ReagentId: Gin - ReagentId: Gin
Quantity: 100 Quantity: 100
- type: Label
currentLabel: gin
- type: Sprite - type: Sprite
sprite: Objects/Consumable/Drinks/ginbottle.rsi sprite: Objects/Consumable/Drinks/ginbottle.rsi
@@ -229,6 +235,8 @@
reagents: reagents:
- ReagentId: CoffeeLiqueur - ReagentId: CoffeeLiqueur
Quantity: 100 Quantity: 100
- type: Label
currentLabel: coffee liqueur
- type: Sprite - type: Sprite
sprite: Objects/Consumable/Drinks/coffeeliqueurbottle.rsi sprite: Objects/Consumable/Drinks/coffeeliqueurbottle.rsi
@@ -307,6 +315,8 @@
- ReagentId: SpaceMountainWind - ReagentId: SpaceMountainWind
Quantity: 100 Quantity: 100
- type: Drink - type: Drink
- type: Label
currentLabel: space mountain wind
- type: Sprite - type: Sprite
sprite: Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi sprite: Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi
@@ -323,6 +333,8 @@
- ReagentId: SpaceUp - ReagentId: SpaceUp
Quantity: 100 Quantity: 100
- type: Drink - type: Drink
- type: Label
currentLabel: space-up
- type: Sprite - type: Sprite
sprite: Objects/Consumable/Drinks/space-up_bottle.rsi sprite: Objects/Consumable/Drinks/space-up_bottle.rsi
@@ -372,6 +384,8 @@
reagents: reagents:
- ReagentId: Vodka - ReagentId: Vodka
Quantity: 100 Quantity: 100
- type: Label
currentLabel: vodka
- type: Sprite - type: Sprite
sprite: Objects/Consumable/Drinks/vodkabottle.rsi sprite: Objects/Consumable/Drinks/vodkabottle.rsi
@@ -442,9 +456,12 @@
reagents: reagents:
- ReagentId: Beer - ReagentId: Beer
Quantity: 150 Quantity: 150
- type: Label
currentLabel: beer
- type: Sprite - type: Sprite
sprite: Objects/Consumable/Drinks/beer.rsi sprite: Objects/Consumable/Drinks/beer.rsi
- type: entity - type: entity
parent: DrinkBottlePlasticBaseFull parent: DrinkBottlePlasticBaseFull
id: DrinkAleBottleFull id: DrinkAleBottleFull
@@ -460,6 +477,7 @@
reagents: reagents:
- ReagentId: Ale - ReagentId: Ale
Quantity: 50 Quantity: 50
- type: Sprite - type: Sprite
sprite: Objects/Consumable/Drinks/alebottle.rsi sprite: Objects/Consumable/Drinks/alebottle.rsi
@@ -476,6 +494,8 @@
reagents: reagents:
- ReagentId: Ale - ReagentId: Ale
Quantity: 150 Quantity: 150
- type: Label
currentLabel: ale
- type: Sprite - type: Sprite
sprite: Objects/Consumable/Drinks/alebottle.rsi sprite: Objects/Consumable/Drinks/alebottle.rsi
@@ -520,6 +540,8 @@
reagents: reagents:
- ReagentId: SodaWater - ReagentId: SodaWater
Quantity: 150 Quantity: 150
- type: Label
currentLabel: soda water
- type: entity - type: entity
parent: DrinkWaterBottleFull parent: DrinkWaterBottleFull
@@ -534,6 +556,8 @@
reagents: reagents:
- ReagentId: TonicWater - ReagentId: TonicWater
Quantity: 150 Quantity: 150
- type: Label
currentLabel: tonic water
# Cartons, TODO: this needs to be moved elsewhere eventually, since cartons shouldnt smash into glass shards # Cartons, TODO: this needs to be moved elsewhere eventually, since cartons shouldnt smash into glass shards
@@ -551,6 +575,8 @@
- ReagentId: JuiceLime - ReagentId: JuiceLime
Quantity: 150 Quantity: 150
- type: Drink - type: Drink
- type: Label
currentLabel: lime juice
- type: Sprite - type: Sprite
sprite: Objects/Consumable/Drinks/limejuice.rsi sprite: Objects/Consumable/Drinks/limejuice.rsi
@@ -568,6 +594,8 @@
- ReagentId: JuiceOrange - ReagentId: JuiceOrange
Quantity: 150 Quantity: 150
- type: Drink - type: Drink
- type: Label
currentLabel: orange juice
- type: Sprite - type: Sprite
sprite: Objects/Consumable/Drinks/orangejuice.rsi sprite: Objects/Consumable/Drinks/orangejuice.rsi
@@ -585,6 +613,8 @@
- ReagentId: Cream - ReagentId: Cream
Quantity: 150 Quantity: 150
- type: Drink - type: Drink
- type: Label
currentLabel: cream
- type: Sprite - type: Sprite
sprite: Objects/Consumable/Drinks/cream.rsi sprite: Objects/Consumable/Drinks/cream.rsi
@@ -620,6 +650,8 @@
- ReagentId: LemonLime - ReagentId: LemonLime
Quantity: 300 Quantity: 300
- type: Drink - type: Drink
- type: Label
currentLabel: lemon-lime
- type: entity - type: entity
parent: DrinkBottlePlasticBaseFull parent: DrinkBottlePlasticBaseFull
@@ -650,6 +682,8 @@
- ReagentId: Ice - ReagentId: Ice
Quantity: 300 Quantity: 300
- type: Drink - type: Drink
- type: Label
currentLabel: ice
- type: entity - type: entity
parent: DrinkBottlePlasticBaseFull parent: DrinkBottlePlasticBaseFull
@@ -665,6 +699,8 @@
- ReagentId: Coffee - ReagentId: Coffee
Quantity: 300 Quantity: 300
- type: Drink - type: Drink
- type: Label
currentLabel: coffee
- type: entity - type: entity
parent: DrinkBottlePlasticBaseFull parent: DrinkBottlePlasticBaseFull
@@ -680,6 +716,8 @@
- ReagentId: Tea - ReagentId: Tea
Quantity: 300 Quantity: 300
- type: Drink - type: Drink
- type: Label
currentLabel: tea
- type: entity - type: entity
parent: DrinkBottlePlasticBaseFull parent: DrinkBottlePlasticBaseFull
@@ -695,6 +733,8 @@
- ReagentId: GreenTea - ReagentId: GreenTea
Quantity: 300 Quantity: 300
- type: Drink - type: Drink
- type: Label
currentLabel: green tea
- type: entity - type: entity
parent: DrinkBottlePlasticBaseFull parent: DrinkBottlePlasticBaseFull
@@ -725,6 +765,8 @@
- ReagentId: DrGibb - ReagentId: DrGibb
Quantity: 300 Quantity: 300
- type: Drink - type: Drink
- type: Label
currentLabel: dr gibb
- type: entity - type: entity
parent: DrinkBottlePlasticBaseFull parent: DrinkBottlePlasticBaseFull
@@ -740,6 +782,8 @@
- ReagentId: RootBeer - ReagentId: RootBeer
Quantity: 300 Quantity: 300
- type: Drink - type: Drink
- type: Label
currentLabel: root beer
- type: entity - type: entity
parent: DrinkBottlePlasticBaseFull parent: DrinkBottlePlasticBaseFull
@@ -755,3 +799,34 @@
- ReagentId: JuiceWatermelon - ReagentId: JuiceWatermelon
Quantity: 300 Quantity: 300
- type: Drink - 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

BIN
Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

1
Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/meta.json Normal file
View File

@@ -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"}]}

BIN
Resources/Textures/Objects/Consumable/Drinks/water.rsi/icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 316 B

After

Width:  |  Height:  |  Size: 5.7 KiB