diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/booze_dispenser.yml b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/booze_dispenser.yml index 66b2844c9e..24b5de3306 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/booze_dispenser.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/booze_dispenser.yml @@ -21,3 +21,4 @@ - chem.Vodka - chem.Cognac - chem.Kahlua + - chem.Rum diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml index 82da85a1da..be7543e45c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml @@ -6,6 +6,7 @@ - type: Drink openSounds: bottleOpenSounds - type: SolutionContainer + maxVol: 100 - type: Pourable transferAmount: 5 - type: Sprite @@ -34,13 +35,17 @@ - type: entity parent: DrinkBottleBaseFull id: DrinkAbsintheBottleFull - name: jailbreaker verte + name: Jailbreaker Verte description: One sip of this and you just know you're gonna have a good time. components: - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/absinthebottle.rsi - + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Absinthe + Quantity: 100 - type: entity parent: DrinkBottleBaseFull @@ -56,15 +61,15 @@ - type: entity parent: DrinkBottleBaseFull id: DrinkAleBottleFull - name: magm-ale + name: Magm-Ale description: A true dorf's drink of choice. components: - type: SolutionContainer - maxVol: 80 + maxVol: 100 contents: reagents: - ReagentId: chem.Ale - Quantity: 80 + Quantity: 100 - type: Sprite sprite: Objects/Consumable/Drinks/alebottle.rsi @@ -87,11 +92,10 @@ description: A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time. components: - type: SolutionContainer - maxVol: 80 contents: reagents: - ReagentId: chem.Cognac - Quantity: 80 + Quantity: 100 - type: Sprite sprite: Objects/Consumable/Drinks/cognacbottle.rsi @@ -99,13 +103,17 @@ - type: entity parent: DrinkBottleBaseFull id: DrinkGinBottleFull - name: griffeater gin bottle + name: Griffeater Gin description: A bottle of high quality gin, produced in the New London Space Station. components: - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/ginbottle.rsi - + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Gin + Quantity: 100 - type: entity parent: DrinkBottleBaseFull diff --git a/Resources/Prototypes/Reagents/drinks.yml b/Resources/Prototypes/Reagents/drinks.yml index 7b7fd1d7f7..f11b3ec508 100644 --- a/Resources/Prototypes/Reagents/drinks.yml +++ b/Resources/Prototypes/Reagents/drinks.yml @@ -1,3 +1,11 @@ +- type: reagent + id: chem.Absinthe + name: absinthe + desc: One sip of this and you just know you're gonna have a good time. + spritePath: absintheglass.rsi + color: "#33EE00" + physicalDesc: strong-smelling + - type: reagent id: chem.Whiskey name: whiskey @@ -38,9 +46,18 @@ - type: reagent id: chem.Vodka name: vodka - desc: The glass contain wodka. Хуита. + desc: The glass contain wodka. Хуета. physicalDesc: strong-smelling color: "#d1d1d155" + spritePath: ginvodkaglass.rsi + +- type: reagent + id: chem.Gin + name: gin + desc: A crystal clear glass of Griffeater gin. + physicalDesc: strong-smelling + color: "#664300" + spritePath: ginvodkaglass.rsi - type: reagent id: chem.Rum @@ -48,6 +65,7 @@ desc: Popular with the sailors. Not very popular with anyone else. physicalDesc: strong-smelling color: "#664300" + spritePath: rumglass.rsi - type: reagent id: chem.Moonshine