diff --git a/Resources/Prototypes/Body/Mechanisms/human.yml b/Resources/Prototypes/Body/Mechanisms/human.yml index 09e705b2f3..a77022fb8f 100644 --- a/Resources/Prototypes/Body/Mechanisms/human.yml +++ b/Resources/Prototypes/Body/Mechanisms/human.yml @@ -299,7 +299,7 @@ Milk: effects: - !type:SatiateThirst - SpoiledMilk: + MilkSpoiled: effects: - !type:SatiateThirst hydrationFactor: -2 @@ -315,7 +315,7 @@ effects: - !type:SatiateThirst hydrationFactor: 0.5 # sodaboys stay losing - ThirteenLoko: + FourteenLoko: effects: - !type:SatiateThirst hydrationFactor: 2 @@ -336,8 +336,169 @@ size: 1 compatibility: Biological - type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol. - metabolisms: # TODO add the rest of alcohol - CreamyDelight: + metabolisms: # TODO there needs to be a better way to do this than just add every damn drink + #Basic Alchohol + Ale: + effects: + - !type:SatiateThirst + Beer: + effects: + - !type:SatiateThirst + BlueCuracao: + effects: + - !type:SatiateThirst + Cognac: + effects: + - !type:SatiateThirst + DeadRum: + effects: + - !type:SatiateThirst + Gin: + effects: + - !type:SatiateThirst + Kahlua: + effects: + - !type:SatiateThirst + MelonLiquor: + effects: + - !type:SatiateThirst + NTCahors: + effects: + - !type:SatiateThirst + PoisonWine: + effects: + - !type:SatiateThirst + - !type:HealthChange + damage: + types: + Poison: 1 + Rum: + effects: + - !type:SatiateThirst + Sake: + effects: + - !type:SatiateThirst + Tequila: + effects: + - !type:SatiateThirst + Vermouth: + effects: + - !type:SatiateThirst + Vodka: + effects: + - !type:SatiateThirst + Whiskey: + effects: + - !type:SatiateThirst + Wine: + effects: + - !type:SatiateThirst + + #Mixed Alcohol + + AcidSpit: + effects: + - !type:SatiateThirst + AlliesCocktail: + effects: + - !type:SatiateThirst + Aloe: + effects: + - !type:SatiateThirst + Amasec: + effects: + - !type:SatiateThirst + Andalusia: + effects: + - !type:SatiateThirst + Antifreeze: + effects: + - !type:SatiateThirst + AtomicBomb: + effects: + - !type:SatiateThirst + B52: + effects: + - !type:SatiateThirst + BahamaMama: + effects: + - !type:SatiateThirst + BananaHonk: + effects: + - !type:SatiateThirst + Barefoot: + effects: + - !type:SatiateThirst + BeepskySmash: + effects: + - !type:SatiateThirst + Bilk: + effects: + - !type:SatiateThirst + BlackRussian: + effects: + - !type:SatiateThirst + BloodyMary: + effects: + - !type:SatiateThirst + Booger: + effects: + - !type:SatiateThirst + BraveBull: + effects: + - !type:SatiateThirst + BrownStar: + effects: + - !type:SatiateThirst + CubaLibre: + effects: + - !type:SatiateThirst + DemonsBlood: + effects: + - !type:SatiateThirst + DevilsKiss: + effects: + - !type:SatiateThirst + DoctorsDelight: + effects: + - !type:SatiateThirst + DriestMartini: + effects: + - !type:SatiateThirst + ErikaSuprise: + effects: + - !type:SatiateThirst + GargleBlaster: + effects: + - !type:SatiateThirst + GinTonic: + effects: + - !type:SatiateThirst + Goldschlager: + effects: + - !type:SatiateThirst + Grog: + effects: + - !type:SatiateThirst + HippiesDelight: + effects: + - !type:SatiateThirst + Hooch: + effects: + - !type:SatiateThirst + IcedBeer: + effects: + - !type:SatiateThirst + IrishCarBomb: + effects: + - !type:SatiateThirst + IrishCream: + effects: + - !type:SatiateThirst + IrishCoffee: + effects: + - !type:SatiateThirst + KiraSpecial: effects: - !type:SatiateThirst Lean: @@ -346,6 +507,99 @@ LeanShine: # who added this? effects: - !type:SatiateThirst + LongIslandIcedTea: + effects: + - !type:SatiateThirst + Manhattan: + effects: + - !type:SatiateThirst + ManhattanProject: + effects: + - !type:SatiateThirst + ManlyDorf: + effects: + - !type:SatiateThirst + Margarita: + effects: + - !type:SatiateThirst + Martini: + effects: + - !type:SatiateThirst + Mead: + effects: + - !type:SatiateThirst + Mojito: + effects: + - !type:SatiateThirst + Moonshine: + effects: + - !type:SatiateThirst + Neurotoxin: #This should be moved out of alcohol eventually + effects: + - !type:SatiateThirst + - !type:HealthChange + damage: + types: + Poison: 1 + Patron: + effects: + - !type:SatiateThirst + RedMead: + effects: + - !type:SatiateThirst + Rewriter: + effects: + - !type:SatiateThirst + Sbiten: + effects: + - !type:SatiateThirst + ScrewdriverCocktail: + effects: + - !type:SatiateThirst + Silencer: + effects: + - !type:SatiateThirst + Singulo: + effects: + - !type:SatiateThirst + SnowWhite: + effects: + - !type:SatiateThirst + SuiDream: + effects: + - !type:SatiateThirst + TequilaSunrise: + effects: + - !type:SatiateThirst + ThreeMileIsland: + effects: + - !type:SatiateThirst + ToxinsSpecial: + effects: + - !type:SatiateThirst + VodkaMartini: + effects: + - !type:SatiateThirst + VodkaTonic: + effects: + - !type:SatiateThirst + WhiskeyCola: + effects: + - !type:SatiateThirst + WhiskeySoda: + effects: + - !type:SatiateThirst + WhiteRussian: + effects: + - !type:SatiateThirst + FourteenLoko: + effects: + - !type:SatiateThirst + hydrationFactor: 2 + - !type:HealthChange + damage: + types: + Poison: 1 - type: entity id: OrganHumanKidneys diff --git a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml index 718af1cd90..e08d1b8872 100644 --- a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml +++ b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml @@ -1,23 +1,53 @@ - type: reagentDispenserInventory id: SodaDispenserInventory inventory: - - Coffee - - Cola - - Cream - - Ice - - Tea + - Water - - ThirteenLoko + - Ice + - Coffee + - Cream + - Tea + - GreenTea + - IcedTea + - IcedGreenTea + - Cola + - SpaceMountainWind + - DrGibb + - SpaceUp + - TonicWater + - SodaWater + - LemonLime + - Sugar + - JuiceOrange + - JuiceLime + - JuiceWatermelon + ###Hacked + #- Fourteen Loko + #- GrapeSoda - type: reagentDispenserInventory id: BoozeDispenserInventory inventory: - - Ale + - LemonLime + - Sugar + - JuiceOrange + - JuiceLime + - SodaWater + - TonicWater - Beer - - Cognac - - Ice - Kahlua - - Rum - - Vodka - Whiskey - Wine + - Vodka + - Gin + - Rum + - Tequila + - Vermouth + - Cognac + - Ale + - Mead + ###Hacked + #- Goldschlager + #- Patron + #- JuiceWatermelon + #- JuiceBerry diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index a624a238d5..b7d72b78b4 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -3,19 +3,31 @@ name: Booze-O-Mat spriteName: boozeomat startingInventory: - DrinkGlass: 20 #Kept glasses at top for ease to differentiate from booze. + + DrinkGlass: 30 #Kept glasses at top for ease to differentiate from booze. DrinkAbsintheBottleFull: 3 - DrinkAlcoGreenFull: 3 - DrinkAleBottleFull: 3 - DrinkBeer: 10 - DrinkCognacBottleFull: 3 - DrinkGinBottleFull: 3 + DrinkAleBottleFull: 6 + DrinkBeer: 6 # Needs to be renamed DrinkBeerBottleFull + DrinkBlueCuracaoBottleFull: 2 + DrinkCognacBottleFull: 5 + DrinkColaBottleFull: 5 + DrinkCreamCarton: 4 + DrinkGinBottleFull: 5 DrinkGoldschlagerBottleFull: 3 - DrinkKahluaBottleFull: 3 + DrinkGrenadineBottleFull: 5 + DrinkJuiceLimeCarton: 4 + DrinkJuiceOrangeCarton: 4 + DrinkJuiceTomatoCarton: 4 + DrinkKahluaBottleFull: 5 + DrinkMelonLiquorBottleFull: 2 DrinkPatronBottleFull: 3 - DrinkRumbottleFull: 5 - DrinkTequilabottleFull: 1 - DrinkVermouthBottleFull: 3 - DrinkVodkaBottleFull: 4 - DrinkWhiskeyBottleFull: 2 - DrinkWineBottleFull: 3 + DrinkRumBottleFull: 5 + DrinkSodaWaterCan: 15 + DrinkSpaceMountainWindBottleFull: 5 + DrinkSpaceUpBottleFull: 5 + DrinkTequilaBottleFull: 5 + DrinkTonicWaterCan: 8 + DrinkVermouthBottleFull: 5 + DrinkVodkaBottleFull: 5 + DrinkWhiskeyBottleFull: 5 + DrinkWineBottleFull: 5 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml index 6f570b619a..4798632d1e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml @@ -6,9 +6,9 @@ startingInventory: DrinkColaCan: 10 DrinkGrapeCan: 10 - DrinkIceTeaCan: 10 + DrinkIcedTeaCan: 10 DrinkLemonLimeCan: 10 DrinkSpaceMountainWindCan: 10 DrinkSpaceUpCan: 10 DrinkStarkistCan: 10 - DrinkThirteenLokoCan: 10 + DrinkFourteenLokoCan: 10 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml index 5b9ca76081..ab70884de9 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml @@ -1,6 +1,5 @@ # TODO: Find remaining cans and move to drinks_cans # TODO: Find empty containers (e.g. mug, pitcher) and move to their own yml -# TODO: Move bottles to their own yml - type: entity parent: BaseItem id: DrinkBase @@ -88,50 +87,146 @@ - type: entity parent: DrinkGlassBase - id: DrinkAleglass - name: ale - description: A dark alchoholic beverage made with malted barley and yeast. + id: DrinkAbsintheGlass + name: absinthe glass + description: Wormwood, anise, oh my. components: - type: SolutionContainerManager solutions: drink: - maxVol: 20 + maxVol: 50 + reagents: + - ReagentId: Absinthe + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/absintheglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkAcidSpitGlass + name: acid spit glass + description: A drink from the company archives. Made from live aliens. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: AcidSpit + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/acidspitglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkAleGlass + name: ale glass + description: A freezing pint of delicious ale + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 reagents: - ReagentId: Ale - Quantity: 20 + Quantity: 50 - type: Sprite sprite: Objects/Consumable/Drinks/aleglass.rsi - type: entity parent: DrinkGlassBase - id: DrinkAntifreeze - name: anti-freeze - description: Ultimate refreshment. + id: DrinkAlliesCocktail + name: allies cocktail + description: A drink made from your allies. components: - type: SolutionContainerManager solutions: drink: - maxVol: 20 + maxVol: 50 + reagents: + - ReagentId: AlliesCocktail + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/alliescocktail.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkAloe + name: aloe glass + description: Very, very, very good. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Aloe + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/aloe.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkAmasecGlass + name: amasec glass + description: Always handy before COMBAT!!! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Amasec + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/amasecglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkAndalusia + name: andalusia glass + description: A nice drink with a strange name. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Andalusia + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/andalusia.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkAntifreeze + name: anti-freeze glass + description: The ultimate refreshment. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 reagents: - ReagentId: Antifreeze - Quantity: 20 + Quantity: 50 - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/antifreeze.rsi - type: entity parent: DrinkGlassBase - id: DrinkAtomicbombglass + id: DrinkAtomicBombGlass name: atomic bomb glass - description: Nuclear proliferation never tasted so good. + description: We cannot take legal responsibility for your actions after imbibing. components: - type: SolutionContainerManager solutions: drink: - maxVol: 20 + maxVol: 50 reagents: - ReagentId: AtomicBomb - Quantity: 20 + Quantity: 50 - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/atomicbombglass.rsi @@ -145,63 +240,95 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 20 + maxVol: 50 reagents: - ReagentId: B52 - Quantity: 20 + Quantity: 50 - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/b52glass.rsi - type: entity parent: DrinkGlassBase - id: DrinkBananahonkglass - name: bananahonk glass - description: A drink from Clown Heaven. + id: DrinkBahamaMama + name: bahama mama glass + description: Tropical cocktail. components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: BahamaMama + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/bahama_mama.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkBananaHonkGlass + name: banana honk glass + description: A drink from Banana Heaven. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: BananaHonk + Quantity: 50 - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/bananahonkglass.rsi +- type: entity + parent: DrinkGlassBase + id: DrinkBarefootHonkGlass + name: bareroot glass + description: Barefoot and pregnant. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Barefoot + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/b&p.rsi + - type: entity parent: DrinkGlassBase id: DrinkBeepskySmashGlass name: beepsky smash glass - description: Deny drinking this and prepare for THE LAW. + description: Heavy, hot and strong. Just like the Iron fist of the LAW. components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: BeepskySmash + Quantity: 50 - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/beepskysmashglass.rsi -- type: entity - parent: DrinkGlassBase - id: DrinkBeer - name: beer # beer it is. coffee. beer? coff-ee? be-er? c-o... b-e - description: An alcoholic beverage made from malted grains, hops, yeast, and water. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: Beer - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/beer.rsi - - type: entity parent: DrinkGlassBase id: DrinkBeerglass name: beer glass - description: An alcoholic beverage made from malted grains, hops, yeast, and water. + description: A freezing pint of beer. components: - type: SolutionContainerManager solutions: drink: - maxVol: 20 + maxVol: 50 reagents: - ReagentId: Beer - Quantity: 20 + Quantity: 50 - type: Sprite sprite: Objects/Consumable/Drinks/beerglass.rsi @@ -209,35 +336,83 @@ parent: DrinkGlassBase id: DrinkBerryJuice name: berry juice - description: A delicious blend of several different kinds of berries. + description: Berry juice. Or maybe it's jam. Who cares? components: - type: Drink - type: SolutionContainerManager solutions: drink: - maxVol: 20 + maxVol: 50 reagents: - ReagentId: JuiceBerry - Quantity: 20 + Quantity: 50 - type: Sprite sprite: Objects/Consumable/Drinks/berryjuice.rsi +- type: entity + parent: DrinkGlassBase + id: DrinkBilkGlass + name: bilk + description: A brew of milk and beer. For those alcoholics who fear osteoporosis. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Bilk + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/glass_brown.rsi + - type: entity parent: DrinkGlassBase id: DrinkBlackRussianGlass name: black russian glass description: For the lactose-intolerant. Still as classy as a White Russian. components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: BlackRussian + Quantity: 50 - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/blackrussianglass.rsi +- type: entity + parent: DrinkGlassBase + id: DrinkBlueCuracaoGlass + name: blue curacao + description: Exotically blue, fruity drink, distilled from oranges. + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: BlueCuracao + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/curacaoglass.rsi + - type: entity parent: DrinkGlassBase id: DrinkBloodyMaryGlass name: bloody mary glass - description: A strange yet pleasurable mixture made of vodka, tomato and lime juice. Tastes like liquid murder + description: Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder. components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: BloodyMary + Quantity: 50 - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/bloodymaryglass.rsi @@ -248,6 +423,13 @@ name: booger description: Ewww... components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Booger + Quantity: 50 - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/booger.rsi @@ -256,8 +438,15 @@ parent: DrinkGlassBase id: DrinkBraveBullGlass name: brave bull glass - description: It's just as effective as Dutch-Courage! + description: Tequilla and coffee liquor, brought together in a mouthwatering mixture. Drink up. components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: BraveBull + Quantity: 50 - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/bravebullglass.rsi @@ -269,9 +458,1597 @@ description: It's not what it sounds like... components: - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: BrownStar + Quantity: 50 - type: Sprite sprite: Objects/Consumable/Drinks/brownstar.rsi +- type: entity + parent: DrinkGlassBase + id: DrinkCarrotJuice + name: carrot juice + description: It is just like a carrot but without crunching. + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: JuiceCarrot + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/carrotjuice.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkChocolateGlass + name: hot chocolate + description: A heated drink consisting melted chocolate and heated milk. + components: + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/chocolateglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkCafeLatte + name: cafe latte + description: A nice, strong and tasty beverage while you are reading. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: CafeLatte + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/cafe_latte.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkCoffee + name: coffee + description: Don't drop it, or you'll send scalding liquid and glass shards everywhere. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Coffee + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/coffee.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkCognacGlass + name: cognac glass + description: Damn, you feel like some kind of French aristocrat just by holding this. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Cognac + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/cognacglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkCream + name: cream + description: Ewwww... + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Cream + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/cream.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkCubaLibreGlass + name: cuba libre glass + description: A classic mix of rum and cola. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: CubaLibre + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/cubalibreglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkDeadRumGlass + name: deadrum glass + description: Popular with the sailors. Not very popular with everyone else. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: DeadRum + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/rumglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkDemonsBlood + name: demons blood + description: Just looking at this thing makes the hair at the back of your neck stand up. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: DemonsBlood + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/demonsblood.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkDevilsKiss + name: devil's kiss + description: Creepy time! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: DevilsKiss + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/devilskiss.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkDoctorsDelightGlass + name: the doctor's delight + description: A healthy mixture of juices, guaranteed to keep you healthy until the next toolboxing takes place. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: DoctorsDelight + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/doctorsdelightglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkDriestMartiniGlass + name: driest martini glass + description: Only for the experienced. You think you see sand floating in the glass. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: DriestMartini + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/driestmartiniglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkDrGibbGlass + name: Dr. Gibb glass + description: Dr. Gibb. Not as dangerous as the name might imply. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: DrGibb + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/dr_gibb_glass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkErikaSurprise + name: erika surprise + description: The surprise is, it's green! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: ErikaSuprise + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/erikasurprise.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkFourteenLokoGlass + name: Fourteen loko glass + description: This is a container of Fourteen Loko, it appears to be of the highest quality. The drink, not the container. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: FourteenLoko + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/fourteen_loko_glass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkGargleBlasterGlass + name: pan-galactic gargle blaster + description: Does... does this mean that Arthur and Ford are on the ship? Oh joy. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: GargleBlaster + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/gargleblasterglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkGinGlass + name: Gin + description: Crystal clear Griffeater gin. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Gin + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkGinFizzGlass + name: gin fizz glass + description: Refreshingly lemony, deliciously dry. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: GinFizz + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/ginfizzglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkGinTonicglass + name: gin and tonic + description: A mild but still great cocktail. Drink up, like a true Englishman. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: GinTonic + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/gintonicglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkGoldschlagerGlass + name: goldschlager glass + description: 100 proof that teen girls will drink anything with gold in it. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Goldschlager + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/goldschlagerglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkGrapeJuice + name: grape juice + description: It's grrrrrape! + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: JuiceGrape + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/grapejuice.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkGrapeSodaGlass + name: grape soda glass + description: Looks like a delicious drink! + components: + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/gsodaglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkGreenTeaGlass + name: green tea glass + description: Tasty green tea. It has antioxidants; it's good for you! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: GreenTea + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/glass_green.rsi #Placeholder + +- type: entity + parent: DrinkGlassBase + id: DrinkGrenadineGlass + name: grenadine syrup glass + description: Sweet and tangy, a bar syrup used to add color or flavor to drinks. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Grenadine + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/grenadineglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkGrogGlass + name: grog glass + description: A fine and cepa drink for Space. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Grog + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/grogglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkHell + name: hell ramen + description: The noodles are boiled, the flavors are artificial, just like being back in school. + components: + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/hell.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkHippiesDelightGlass + name: hippies' delight glass + description: A drink enjoyed by people during the 1960's. + components: + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/hippiesdelightglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkHoochGlass + name: hooch + description: You've really hit rock bottom now... your liver packed its bags and left last night. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Hooch + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/glass_brown2.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkIcedCoffeeGlass + name: iced coffee glass + description: A drink to perk you up and refresh you! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: IcedCoffee + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/icedcoffeeglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkIcedGreenTeaGlass + name: iced green tea glass + description: It looks like green tea with ice. One might even call it iced green tea. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: IcedGreenTea + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/glass_green.rsi #Placeholder + +- type: entity + parent: DrinkGlassBase + id: DrinkIcedTeaGlass + name: iced tea + description: A refreshing southern beverage. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: IcedTea + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/icedteaglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkIcedBeerGlass + name: iced beer glass + description: A beer so frosty, the air around it freezes. + components: + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/iced_beerglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkIceGlass + name: ice glass + description: Generally, you're supposed to put something else in there too... + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Ice + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/iceglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkIrishCarBomb + name: irish car bomb + description: An irish car bomb. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: IrishCarBomb + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/irishcarbomb.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkIrishCoffeeGlass + name: irish coffee glass + description: Coffee and alcohol. More fun than a Mimosa to drink in the morning. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: IrishCoffee + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/irishcoffeeglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkIrishCreamGlass + name: irish cream glass + description: It's cream, mixed with whiskey. What else would you expect from the Irish? + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: IrishCream + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/irishcreamglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkKahluaGlass + name: kahlua glass + description: DAMN, THIS THING LOOKS ROBUST + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Kahlua + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/kahluaglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkKiraSpecial + name: kira special + description: Long live the guy who everyone had mistaken for a girl. Baka! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: KiraSpecial + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/kiraspecial.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkLemonadeGlass + name: lemonade glass + description: Oh the nostalgia... + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Lemonade + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/lemonadeglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkLemonJuice + name: lemon juice + description: Sour... + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: JuiceLemon + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/lemonjuice.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkLemonLime + name: lemon lime + description: A tangy substance made of 0.5% natural citrus! + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: LemonLime + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/lemonlime.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkLimeJuice + name: lime juice + description: It's some sweet-sour lime juice. + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: JuiceLime + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/limejuice.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkLongIslandIcedTeaGlass + name: long island iced tea glass + description: The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: LongIslandIcedTea + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/longislandicedteaglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkManhattanGlass + name: manhattan glass + description: The Detective's undercover drink of choice. He never could stomach gin... + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Manhattan + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/manhattanglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkManhattanProjectGlass + name: manhattan project glass + description: A scientist's drink of choice, for pondering ways to blow up the station. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: ManhattanProject + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/proj_manhattanglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkManlyDorfGlass + name: the manly dorf glass + description: A manly concotion made from Ale and Beer. Intended for true men only. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: ManlyDorf + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/manlydorfglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkMargaritaGlass + name: margarita glass + description: On the rocks with salt on the rim. Arriba~! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Margarita + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/margaritaglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkMartiniGlass + name: classic martini glass + description: Damn, the bartender even stirred it, not shook it. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Martini + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/martiniglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkMeadGlass + name: mead glass + description: A Viking's beverage, though a cheap one. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Mead + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/meadglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkMilkshake + name: milkshake + description: Glorious brainfreezing mixture. + components: + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/milkshake.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkMojito + name: mojito + description: Fresh from Spesscuba. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Mojito + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/mojito.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkNeurotoxinGlass + name: neurotoxin glass + description: A drink that is guaranteed to knock you silly. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Neurotoxin + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/neurotoxinglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkNothing + name: nothing + description: Absolutely nothing. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Nothing + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/nothing.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkNTCahors + name: neotheology cahors whine + description: It looks like wine, but more dark. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: NTCahors + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/ntcahors.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkNukaColaGlass + name: nuka cola glass + description: Don't cry, Don't raise your eye, It's only nuclear wasteland. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: NukaCola + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/nuka_colaglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkOrangeJuice + name: orange juice + description: Vitamins! Yay! + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: JuiceOrange + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/orangejuice.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkPatronGlass + name: patron glass + description: Drinking patron in the bar, with all the subpar ladies. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Patron + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/patronglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkPoisonBerryJuice + name: poison berry juice + description: Looks like some deadly juice. + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: JuiceBerryPoison + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/poisonberryjuice.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkPoisonWineGlass + name: poison wine glass + description: A black ichor with an oily purple sheer on top. Are you sure you should drink this? + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: PoisonWine + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/pwineglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkRamen + name: cup ramen + description: Just add 10ml water, self heats! A taste that reminds you of your school years. + components: + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/ramen.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkRedMeadGlass + name: red mead glass + description: A true Viking's beverage, though its color is strange. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: RedMead + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/red_meadglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkRewriter + name: rewriter + description: The secret of the sanctuary of the Libarian... + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Rewriter + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/rewriter.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkRumGlass + name: rum glass + description: Now you want to Pray for a pirate suit, don't you? + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Rum + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/rumglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkSakeGlass + name: sake glass + description: Wine made from rice, it's sake! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Sake + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkSbitenGlass + name: sbiten glass + description: A spicy mix of Vodka and Spice. Very hot. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Sbiten + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/sbitenglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkScrewdriverCocktailGlass + name: screwdriver glass + description: A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: ScrewdriverCocktail + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/screwdriverglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkSuiDreamGlass + name: sui dream glass + description: A froofy, fruity, and sweet mixed drink. Understanding the name only brings shame. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: SuiDream + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/sdreamglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkEmeraldGlass + name: melon liquor + description: A relatively sweet and fruity 46 proof liquor. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: MelonLiquor + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/emeraldglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkMoonshineGlass + name: moonshine + description: You've really hit rock bottom now... your liver packed its bags and left last night. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Moonshine + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/glass_clear.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkGlassWhite + name: milk + description: White and nutritious goodness! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Milk + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/glass_white.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkSilencerGlass + name: silencer glass + description: A drink from Mime Heaven. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Silencer + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/silencerglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkSingulo + name: singulo + description: A blue-space beverage! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Singulo + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/singulo.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkSnowWhite + name: snow white + description: A cold refreshment. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: SnowWhite + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/snowwhite.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkSoyLatte + name: soy latte + description: A nice and refrshing beverage while you are reading. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: SoyLatte + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/soy_latte.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkSpaceUpGlass + name: space-up glass + description: Space-up. It helps keep your cool. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: SpaceUp + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/space-up_glass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkSpaceMountainWindGlass + name: space mountain wind glass + description: Space Mountain Wind. As you know, there are no mountains in space, only wind. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: SpaceMountainWind + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/space_mountain_wind_glass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkSyndicatebomb + name: syndicate bomb + description: Tastes like terrorism! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: SyndicateBomb + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/syndicatebomb.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkTeaGlass + name: tea glass + description: Tasty black tea. It has antioxidants; it's good for you! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Tea + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/teaglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkTeapot + name: teapot # short and stout + description: An elegant teapot. It simply oozes class. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 100 + reagents: + - ReagentId: Tea + Quantity: 100 + - type: Sprite + sprite: Objects/Consumable/Drinks/teapot.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkTequilaGlass + name: tequila glass + description: Now all that's missing is the weird colored shades! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Tequila + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/tequillaglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkTequilaSunriseGlass + name: tequila sunrise glass + description: Oh great, now you feel nostalgic about sunrises back on Terra... + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: TequilaSunrise + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/tequillasunriseglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkThreeMileIslandGlass + name: three mile island glass + description: A glass of this is sure to prevent a meltdown. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: ThreeMileIsland + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/threemileislandglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkTomatoJuice + name: tomato juice + description: Are you sure this is tomato juice? + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: JuiceTomato + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/tomatojuice.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkToxinsSpecialGlass + name: toxins special glass + description: Woah, this thing is on FIRE + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: ToxinsSpecial + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/toxinsspecialglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkVermouthGlass + name: vermouth glass + description: You wonder why you're even drinking this straight. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Vermouth + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/vermouthglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkVodkaGlass + name: vodka glass + description: Number one drink and fueling choice for Russians worldwide. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Vodka + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkVodkaMartiniGlass + name: vodka martini glass + description: A bastardisation of the classic martini. Still great. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: VodkaMartini + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/martiniglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkVodkaTonicGlass + name: vodka tonic glass + description: For when a gin and tonic isn't russian enough. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: VodkaTonic + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/vodkatonicglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkWaterJug + name: water jug + description: Stay hydrated + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Water + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/water.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkWatermelonJuice + name: watermelon juice + description: Delicious juice made from watermelon. + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: JuiceWatermelon + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/watermelon.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkWhiskeyColaGlass + name: whiskey cola glass + description: An innocent-looking mixture of cola and Whiskey. Delicious. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: WhiskeyCola + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/whiskeycolaglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkWhiskeyGlass + name: whiskey glass + description: The silky, smoky whiskey goodness inside makes the drink look very classy. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Whiskey + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/whiskeyglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkWhiskeySodaGlass + name: whiskey soda glass + description: Ultimate refreshment. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: WhiskeySoda + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/whiskeysodaglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkWhiteRussianGlass + name: white russian glass + description: A very nice looking drink. But that's just, like, your opinion, man. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: WhiteRussian + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/whiterussianglass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkWineGlass + name: wine glass + description: A very classy looking drink. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Wine + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/wineglass.rsi + +# TODO: Move to containers + +- type: entity + parent: DrinkGlassBase + id: DrinkShaker + name: shaker + description: '' + components: + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/shaker.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkShinyFlask + name: shiny flask + description: A shiny metal flask. It appears to have a Greek symbol inscribed on it. + components: + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/shinyflask.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkShotGlass + name: shot glass + description: '' + components: + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/shotglass.rsi + - type: entity parent: DrinkGlassBase id: DrinkCarafe @@ -283,153 +2060,6 @@ sprite: Objects/Consumable/Drinks/carafe.rsi state: icon-10 -- type: entity - parent: DrinkGlassBase - id: DrinkCarrotJuice - name: carrot juice - description: Has a uniquely sweet flavour of concentrated carrots. - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: JuiceCarrot - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/carrotjuice.rsi - -- type: entity - parent: DrinkGlassBase - id: DrinkChocolateGlass - name: hot chocolate - description: A heated drink consisting melted chocolate and heated milk. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/chocolateglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkCafeLatte - name: cafe latte - description: A nice, strong and tasty beverage while you are reading. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/cafe_latte.rsi - - - -- type: entity - parent: DrinkGlassBase - id: DrinkCoffee - name: coffee - description: Coffee is a brewed drink prepared from roasted seeds, commonly called coffee beans, of the coffee plant. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: Coffee - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/coffee.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkCognacGlass - name: cognac glass - description: A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. Classy as fornication. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: Cognac - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/cognacglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkColaBottle - name: space cola bottle - description: Cola. in space - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: Cola - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/colabottle.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkCream - name: cream - description: Dairy product composed of the higher-fat layer skimmed from the top of milk before homogenization. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: Cream - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/cream.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkCubaLibreGlass - name: cuba libre glass - description: Rum, mixed with cola. Viva la revolucion. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: CubaLibre - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/cubalibreglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkCuracaoGlass - name: blue curacao - description: Exotically blue, fruity drink, distilled from oranges. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/curacaoglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkDemonsBlood - name: demons blood - description: AHHHH!!!! # AAHHHHHH - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/demonsblood.rsi - - - type: entity parent: DrinkGlassBase id: DrinkDetFlask @@ -440,73 +2070,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/detflask.rsi - -- type: entity - parent: DrinkGlassBase - id: DrinkDevilsKiss - name: devil's kiss - description: Creepy time! - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/devilskiss.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkDoctorsDelightGlass - name: the doctor's delight - description: A gulp a day keeps the MediBot away. That's probably for the best. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/doctorsdelightglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkDriestMartiniGlass - name: driest martini glass - description: Only for the experienced. You think you see sand floating in the glass. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/driestmartiniglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkDrGibbGlass - name: Dr. Gibb glass - description: A delicious blend of 42 different flavours - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/dr_gibb_glass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkEmeraldGlass - name: melon liquor - description: A relatively sweet and fruity 46 proof liquor. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/emeraldglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkErikaSurprise - name: erika surprise - description: The surprise is, it's green! - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/erikasurprise.rsi - - - type: entity parent: DrinkGlassBase id: DrinkFlask @@ -517,7 +2080,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/flask.rsi - - type: entity parent: DrinkGlassBase id: DrinkFlaskOld @@ -528,368 +2090,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/flask_old.rsi - -- type: entity - parent: DrinkGlassBase - id: DrinkGargleBlasterGlass - name: pan-galactic gargle blaster - description: Whoah, this stuff looks volatile! - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/gargleblasterglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkGinFizzGlass - name: gin fizz glass - description: Refreshingly lemony, deliciously dry. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/ginfizzglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkGinTonicglass - name: gin and tonic - description: An all time classic, mild cocktail. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/gintonicglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkGinVodkaGlass - name: goldschlager - description: 100 proof cinnamon schnapps, made for alcoholic teen girls on spring break. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkGlassBrown - name: bilk - description: This appears to be beer mixed with milk. Disgusting. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/glass_brown.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkGlassBrown2 - name: hooch - description: Either someone's failure at cocktail making or attempt in alchohol production. In any case, do you really want to drink that? - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/glass_brown2.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkGlassClear - name: moonshine - description: You've really hit rock bottom now... your liver packed its bags and left last night. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/glass_clear.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkGlassGreen - name: lime juice - description: The sweet-sour juice of limes. - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: JuiceLime - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/glass_green.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkGlassOrange - name: orange juice - description: Liquid extract of the orange tree fruit, produced by squeezing or reaming oranges. - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: JuiceOrange - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/glass_orange.rsi - -- type: entity - parent: DrinkGlassBase - id: DrinkGlassYellow - name: lemon juice - description: Used to make lemonade, soft drinks, and cocktails. - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: JuiceLemon - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/glass_yellow.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkGlassRed - name: tomato juice - description: Juice made from tomatoes, usually used as a beverage, either plain or in cocktails - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: JuiceTomato - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/glass_red.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkGlassWhite - name: milk - description: An opaque white liquid produced by the mammary glands of mammals. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: Milk - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/glass_white.rsi - -- type: entity - parent: DrinkGlassBase - id: DrinkGoldschlagerGlass - name: goldschlager glass - description: 100 proof cinnamon schnapps, made for alcoholic teen girls on spring break. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/goldschlagerglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkGrapeJuice - name: grape juice - description: The juice is often sold in stores or fermented and made into wine, brandy, or vinegar. - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: JuiceGrape - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/grapejuice.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkGrenadinebottle - name: briar rose grenadine syrup bottle - description: Sweet and tangy, a bar syrup used to add color or flavor to drinks. - components: - - type: Drink - isOpen: true - - type: Sprite - sprite: Objects/Consumable/Drinks/grenadinebottle.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkGrenadineGlass - name: grenadine syrup glass - description: Made in the modern day with proper pomegranate substitute. Who uses real fruit, anyways? - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/grenadineglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkGrogGlass - name: grog glass - description: Watered-down rum, pirate approved! - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/grogglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkGrapeSodaGlass - name: grape soda glass - description: Sweetened drink with a grape flavor and a deep purple color. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/gsodaglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkHell - name: hell ramen - description: The noodles are boiled, the flavors are artificial, just like being back in school. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/hell.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkHippiesdelightglass - name: hippies' delight glass - description: You just don't get it maaaan. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/hippiesdelightglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkIcedCoffeeGlass - name: iced coffee glass - description: Coffee and ice, refreshing and cool. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/icedcoffeeglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkIcedteaglass - name: long island iced tea - description: The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/icedteaglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkIcedBeerglass - name: iced beer glass - description: A beer which is so cold the air around it freezes. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/iced_beerglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkIceGlass - name: ice glass - description: Water frozen into a solid state. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: Ice - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/iceglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkIrishcarbomb - name: irish car bomb - description: Mmm, tastes like chocolate cake... - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: IrishCarBomb - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/irishcarbomb.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkIrishCoffeeGlass - name: irish coffee glass - description: Coffee, and alcohol. More fun than a Mimosa to drink in the morning. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: IrishCoffee - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/irishcoffeeglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkIrishCreamGlass - name: irish cream glass - description: Whiskey-imbued cream, what else would you expect from the Irish. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: IrishCream - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/irishcreamglass.rsi - - - type: entity parent: DrinkGlassBase id: DrinkJar @@ -900,7 +2100,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/jar.rsi - - type: entity parent: DrinkGlassBase id: DrinkJarMetroid @@ -911,7 +2110,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/jar_metroid.rsi - - type: entity parent: DrinkGlassBase id: DrinkJarWhat @@ -922,124 +2120,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/jar_what.rsi - -- type: entity - parent: DrinkGlassBase - id: DrinkKahluaGlass - name: kahlua glass - description: A widely known, Mexican coffee-flavoured liqueur. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: Kahlua - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/kahluaglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkKiraSpecial - name: kira special - description: Long live the guy who everyone had mistaken for a girl. Baka! - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/kiraspecial.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkLemonade - name: lemonade - description: Drink using lemon juice, water, and a sweetener such as cane sugar or honey. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/lemonade.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkLemonadeGlass - name: lemonade glass - description: Drink using lemon juice, water, and a sweetener such as cane sugar or honey. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/lemonadeglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkLemonGlass - name: lemon glass - description: '' - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/lemonglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkLemonJuice - name: lemon juice - description: Used to make lemonade, soft drinks, and cocktails. - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: JuiceLemon - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/lemonjuice.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkLemonLime - name: lemon lime - description: A tangy substance made of lime and lemon. - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: JuiceLemon - Quantity: 10 - - ReagentId: JuiceLime - Quantity: 10 - - type: Sprite - sprite: Objects/Consumable/Drinks/lemonlime.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkLimeJuice - name: lime juice - description: The sweet-sour juice of limes. - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: JuiceLime - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/limejuice.rsi - - - type: entity parent: DrinkGlassBase id: DrinkLithiumFlask @@ -1050,643 +2130,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/lithiumflask.rsi - -- type: entity - parent: DrinkGlassBase - id: DrinkLongIslandIcedTeaGlass - name: long island iced tea glass - description: The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/longislandicedteaglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkManhattanGlass - name: manhattan glass - description: The Detective's undercover drink of choice. He never could stomach gin... - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/manhattanglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkManlyDorfGlass - name: the manly dorf glass - description: Beer and Ale, brought together in a delicious mix. Intended for true men only. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: ManlyDorf - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/manlydorfglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkMargaritaGlass - name: margarita glass - description: On the rocks with salt on the rim. Arriba~! - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/margaritaglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkMartiniGlass - name: vodka martini glass - description: Vodka with Gin. Not quite how 007 enjoyed it, but still delicious. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/martiniglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkMeadGlass - name: mead glass - description: A Viking's drink, though a cheap one. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/meadglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkMilkJug - name: milk jug - description: An opaque white liquid produced by the mammary glands of mammals. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: Milk - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/milk.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkMilkshake - name: milkshake - description: Sweet, cold beverage that is usually made from milk - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/milkshake.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkMojito - name: mojito - description: '' - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/mojito.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkNeurotoxinGlass - name: neurotoxin glass - description: A strong neurotoxin that puts the subject into a death-like state. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/neurotoxinglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkNothing - name: nothing - description: Absolutely nothing. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/nothing.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkNtcahors - name: neotheology cahors whine - description: Fortified dessert wine made from cabernet sauvignon, saperavi and other grapes. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/ntcahors.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkNukaColaGlass - name: nuka cola glass - description: Cola, cola never changes. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/nuka_colaglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkOrangeJuice - name: orange juice - description: Liquid extract of the orange tree fruit, produced by squeezing or reaming oranges. - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: JuiceOrange - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/orangejuice.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkPatronGlass - name: patron glass - description: Tequila with silver in it, a favorite of alcoholic women in the club scene. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/patronglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkPoisonBerryJuice - name: poison berry juice - description: A tasty juice blended from various kinds of very deadly and toxic berries. - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: JuiceBerryPoison - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/poisonberryjuice.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkProjectManhattanGlass - name: manhattan project glass - description: A scientist's drink of choice, for pondering ways to blow up the station. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/proj_manhattanglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkPoisonWineGlass - name: poison wine glass - description: Is this even wine? Toxic! Hallucinogenic! Probably consumed in boatloads by your superiors! - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/pwineglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkRamen - name: cup ramen - description: Just add 10ml water, self heats! A taste that reminds you of your school years. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/ramen.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkRedMeadGlass - name: red mead glass - description: The true Viking's drink! Even though it has a strange red color. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/red_meadglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkRewriter - name: rewriter - description: The secret of the sanctuary of the Libarian... - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/rewriter.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkRumGlass - name: deadrum glass - description: Distilled alcoholic drink made from saltwater. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/rumglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkSbitenGlass - name: sbiten glass - description: A spicy Vodka! Might be a little hot for the little guys! - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/sbitenglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkScrewdriverGlass - name: screwdriver glass - description: "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious." - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/screwdriverglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkSuiDreamGlass - name: sui dream glass - description: 'Comprised of: White soda, blue curacao, melon liquor.' - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/sdreamglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkShakeBlue - name: blue milkshake - description: '' - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/shake-blue.rsi - - -# TODO: MOVE -- type: entity - parent: DrinkGlassBase - id: DrinkShakeEmpty - name: shakeempty - description: '' - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/shake-empty.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkShakeMeat - name: meat shake - description: '' - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/shake-meat.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkShakeRobo - name: robo shake - description: '' - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/shake-robo.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkShakeWhite - name: white shake - description: '' - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/shake-white.rsi - - -# TODO: Move to containers -- type: entity - parent: DrinkGlassBase - id: DrinkShaker - name: shaker - description: '' - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/shaker.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkShinyFlask - name: shiny flask - description: A shiny metal flask. It appears to have a Greek symbol inscribed on it. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/shinyflask.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkShotGlass - name: shot glass - description: '' - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/shotglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkSilencerGlass - name: silencer glass - description: A drink from Mime Heaven. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/silencerglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkSingulo - name: singulo - description: A blue-space beverage! - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/singulo.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkSnowwhite - name: snow white - description: A cold refreshment - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/snowwhite.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkSodaWater - name: soda water - description: Water containing dissolved carbon dioxide gas. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/sodawater.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkSoyMilk - name: soy milk - description: An opaque white liquid made from soybeans. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/soymilk.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkSoyLatte - name: soy latte - description: A coffee drink made with espresso and steamed soy milk. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/soy_latte.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkSpaceUpBottle - name: space-up bottle - description: Tastes like a hull breach in your mouth. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/space-up_bottle.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkSpace-upGlass - name: space-up glass - description: Tastes like a hull breach in your mouth. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/space-up_glass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkSpaceMountainWindBottle - name: space mountain wind bottle - description: Blows right through you like a space wind. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkSpaceMountainWindGlass - name: space mountain wind glass - description: Blows right through you like a space wind. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/space_mountain_wind_glass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkSyndicatebomb - name: syndicate bomb - description: Tastes like terrorism! - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: SyndicateBomb - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/syndicatebomb.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkTeaGlass - name: tea glass - description: Tasty black tea. Contains caffeine. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: Tea - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/teaglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkTeapot - name: teapot # short and stout - description: An elegant teapot. It simply oozes class. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: Tea - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/teapot.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkTequilaglass - name: tequila glass - description: A strong and mildly flavoured, mexican produced spirit. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/tequillaglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkTequilaSunriseGlass - name: tequila sunrise glass - description: Tequila and orange juice. Much like a Screwdriver, only Mexican~ - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/tequillasunriseglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkThirteenLokoGlass - name: thirteen loko glass - description: A potent mixture of caffeine and alcohol. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/thirteen_loko_glass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkThreeMileIslandGlass - name: three mile island glass - description: Made for a woman, strong enough for a man. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/threemileislandglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkTomatoJuice - name: tomato juice - description: Juice made from tomatoes, usually used as a beverage, either plain or in cocktails. - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: JuiceTomato - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/tomatojuice.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkTonicWater - name: tonic water - description: A carbonated soft drink in which quinine is dissolved. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/tonic.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkToxinsSpecialGlass - name: toxins special glass - description: This thing is ON FIRE! CALL THE DAMN SHUTTLE!" - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/toxinsspecialglass.rsi - - - type: entity parent: DrinkGlassBase id: DrinkVacuumFlask @@ -1697,159 +2140,54 @@ - type: Sprite sprite: Objects/Consumable/Drinks/vacuumflask.rsi +# TODO: MOVE - type: entity parent: DrinkGlassBase - id: DrinkVermouthglass - name: vermouth glass - description: Aromatized, fortified white wine flavored with various botanicals. + id: DrinkShakeBlue + name: blue milkshake + description: '' components: - type: Drink - type: Sprite - sprite: Objects/Consumable/Drinks/vermouthglass.rsi - + sprite: Objects/Consumable/Drinks/shake-blue.rsi - type: entity parent: DrinkGlassBase - id: DrinkVodkaTonicGlass - name: vodka tonic glass - description: For when a gin and tonic isn't russian enough. + id: DrinkShakeEmpty + name: shakeempty + description: '' components: - type: Drink - type: Sprite - sprite: Objects/Consumable/Drinks/vodkatonicglass.rsi - + sprite: Objects/Consumable/Drinks/shake-empty.rsi - type: entity parent: DrinkGlassBase - id: DrinkWaterJug - name: water jug - description: Stay hydrated + id: DrinkShakeMeat + name: meat shake + description: '' components: - type: Drink - type: Sprite - sprite: Objects/Consumable/Drinks/water.rsi - + sprite: Objects/Consumable/Drinks/shake-meat.rsi - type: entity parent: DrinkGlassBase - id: DrinkWaterBottle - name: water bottle - description: Simple clean water of unknown origin. You think that maybe you dont want to know it. + id: DrinkShakeRobo + name: robo shake + description: '' components: - type: Drink - type: Sprite - sprite: Objects/Consumable/Drinks/waterbottle.rsi - + sprite: Objects/Consumable/Drinks/shake-robo.rsi - type: entity parent: DrinkGlassBase - id: DrinkWatermelonJuice - name: watermelon juice - description: Delicious juice made from watermelon. - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: JuiceWatermelon - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/watermelon.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkWaterCup - name: water cup - description: A paper water cup. + id: DrinkShakeWhite + name: white shake + description: '' components: - type: Drink - type: Sprite - sprite: Objects/Consumable/Drinks/water_cup.rsi - state: icon-1 - -- type: entity - parent: DrinkGlassBase - id: DrinkWhiskeyColaGlass - name: whiskey cola glass - description: Whiskey, mixed with cola. Surprisingly refreshing. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: WhiskeyCola - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/whiskeycolaglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkWhiskeyGlass - name: special blend whiskey glass - description: Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: Whiskey - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/whiskeyglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkWhiskeySodaGlass - name: whiskey soda glass - description: For the more refined griffon. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/whiskeysodaglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkWhiskeySodaGlass2 - name: whiskey soda glass - description: For the more refined griffon. - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/whiskeysodaglass2.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkWhiteRussianGlass - name: white russian glass - description: That's just, like, your opinion, man... - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/whiterussianglass.rsi - - -- type: entity - parent: DrinkGlassBase - id: DrinkWineGlass - name: wine glass - description: An premium alchoholic beverage made from distilled grape juice. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - reagents: - - ReagentId: Wine - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/wineglass.rsi + sprite: Objects/Consumable/Drinks/shake-white.rsi diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml index da9af2fb01..c5e74f26d4 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml @@ -54,44 +54,29 @@ 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: SolutionContainerManager solutions: drink: - maxVol: 100 reagents: - ReagentId: Absinthe Quantity: 100 - -- type: entity - parent: DrinkBottleBaseFull - id: DrinkAlcoGreenFull - name: emeraldine melon liquor - description: A bottle of 46 proof Emeraldine Melon Liquor. Sweet and light. - components: - - type: Drink - type: Sprite - sprite: Objects/Consumable/Drinks/alco-green.rsi - + sprite: Objects/Consumable/Drinks/absinthebottle.rsi - type: entity parent: DrinkBottleBaseFull - id: DrinkAleBottleFull - name: Magm-Ale - description: A true dorf's drink of choice. + id: DrinkBlueCuracaoBottleFull + name: Miss Blue Curacao + description: A fruity, exceptionally azure drink. Does not allow the imbiber to use the fifth magic. components: - type: SolutionContainerManager solutions: drink: - maxVol: 100 reagents: - - ReagentId: Ale + - ReagentId: BlueCuracao Quantity: 100 - type: Sprite - sprite: Objects/Consumable/Drinks/alebottle.rsi - + sprite: Objects/Consumable/Drinks/alco-blue.rsi - type: entity parent: DrinkBottleBaseFull @@ -99,11 +84,15 @@ name: bottle of nothing description: A bottle filled with nothing. components: - - type: Drink + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Nothing + Quantity: 100 - type: Sprite sprite: Objects/Consumable/Drinks/bottleofnothing.rsi - - type: entity parent: DrinkBottleBaseFull id: DrinkCognacBottleFull @@ -116,10 +105,41 @@ reagents: - ReagentId: Cognac Quantity: 100 - maxVol: 100 - type: Sprite sprite: Objects/Consumable/Drinks/cognacbottle.rsi +- type: entity + parent: DrinkBottleBaseFull + id: DrinkColaBottleFull + name: space cola bottle + description: Cola. in space + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Cola + Quantity: 100 + - type: Sprite + sprite: Objects/Consumable/Drinks/colabottle.rsi + + +- type: entity + parent: DrinkBottleBaseFull + id: DrinkGrenadineBottleFull + name: briar rose grenadine syrup bottle + description: Sweet and tangy, a bar syrup used to add color or flavor to drinks. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Grenadine + Quantity: 100 + - type: Drink + isOpen: true + - type: Sprite + sprite: Objects/Consumable/Drinks/grenadinebottle.rsi - type: entity parent: DrinkBottleBaseFull @@ -127,16 +147,14 @@ 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: SolutionContainerManager solutions: drink: reagents: - ReagentId: Gin Quantity: 100 - maxVol: 100 + - type: Sprite + sprite: Objects/Consumable/Drinks/ginbottle.rsi - type: entity parent: DrinkBottleBaseFull @@ -144,11 +162,15 @@ name: goldschlager bottle description: 100 proof cinnamon schnapps, made for alcoholic teen girls on spring break. components: - - type: Drink + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Goldschlager + Quantity: 100 - type: Sprite sprite: Objects/Consumable/Drinks/goldschlagerbottle.rsi - - type: entity parent: DrinkBottleBaseFull id: DrinkKahluaBottleFull @@ -159,12 +181,25 @@ solutions: drink: reagents: - - ReagentId: Water - Quantity: 80 - maxVol: 80 + - ReagentId: Kahlua + Quantity: 100 - type: Sprite sprite: Objects/Consumable/Drinks/kahluabottle.rsi +- type: entity + parent: DrinkBottleBaseFull + id: DrinkMelonLiquorBottleFull + name: emeraldine melon liquor + description: A bottle of 46 proof Emeraldine Melon Liquor. Sweet and light. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: MelonLiquor + Quantity: 100 + - type: Sprite + sprite: Objects/Consumable/Drinks/alco-green.rsi - type: entity parent: DrinkBottleBaseFull @@ -172,55 +207,107 @@ name: wrapp artiste patron bottle description: Silver laced tequilla, served in space night clubs across the galaxy. components: - - type: Drink + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Patron + Quantity: 100 - type: Sprite sprite: Objects/Consumable/Drinks/patronbottle.rsi - - type: entity parent: DrinkBottleBaseFull id: DrinkPoisonWinebottleFull name: warlock's velvet bottle description: What a delightful packaging for a surely high quality wine! The vintage must be amazing! components: - - type: Drink + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: PoisonWine + Quantity: 100 - type: Sprite sprite: Objects/Consumable/Drinks/pwinebottle.rsi - - type: entity parent: DrinkBottleBaseFull - id: DrinkRumbottleFull + id: DrinkRumBottleFull name: captain pete's cuban spiced rum description: This isn't just rum, oh no. It's practically GRIFF in a bottle. components: - - type: Drink + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Rum + Quantity: 100 - type: Sprite sprite: Objects/Consumable/Drinks/rumbottle.rsi +- type: entity + parent: DrinkBottleBaseFull + id: DrinkSpaceMountainWindBottleFull + name: space mountain wind bottle + description: Blows right through you like a space wind. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: SpaceMountainWind + Quantity: 100 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi - type: entity parent: DrinkBottleBaseFull - id: DrinkTequilabottleFull + id: DrinkSpaceUpBottleFull + name: space-up bottle + description: Tastes like a hull breach in your mouth. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: SpaceUp + Quantity: 100 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/space-up_bottle.rsi + +- type: entity + parent: DrinkBottleBaseFull + id: DrinkTequilaBottleFull name: caccavo guaranteed quality tequila bottle description: Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients! components: - - type: Drink + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Tequila + Quantity: 100 - type: Sprite sprite: Objects/Consumable/Drinks/tequillabottle.rsi - - type: entity parent: DrinkBottleBaseFull id: DrinkVermouthBottleFull name: goldeneye vermouth bottle description: Sweet, sweet dryness! components: - - type: Drink + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Vermouth + Quantity: 100 - type: Sprite sprite: Objects/Consumable/Drinks/vermouthbottle.rsi - - type: entity parent: DrinkBottleBaseFull id: DrinkVodkaBottleFull @@ -230,14 +317,12 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 80 reagents: - ReagentId: Vodka - Quantity: 80 + Quantity: 100 - type: Sprite sprite: Objects/Consumable/Drinks/vodkabottle.rsi - - type: entity parent: DrinkBottleBaseFull id: DrinkWhiskeyBottleFull @@ -247,14 +332,12 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 80 reagents: - ReagentId: Whiskey - Quantity: 80 + Quantity: 100 - type: Sprite sprite: Objects/Consumable/Drinks/whiskeybottle.rsi - - type: entity parent: DrinkBottleBaseFull id: DrinkWineBottleFull @@ -264,9 +347,162 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 80 reagents: - ReagentId: Wine - Quantity: 80 + Quantity: 100 - type: Sprite sprite: Objects/Consumable/Drinks/winebottle.rsi + +# Small Bottles + +- type: entity + parent: DrinkBottleBaseFull + id: DrinkBeer # Needs to be renamed DrinkBeerBottleFull + name: beer # beer it is. coffee. beer? coff-ee? be-er? c-o... b-e + description: An alcoholic beverage made from malted grains, hops, yeast, and water. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Beer + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/beer.rsi + +- type: entity + parent: DrinkBottleBaseFull + id: DrinkAleBottleFull + name: Magm-Ale + description: A true dorf's drink of choice. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Ale + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/alebottle.rsi + +- type: entity + parent: DrinkBottleBaseFull + id: DrinkWaterBottleFull + name: water bottle + description: Simple clean water of unknown origin. You think that maybe you dont want to know it. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Water + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/waterbottle.rsi + +# Cartons, TODO: this needs to be moved elsewhere eventually, since cartons shouldnt smash into glass shards + +- type: entity + parent: DrinkBottleBaseFull + id: DrinkJuiceLimeCarton + name: lime juice + description: Sweet-sour goodness. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: JuiceLime + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/limejuice.rsi + +- type: entity + parent: DrinkBottleBaseFull + id: DrinkJuiceOrangeCarton + name: orange juice + description: Full of vitamins and deliciousness! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: JuiceOrange + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/orangejuice.rsi + +- type: entity + parent: DrinkBottleBaseFull + id: DrinkJuiceTomatoCarton + name: tomato juice + description: Well, at least it LOOKS like tomato juice. You can't tell with all that redness. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: JuiceTomato + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/tomatojuice.rsi + +- type: entity + parent: DrinkBottleBaseFull + id: DrinkCreamCarton + name: Milk Cream + description: It's cream. Made from milk. What else did you think you'd find in there? + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Cream + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/cream.rsi + +- type: entity + parent: DrinkBottleBaseFull + id: DrinkMilkCarton + name: milk + description: An opaque white liquid produced by the mammary glands of mammals. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 100 + reagents: + - ReagentId: Milk + Quantity: 100 + - type: Sprite + sprite: Objects/Consumable/Drinks/milk.rsi + +- type: entity + parent: DrinkBottleBaseFull + id: DrinkSoyMilkCarton + name: soy milk + description: White and nutritious soy goodness! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 100 + reagents: + - ReagentId: MilkSoy + Quantity: 100 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/soymilk.rsi diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml index 61b30ea2ff..7a91ccacd2 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml @@ -25,7 +25,7 @@ state: icon layers: - state: icon - map: ["enum.DrinkCanVisualLayers.Icon"] + map: ["enum.DrinkCanVisualLayers.Icon"] netsync: false - type: DrainableSolution solution: drink @@ -41,6 +41,13 @@ name: space cola description: A refreshing beverage. components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 20 + reagents: + - ReagentId: Cola + Quantity: 20 - type: Tag tags: - Cola @@ -51,10 +58,17 @@ - type: entity parent: DrinkCanBaseFull - id: DrinkIceTeaCan + id: DrinkIcedTeaCan name: iced tea can description: A refreshing can of iced tea. components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 20 + reagents: + - ReagentId: IcedTea + Quantity: 20 - type: Sprite sprite: Objects/Consumable/Drinks/ice_tea_can.rsi - type: Item @@ -66,6 +80,13 @@ name: lemon-lime can description: You wanted ORANGE. It gave you Lemon-Lime. components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 20 + reagents: + - ReagentId: LemonLime + Quantity: 20 - type: Sprite sprite: Objects/Consumable/Drinks/lemon-lime.rsi - type: Item @@ -82,12 +103,36 @@ - type: Item sprite: Objects/Consumable/Drinks/purple_can.rsi +- type: entity + parent: DrinkGlassBase + id: DrinkSodaWaterCan + name: soda water can + description: Soda water. Why not make a scotch and soda? + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 20 + reagents: + - ReagentId: SodaWater + Quantity: 20 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/sodawater.rsi + - type: entity parent: DrinkCanBaseFull id: DrinkSpaceMountainWindCan name: space mountain wind can description: Blows right through you like a space wind. components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 20 + reagents: + - ReagentId: SpaceMountainWind + Quantity: 20 - type: Sprite sprite: Objects/Consumable/Drinks/space_mountain_wind.rsi - type: Item @@ -99,6 +144,13 @@ name: space-up can description: Tastes like a hull breach in your mouth. components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 20 + reagents: + - ReagentId: SpaceUp + Quantity: 20 - type: Sprite sprite: Objects/Consumable/Drinks/space-up.rsi - type: Item @@ -117,28 +169,52 @@ - type: entity parent: DrinkCanBaseFull - id: DrinkThirteenLokoCan - name: thirteen loko can - description: The MBO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkeness, or even death. Please Drink Responsibly. + id: DrinkTonicWaterCan + name: tonic water can + description: Quinine tastes funny, but at least it'll keep that Space Malaria away. components: - type: SolutionContainerManager solutions: drink: maxVol: 20 reagents: - - ReagentId: ThirteenLoko + - ReagentId: TonicWater Quantity: 20 + - type: Drink - type: Sprite - sprite: Objects/Consumable/Drinks/thirteen_loko.rsi - - type: Item - sprite: Objects/Consumable/Drinks/thirteen_loko.rsi + sprite: Objects/Consumable/Drinks/tonic.rsi - type: entity parent: DrinkCanBaseFull - id: DrinkChangelingSting - name: Changeling sting + id: DrinkFourteenLokoCan + name: fourteen loko can + description: The MBO has advised crew members that consumption of Fourteen Loko may result in seizures, blindness, drunkeness, or even death. Please Drink Responsibly. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 20 + reagents: + - ReagentId: FourteenLoko + Quantity: 20 + - type: Sprite + sprite: Objects/Consumable/Drinks/fourteen_loko.rsi + - type: Item + sprite: Objects/Consumable/Drinks/fourteen_loko.rsi + +- type: entity + parent: DrinkCanBaseFull + id: DrinkChangelingStingCan + name: Changeling sting can description: You take a tiny sip and feel a burning sensation... components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 20 + reagents: + - ReagentId: ChangelingSting + Quantity: 20 - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/changelingsting.rsi @@ -147,10 +223,17 @@ - type: entity parent: DrinkCanBaseFull - id: DrinkDrGibb - name: Dr. Gibb + id: DrinkDrGibbCan + name: Dr. Gibb can description: A delicious blend of 42 different flavours. components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 20 + reagents: + - ReagentId: DrGibb + Quantity: 20 - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/dr_gibb.rsi diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml index 0187ecabfc..bc9a82092e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml @@ -199,3 +199,21 @@ state: icon - type: Item sprite: Objects/Consumable/Drinks/lean.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkWaterCup + name: water cup + description: A paper water cup. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 20 + reagents: + - ReagentId: Water + Quantity: 20 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/water_cup.rsi + state: icon-1 diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index bff9a06605..276c0e4432 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -1,39 +1,26 @@ + +# Base Alcohol + - type: reagent id: Absinthe name: absinthe - desc: One sip of this and you just know you're gonna have a good time. - spritePath: absintheglass.rsi + desc: A anise-flavoured spirit derived from botanicals. + physicalDesc: strong-smelling color: "#33EE00" - physicalDesc: strong-smelling - -- type: reagent - id: Whiskey - name: whiskey - desc: An alcoholic beverage made from fermented grain mash - physicalDesc: strong-smelling - color: "#664300" - spritePath: whiskeyglass.rsi + spritePath: absintheglass.rsi - type: reagent id: Ale name: ale - desc: A type of beer brewed using a warm fermentation method, resulting in a sweet, full-bodied and fruity taste. + desc: A dark alchoholic beverage made by malted barley and yeast. physicalDesc: bubbly color: "#663100" spritePath: aleglass.rsi -- type: reagent - id: Wine - name: wine - desc: An alcoholic drink made from fermented grapes - physicalDesc: translucent - color: "#7E4043" - spritePath: wineglass.rsi - - type: reagent id: Beer name: beer - desc: A cold pint of pale lager. + desc: An alcoholic beverage made from malted grains, hops, yeast, and water. physicalDesc: bubbly color: "#cfa85f" spritePath: beerglass.rsi @@ -44,50 +31,12 @@ amount: 0.7 - type: reagent - id: Vodka - name: vodka - desc: The glass contain wodka. Хуета. + id: BlueCuracao + name: blue curacao + desc: Exotically blue, fruity drink, distilled from oranges. physicalDesc: strong-smelling - color: "#d1d1d155" - spritePath: ginvodkaglass.rsi - -- type: reagent - id: Gin - name: gin - desc: A crystal clear glass of Griffeater gin. - physicalDesc: strong-smelling - color: "#664300" - spritePath: ginvodkaglass.rsi - -- type: reagent - id: Rum - name: rum - desc: Popular with the sailors. Not very popular with anyone else. - physicalDesc: strong-smelling - color: "#664300" - spritePath: rumglass.rsi - -- type: reagent - id: Moonshine - name: moonshine - desc: Artisanal homemade liquor. What could go wrong? - physicalDesc: strong-smelling - color: "#d1d7d155" - -- type: reagent - id: Tequila - name: tequila - desc: This stuff will get you fucked up. - physicalDesc: strong-smelling - color: "#d7d1d155" - -- type: reagent - id: Kahlua - name: kahlua - desc: A widely known, Mexican coffee-flavoured liqueur. In production since 1936! - physicalDesc: cloudy - color: "#664300" - spritePath: kahluaglass.rsi + color: "#0000CD" + spritePath: curacaoglass.rsi - type: reagent id: Cognac @@ -98,52 +47,156 @@ spritePath: cognacglass.rsi - type: reagent - id: ManlyDorf - name: manly dorf - desc: A dwarfy concoction made from ale and beer. Intended for stout dwarves only. - physicalDesc: bubbly + id: DeadRum + name: deadrum + desc: Distilled alcoholic drink made from saltwater. + physicalDesc: strong-smelling color: "#664300" - spritePath: manlydorfglass.rsi + spritePath: rumglass.rsi - type: reagent - id: CubaLibre - name: cuba libre - desc: A classic mix of rum and cola. - physicalDesc: bubbly - color: "#3E1B00" - spritePath: cubalibreglass.rsi + id: Gin + name: gin + desc: A distilled alcoholic drink that derives its predominant flavour from juniper berries. + physicalDesc: strong-smelling + color: "#664300" + spritePath: ginvodkaglass.rsi - type: reagent - id: IrishCarBomb - name: irish car bomb - desc: A troubling mixture of irish cream and ale. - physicalDesc: bubbly - color: "#2E6671" - spritePath: irishcarbomb.rsi - -- type: reagent - id: IrishCoffee - name: irish coffee - desc: Coffee served with irish cream. Regular cream just isn't the same! + id: Kahlua + name: kahlua + desc: A widely known, Mexican coffee-flavoured liqueur. physicalDesc: cloudy color: "#664300" - spritePath: irishcoffeeglass.rsi + spritePath: kahluaglass.rsi - type: reagent - id: IrishCream - name: irish cream - desc: Whiskey-imbued cream. What else could you expect from the Irish. - physicalDesc: creamy - color: "#664300" - spritePath: irishcreamglass.rsi + id: MelonLiquor + name: melon liquor + desc: A relatively sweet and fruity 46 proof liquor. + physicalDesc: strong-smelling + color: "#138808" + spritePath: emeraldglass.rsi - type: reagent - id: B52 - name: b-52 - desc: Coffee, irish cream, and cognac. You will get bombed. - physicalDesc: bubbly + id: NTCahors + name: NeoTheology Cahors Wine + desc: Fortified dessert wine made from cabernet sauvignon, saperavi and other grapes. + physicalDesc: strong-smelling + color: "#7E4043" + spritePath: wineglass.rsi + +- type: reagent + id: PoisonWine + name: poison wine + desc: Is this even wine? Toxic! Hallucinogenic! Probably consumed in boatloads by your superiors! + physicalDesc: strong-smelling + color: "#000000" + spritePath: pwineglass.rsi + +- type: reagent + id: Rum + name: rum + desc: Distilled alcoholic drink made from sugarcane byproducts. + physicalDesc: strong-smelling color: "#664300" - spritePath: b52glass.rsi + spritePath: rumglass.rsi + +- type: reagent + id: Sake + name: sake + desc: Alcoholic beverage made by fermenting rice that has been polished. + physicalDesc: strong-smelling + color: "#DDDDDD" + +- type: reagent + id: Tequila + name: tequila + desc: A strong and mildly flavoured, mexican produced spirit. + physicalDesc: strong-smelling + color: "#d7d1d155" + +- type: reagent + id: Vermouth + name: vermouth + desc: Aromatized, fortified white wine flavored with various botanicals. + physicalDesc: strong-smelling + color: "#91FF91" + spritePath: vermouthglass.rsi + +- type: reagent + id: Vodka + name: vodka + desc: Clear distilled alcoholic beverage that originates from Poland and Russia. + physicalDesc: strong-smelling + color: "#d1d1d155" + spritePath: ginvodkaglass.rsi + +- type: reagent + id: Whiskey + name: whiskey + desc: A type of distilled alcoholic beverage made from fermented grain mash. + physicalDesc: strong-smelling + color: "#664300" + spritePath: whiskeyglass.rsi + +- type: reagent + id: Wine + name: wine + desc: An premium alchoholic beverage made from distilled grape juice. + physicalDesc: translucent + color: "#7E4043" + spritePath: wineglass.rsi + +# Mixed Alcohol + +- type: reagent + id: AcidSpit + name: acidspit + desc: A drink for the daring, can be deadly if incorrectly prepared! + physicalDesc: strong-smelling + color: "#365000" + spritePath: acidspitglass.rsi + +- type: reagent + id: AlliesCocktail #haha, cock. that's hot + name: allies cocktail + desc: A drink made from your allies, not as sweet as when made from your enemies. + physicalDesc: strong-smelling + color: "#00664d" + spritePath: alliescocktail.rsi + +- type: reagent + id: Aloe + name: aloe + desc: So very, very, very good. + physicalDesc: strong-smelling + color: "#192c00" + spritePath: aloe.rsi + +- type: reagent + id: Amasec + name: amasec + desc: Official drink of the Gun Club! + physicalDesc: strong-smelling + color: "#124da7" + spritePath: amasecglass.rsi + +- type: reagent + id: Andalusia + name: andalusia + desc: A nice, strangely named drink. + physicalDesc: strong-smelling + color: "#665700" + spritePath: andalusia.rsi + +- type: reagent + id: Antifreeze + name: antifreeze + desc: Ultimate refreshment. + physicalDesc: translucent + color: "#ff7d63" + spritePath: antifreeze.rsi - type: reagent id: AtomicBomb @@ -154,35 +207,236 @@ spritePath: atomicbombglass.rsi - type: reagent - id: WhiskeyCola - name: whiskey cola - desc: An innocent-looking mixture of cola and whiskey. Delicious. + id: B52 + name: b-52 + desc: Coffee, irish cream, and cognac. You will get bombed. + physicalDesc: bubbly + color: "#664300" + spritePath: b52glass.rsi + +- type: reagent + id: BahamaMama + name: bahama mama + desc: Tropical cocktail. + physicalDesc: strong-smelling + color: "#FF7F3B" + spritePath: bahama_mama.rsi + +- type: reagent + id: BananaHonk + name: banana mama + desc: A drink from Clown Heaven. + physicalDesc: strong-smelling + color: "#ffff91" + spritePath: bananahonkglass.rsi + +- type: reagent + id: Barefoot + name: barefoot + desc: Barefoot and pregnant. + physicalDesc: strong-smelling + color: "#664300" + spritePath: b&p.rsi + +- type: reagent + id: BeepskySmash + name: beepsky smash + desc: Deny drinking this and prepare for THE LAW. + physicalDesc: strong-smelling + color: "#664300" + spritePath: beepskysmashglass.rsi + +- type: reagent + id: Bilk + name: bilk + desc: This appears to be beer mixed with milk. Disgusting. + physicalDesc: bilky... + color: "#895C4C" + spritePath: glass_brown.rsi + +- type: reagent + id: BlackRussian + name: black russian + desc: For the lactose-intolerant. Still as classy as a White Russian. + physicalDesc: strong-smelling + color: "#360000" + spritePath: blackrussianglass.rsi + +- type: reagent + id: BloodyMary + name: bloody mary + desc: A strange yet pleasurable mixture made of vodka, tomato, and lime juice. + physicalDesc: strong-smelling + color: "#660000" + spritePath: bloodymaryglass.rsi + +- type: reagent + id: Booger + name: booger + desc: Ewww... + physicalDesc: strong-smelling + color: "#8CFF8C" + spritePath: booger.rsi + +- type: reagent + id: BraveBull + name: brave bull + desc: It's just as effective as Dutch-Courage! + physicalDesc: strong-smelling + color: "#664300" + spritePath: bravebullglass.rsi + +- type: reagent + id: BrownStar + name: brown star + desc: It's not what it sounds like... + physicalDesc: strong-smelling + color: "#9F3400" + spritePath: brownstar.rsi + +- type: reagent + id: CubaLibre + name: cuba libre + desc: Rum, mixed with cola. Viva la revolucion. physicalDesc: bubbly color: "#3E1B00" - spritePath: whiskeycolaglass.rsi + spritePath: cubalibreglass.rsi - type: reagent - id: SyndicateBomb - name: syndicate bomb - desc: Somebody set us up the bomb! - physicalDesc: opaque - color: "#2E6660" - spritePath: syndicatebomb.rsi + id: DemonsBlood + name: demons blood + desc: AHHHH!!!! + physicalDesc: strong-smelling + color: "#a70000" + spritePath: demonsblood.rsi - type: reagent - id: Antifreeze - name: antifreeze - desc: The ultimate refreshment. - physicalDesc: translucent - color: "#ff7d63" - spritePath: antifreeze.rsi + id: DevilsKiss + name: devils kiss + desc: Creepy time! + physicalDesc: strong-smelling + color: "#A68310" + spritePath: devilskiss.rsi - type: reagent - id: CreamyDelight - name: creamy delight - desc: A combination of cream, wine and moonshine. Why would you do this? - physicalDesc: foul - color: "#a6969a" + id: DoctorsDelight + name: the doctor's delight + desc: A gulp a day keeps the MediBot away. That's probably for the best. + physicalDesc: strong-smelling + color: "#FF8CFF" + spritePath: doctorsdelightglass.rsi + +- type: reagent + id: DriestMartini + name: driest martini + desc: Only for the experienced. You think you see sand floating in the glass. + physicalDesc: strong-smelling + color: "#2E6671" + spritePath: driestmartiniglass.rsi + +- type: reagent + id: ErikaSuprise + name: erika suprise + desc: The surprise is, it's green! + physicalDesc: strong-smelling + color: "#2E6671" + spritePath: erikasurprise.rsi + +- type: reagent + id: GargleBlaster + name: Pan-Galactic Gargle Blaster + desc: Whoah, this stuff looks volatile! + physicalDesc: volatile + color: "#9cc8b4" + spritePath: gargleblasterglass.rsi + +- type: reagent + id: GinFizz + name: gin fizz + desc: Refreshingly lemony, deliciously dry. + physicalDesc: strong-smelling + color: "#664300" + spritePath: ginfizzglass.rsi + +- type: reagent + id: GinTonic + name: gin and tonic + desc: An all time classic, mild cocktail. + physicalDesc: strong-smelling + color: "#004166" + spritePath: gintonicglass.rsi + +- type: reagent + id: Goldschlager + name: Goldschlager + desc: 100 proof cinnamon schnapps, made for alcoholic teen girls on spring break. + physicalDesc: strong-smelling + color: "#FFFF91" + spritePath: goldschlagerglass.rsi + +- type: reagent + id: Grog + name: grog + desc: Watered-down rum, pirate approved! + physicalDesc: strong-smelling + color: "#664300" + spritePath: grogglass.rsi + +- type: reagent + id: HippiesDelight + name: hippies delight + desc: You just don't get it maaaan. + physicalDesc: strong-smelling + color: "#6eaa0c" + spritePath: hippiesdelightglass.rsi + +- type: reagent + id: Hooch + name: hooch + desc: Either someone's failure at cocktail making or attempt in alchohol production. In any case, do you really want to drink that? + physicalDesc: strong-smelling + color: "#664e00" + spritePath: glass_brown2.rsi + +- type: reagent + id: IcedBeer + name: iced beer + desc: A beer which is so cold the air around it freezes. + physicalDesc: bubbly + color: "#664300" + spritePath: iced_beerglass.rsi + +- type: reagent + id: IrishCarBomb + name: irish car bomb + desc: A troubling mixture of irish cream and ale. + physicalDesc: bubbly + color: "#2E6671" + spritePath: irishcarbomb.rsi + +- type: reagent + id: IrishCream + name: irish cream + desc: Whiskey-imbued cream. What else could you expect from the Irish. + physicalDesc: creamy + color: "#664300" + spritePath: irishcreamglass.rsi + +- type: reagent + id: IrishCoffee + name: irish coffee + desc: Coffee served with irish cream. Regular cream just isn't the same! + physicalDesc: cloudy + color: "#664300" + spritePath: irishcoffeeglass.rsi + +- type: reagent + id: KiraSpecial + name: kira special + desc: Long live the guy who everyone had mistaken for a girl. Baka! + physicalDesc: strong-smelling + color: "#CCCC99" + spritePath: kiraspecial.rsi - type: reagent id: Lean @@ -197,3 +451,226 @@ desc: Lean mixed with moonshine. Turn up for months. physicalDesc: bubbly color: "#9d5fb8" + +- type: reagent + id: LongIslandIcedTea + name: long island iced tea + desc: The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only. + physicalDesc: strong-smelling + color: "#664300" + spritePath: longislandicedteaglass.rsi + +- type: reagent + id: Manhattan + name: manhattan + desc: The Detective's undercover drink of choice. He never could stomach gin... + physicalDesc: strong-smelling + color: "#664300" + spritePath: manhattanglass.rsi + +- type: reagent + id: ManhattanProject + name: manhattan project + desc: A scientist's drink of choice, for pondering ways to blow up the ship. + physicalDesc: strong-smelling + color: "#664300" + spritePath: proj_manhattanglass.rsi + +- type: reagent + id: ManlyDorf + name: manly dorf + desc: Beer and Ale, brought together in a delicious mix. Intended for stout dwarves only. + physicalDesc: bubbly + color: "#664300" + spritePath: manlydorfglass.rsi + +- type: reagent + id: Margarita + name: margarita + desc: On the rocks with salt on the rim. Arriba~! + physicalDesc: strong-smelling + color: "#8CFF8C" + spritePath: margaritaglass.rsi + +- type: reagent + id: Martini + name: classic martini + desc: Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious. + physicalDesc: strong-smelling + color: "#664300" + spritePath: martiniglass.rsi + +- type: reagent + id: Mead + name: mead + desc: A Viking's drink, though a cheap one. + physicalDesc: strong-smelling + color: "#664300" + spritePath: meadglass.rsi + +- type: reagent + id: Mojito + name: mojito + desc: If it's good enough for Spesscuba, it's good enough for you. + physicalDesc: strong-smelling + color: "#664300" + spritePath: mojito.rsi + +- type: reagent + id: Moonshine + name: moonshine + desc: Artisanal homemade liquor. What could go wrong? + physicalDesc: strong-smelling + color: "#d1d7d155" + +- type: reagent + id: Neurotoxin + name: neurotoxin + desc: A strong neurotoxin that puts the subject into a death-like state. + physicalDesc: strong-smelling + color: "#2E2E61" + spritePath: neurotoxinglass.rsi + +- type: reagent + id: Patron + name: patron + desc: Tequila with silver in it, a favorite of alcoholic women in the club scene. + physicalDesc: metallic + color: "#585840" + spritePath: patronglass.rsi + +- type: reagent + id: RedMead + name: red mead + desc: The true Viking's drink! Even though it has a strange red color. + physicalDesc: strong-smelling + color: "#C73C00" + spritePath: red_meadglass.rsi + +- type: reagent + id: Rewriter + name: rewriter + desc: The secret of the sanctuary of the Libarian... + physicalDesc: strong-smelling + color: "#485000" + spritePath: rewriter.rsi + +- type: reagent + id: Sbiten + name: sbiten + desc: A spicy Vodka! Might be a little hot for the little guys! + physicalDesc: strong-smelling + color: "#004166" + spritePath: sbitenglass.rsi + +- type: reagent + id: ScrewdriverCocktail + name: screwdriver + desc: Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious. + physicalDesc: strong-smelling + color: "#A68310" + spritePath: screwdriverglass.rsi + +- type: reagent + id: Silencer + name: silencer + desc: A drink from Mime Heaven. + physicalDesc: strong-smelling + color: "#004666" + spritePath: silencerglass.rsi + +- type: reagent + id: Singulo + name: singulo + desc: A blue-space beverage! + physicalDesc: strong-smelling + color: "#3b0c0c" + spritePath: singulo.rsi + +- type: reagent + id: SnowWhite + name: snow white + desc: A cold refreshment. + physicalDesc: bubbly + color: "#FFFFFF" + spritePath: snowwhite.rsi + +- type: reagent + id: SuiDream + name: sui dream + desc: 'Comprised of: White soda, blue curacao, melon liquor.' + physicalDesc: strong-smelling + color: "#00A86B" + spritePath: sdreamglass.rsi + +- type: reagent + id: SyndicateBomb + name: syndicate bomb + desc: Somebody set us up the bomb! + physicalDesc: opaque + color: "#2E6660" + spritePath: syndicatebomb.rsi + +- type: reagent + id: TequilaSunrise + name: tequila sunrise + desc: Tequila and orange juice. Much like a Screwdriver, only Mexican. + physicalDesc: strong-smelling + color: "#FFE48C" + spritePath: tequillasunriseglass.rsi + +- type: reagent + id: ThreeMileIsland + name: three mile island iced tea + desc: "Made for a woman, strong enough for a man." + physicalDesc: strong-smelling + color: "#666340" + spritePath: threemileislandglass.rsi + +- type: reagent + id: ToxinsSpecial + name: toxins special + desc: This thing is ON FIRE! CALL THE DAMN SHUTTLE! + physicalDesc: strong-smelling + color: "#665c00" + spritePath: toxinsspecialglass.rsi + +- type: reagent + id: VodkaMartini + name: vodka martini + desc: Vodka with Gin. Not quite how 007 enjoyed it, but still delicious. + physicalDesc: strong-smelling + color: "#004666" + spritePath: martiniglass.rsi + +- type: reagent + id: VodkaTonic + name: vodka tonic + desc: For when a gin and tonic isn't russian enough. + physicalDesc: strong-smelling + color: "#0064C8" + spritePath: vodkatonicglass.rsi + +- type: reagent + id: WhiskeyCola + name: whiskey cola + desc: Whiskey, mixed with cola. Surprisingly refreshing. + physicalDesc: bubbly + color: "#3E1B00" + spritePath: whiskeycolaglass.rsi + +- type: reagent + id: WhiskeySoda + name: whiskey soda + desc: For the more refined griffon. + physicalDesc: strong-smelling + color: "#533600" + spritePath: whiskeysodaglass.rsi + +- type: reagent + id: WhiteRussian + name: white russian + desc: That's just, like, your opinion, man... + physicalDesc: strong-smelling + color: "#A68340" + spritePath: whiterussianglass.rsi diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index baa8792dd2..61ce9b1f5b 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -5,13 +5,6 @@ physicalDesc: aromatic color: "#664300" -- type: reagent - id: Tea - name: tea - desc: A drink made by boiling leaves of the tea tree, Camellia sinensis. - physicalDesc: aromatic - color: "#8a5a3a" - - type: reagent id: Cream name: cream @@ -19,6 +12,62 @@ physicalDesc: creamy color: "#DFD7AF" +- type: reagent + id: CafeLatte + name: cafe latte + desc: A nice, strong and tasty beverage while you are reading. + physicalDesc: creamy + color: "#664300" + spritePath: cafe_latte.rsi + +- type: reagent + id: GreenTea + name: green tea + desc: Tasty green tea. + physicalDesc: aromatic + color: "#C33F00" + spritePath: glass_green.rsi #Placeholder + +- type: reagent + id: Grenadine + name: grenadine + desc: Not cherry flavored! + physicalDesc: dark-red + color: "#EA1D26" + spritePath: grenadineglass.rsi + +- type: reagent + id: IcedCoffee + name: iced coffee + desc: Coffee and ice, refreshing and cool. + physicalDesc: aromatic + color: "#102838" + spritePath: icedcoffeeglass.rsi + +- type: reagent + id: IcedGreenTea + name: iced green tea + desc: cold green tea. + physicalDesc: aromatic + color: "#CE4200" + spritePath: glass_green.rsi #Placeholder + +- type: reagent + id: IcedTea + name: iced tea + desc: No relation to a certain rap artist/actor. + physicalDesc: aromatic + color: "#104038" + spritePath: icedteaglass.rsi + +- type: reagent + id: Lemonade + name: lemonade + desc: Drink using lemon juice, water, and a sweetener such as cane sugar or honey. + physicalDesc: tart + color: "#FFFF00" + spritePath: lemonadeglass.rsi + - type: reagent id: Milk name: milk @@ -32,11 +81,11 @@ amount: 0.9 - type: reagent - id: SpoiledMilk - name: spoiled milk - desc: This milk has gone rancid. - physicalDesc: putrid - color: "#faffba" + id: MilkOat + name: oat milk + desc: Surprisingly tasty. + physicalDesc: refreshing + color: "#302000" - type: reagent id: MilkSoy @@ -46,8 +95,52 @@ color: "#302000" - type: reagent - id: MilkOat - name: oat milk - desc: Surprisingly tasty. - physicalDesc: refreshing - color: "#302000" + id: MilkSpoiled + name: spoiled milk + desc: This milk has gone rancid. + physicalDesc: putrid + color: "#faffba" + +- type: reagent + id: Nothing + name: nothing + desc: Absolutely nothing. + physicalDesc: nothing + spritePath: nothing.rsi + +- type: reagent + id: NukaCola + name: nuka cola + desc: Cola, cola never changes. + physicalDesc: fizzy + color: "#100800" + spritePath: nuka_colaglass.rsi + +- type: reagent + id: SodaWater + name: soda water + desc: A container of club soda. Why not make a scotch and soda? + physicalDesc: fizzy + color: "#619494" + +- type: reagent + id: SoyLatte + name: soy latte + desc: A coffee drink made with espresso and steamed soy milk. + physicalDesc: strong-smelling + color: "#664300" + spritePath: soy_latte.rsi + +- type: reagent + id: Tea + name: tea + desc: A drink made by boiling leaves of the tea tree, Camellia sinensis. + physicalDesc: aromatic + color: "#8a5a3a" + +- type: reagent + id: TonicWater + name: tonic water + desc: It tastes strange but at least the quinine keeps the Space Malaria at bay. + physicalDesc: fizzy + color: "#0064C8" diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml index ac4a65a2f5..24052a7e95 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml @@ -5,6 +5,13 @@ physicalDesc: crisp color: "#FDAD01" +- type: reagent + id: JuiceBanana + name: banana juice + desc: The raw essence of a banana. HONK. + physicalDesc: crisp + color: "#FFE777" + - type: reagent id: JuiceBerry name: berry juice @@ -12,12 +19,19 @@ physicalDesc: sweet color: "#660099" +# /datum/reagent/drink/poisonberryjuice/on_mob_life(var/mob/living/M) + +# if(..()) +# return 1 + +# M.adjustToxLoss(1) + - type: reagent - id: JuiceBanana - name: banana juice - desc: The raw essence of a banana. HONK. - physicalDesc: crisp - color: "#FFE777" + id: JuiceBerryPoison + name: poison berry juice + desc: A surprisingly tasty juice blended from various kinds of very deadly and toxic berries. + physicalDesc: aromatic #maybe should be 'sickly'? + color: "#6600CC" #TODO: port on_mob_life: restore eyesight #if(..()) @@ -38,11 +52,11 @@ color: "#FF8820" - type: reagent - id: JuiceLime - name: lime juice - desc: The sweet-sour juice of limes. - physicalDesc: citric - color: "#99bb43" + id: JuiceGrape + name: grape juice + desc: Freshly squeezed juice from red grapes. Quite sweet. + physicalDesc: crisp + color: "#512284" - type: reagent id: JuiceLemon @@ -52,11 +66,11 @@ color: "#fff690" - type: reagent - id: JuiceGrape - name: grape juice - desc: Freshly squeezed juice from red grapes. Quite sweet. - physicalDesc: crisp - color: "#512284" + id: JuiceLime + name: lime juice + desc: The sweet-sour juice of limes. + physicalDesc: citric + color: "#99bb43" # /datum/reagent/drink/orangejuice/on_mob_life(var/mob/living/M) @@ -73,6 +87,20 @@ physicalDesc: citric color: "#E78108" +- type: reagent + id: JuicePineapple + name: pineapple juice + desc: The delicious juice of a pineapple. + physicalDesc: tropical + color: yellow + +- type: reagent + id: JuicePotato + name: potato juice + desc: Juice of the potato. Bleh. + physicalDesc: starchy + color: "#302000" + - type: reagent id: JuiceTomato name: tomato juice @@ -80,37 +108,9 @@ physicalDesc: saucey color: "#731008" -# /datum/reagent/drink/poisonberryjuice/on_mob_life(var/mob/living/M) - -# if(..()) -# return 1 - -# M.adjustToxLoss(1) - -- type: reagent - id: JuiceBerryPoison - name: poison berry juice - desc: A surprisingly tasty juice blended from various kinds of very deadly and toxic berries. - physicalDesc: aromatic #maybe should be 'sickly'? - color: "#6600CC" - - type: reagent id: JuiceWatermelon name: water melon juice desc: The delicious juice of a watermelon. physicalDesc: sweet color: "#EF3520" - -- type: reagent - id: JuicePineapple - name: pineapple juice - desc: The delicious juice of a pineapple. - physicalDesc: tropical - color: yellow - -# - type: reagent -# id: PotatoJuice -# name: potato juice -# desc: Juice of the potato. Bleh. -# physicalDesc: starchy -# color: "#302000" diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml index b28baa70f1..3e72adc2ee 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml @@ -13,8 +13,93 @@ amount: 0.1 - type: reagent - id: ThirteenLoko - name: Thirteen Loko + id: ChangelingSting + name: changeling sting + desc: You take a tiny sip and feel a burning sensation... + physicalDesc: fizzy + color: "#2E6671" + plantMetabolism: + - !type:AdjustNutrition + amount: 0.1 + - !type:AdjustWater + amount: 1 + - !type:AdjustHealth + amount: 0.1 + +- type: reagent + id: DrGibb + name: Dr. Gibb + desc: A delicious blend of 42 different flavours. + physicalDesc: fizzy + color: "#102000" + plantMetabolism: + - !type:AdjustNutrition + amount: 0.1 + - !type:AdjustWater + amount: 1 + - !type:AdjustHealth + amount: 0.1 + +- type: reagent + id: LemonLime + name: lemon-lime + desc: tangy lime and lemon soda + physicalDesc: fizzy + color: "#878F00" + spritePath: lemonlime.rsi + plantMetabolism: + - !type:AdjustNutrition + amount: 0.1 + - !type:AdjustWater + amount: 1 + - !type:AdjustHealth + amount: 0.1 + +- type: reagent + id: PwrGame + name: Pwr Game + desc: The only drink with the PWR that true gamers crave. + physicalDesc: fizzy + color: "#9385bf" + plantMetabolism: + - !type:AdjustNutrition + amount: 0.1 + - !type:AdjustWater + amount: 1 + - !type:AdjustHealth + amount: 0.1 + +- type: reagent + id: SpaceMountainWind + name: Space Mountain Wind + desc: Blows right through you like a space wind. + physicalDesc: fizzy + color: "#102000" + plantMetabolism: + - !type:AdjustNutrition + amount: 0.1 + - !type:AdjustWater + amount: 1 + - !type:AdjustHealth + amount: 0.1 + +- type: reagent + id: SpaceUp + name: Space-Up + desc: Tastes like a hull breach in your mouth. + physicalDesc: fizzy + color: "#00FF00" + plantMetabolism: + - !type:AdjustNutrition + amount: 0.1 + - !type:AdjustWater + amount: 1 + - !type:AdjustHealth + amount: 0.1 + +- type: reagent + id: FourteenLoko + name: Fourteen Loko desc: A highly processed liquid substance barely-passing intergalatic health standarts for a soft drink. physicalDesc: fizzy color: "#deb928" diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml index 3c1bcc7507..c2bc6011dd 100644 --- a/Resources/Prototypes/Reagents/elements.yml +++ b/Resources/Prototypes/Reagents/elements.yml @@ -61,6 +61,15 @@ - !type:AdjustHealth amount: -2 +- type: reagent + id: Gold + name: gold + desc: Gold is a dense, soft, shiny metal and the most malleable and ductile metal known. + physicalDesc: metallic + color: "#F7C430" + boilingPoint: 2700.0 + meltingPoint: 1064.76 + - type: reagent id: Hydrogen name: hydrogen @@ -169,6 +178,15 @@ boilingPoint: 3265.0 meltingPoint: 1414.0 +- type: reagent + id: Silver + name: silver + desc: A soft, white, lustrous transition metal, it has the highest electrical conductivity of any element and the highest thermal conductivity of any metal. + physicalDesc: metallic + color: "#d0d0d0" + boilingPoint: 2212.0 + meltingPoint: 960.5 + - type: reagent id: Sulfur name: sulfur diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index e071f05d8c..241b80a397 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -1,64 +1,14 @@ - type: reaction - id: ManlyDorf - reactants: - Beer: - amount: 1 - Ale: - amount: 2 - products: - ManlyDorf: 3 - -- type: reaction - id: CubaLibre - reactants: - Cola: - amount: 1 - Rum: - amount: 2 - products: - CubaLibre: 3 - -- type: reaction - id: IrishCream + id: Antifreeze reactants: Cream: amount: 1 - Whiskey: + Ice: + amount: 1 + Vodka: amount: 2 products: - IrishCream: 3 - -- type: reaction - id: IrishCoffee - reactants: - IrishCream: - amount: 2 - Coffee: - amount: 2 - products: - IrishCoffee: 4 - -- type: reaction - id: IrishCarBomb - reactants: - IrishCream: - amount: 1 - Ale: - amount: 1 - products: - IrishCarBomb: 2 - -- type: reaction - id: B52 - reactants: - IrishCarBomb: - amount: 1 - Kahlua: - amount: 1 - Cognac: - amount: 1 - products: - B52: 3 + Antifreeze: 4 - type: reaction id: AtomicBomb @@ -71,60 +21,298 @@ AtomicBomb: 11 - type: reaction - id: WhiskeyCola + id: B52 reactants: - Whiskey: - amount: 2 - Cola: + Cognac: + amount: 1 + IrishCarBomb: + amount: 1 + Kahlua: amount: 1 products: - WhiskeyCola: 3 + B52: 3 - type: reaction - id: SyndicateBomb + id: BananaHonk reactants: - WhiskeyCola: - amount: 1 - Beer: - amount: 1 - products: - SyndicateBomb: 2 - -- type: reaction - id: Antifreeze - reactants: - Vodka: - amount: 2 Cream: amount: 1 + JuiceBanana: + amount: 1 + Sugar: + amount: 1 + products: + BananaHonk: 3 + +- type: reaction + id: BeepskySmash + reactants: + Iron: + amount: 1 + JuiceLime: + amount: 1 + Whiskey: + amount: 1 + products: + BeepskySmash: 2 + +- type: reaction + id: Bilk + reactants: + Beer: + amount: 1 + Milk: + amount: 1 + products: + Bilk: 2 + +- type: reaction + id: BlackRussian + reactants: + Kahlua: + amount: 1 + Vodka: + amount: 2 + products: + BlackRussian: 3 + +- type: reaction + id: BloodyMary + reactants: + JuiceLime: + amount: 1 + JuiceTomato: + amount: 3 + Vodka: + amount: 2 + products: + BloodyMary: 6 + +- type: reaction + id: Booger + reactants: + Cream: + amount: 2 + JuiceBanana: + amount: 1 + JuiceWatermelon: + amount: 1 + Rum: + amount: 1 + products: + Booger: 5 + +- type: reaction + id: BraveBull + reactants: + Kahlua: + amount: 1 + Tequila: + amount: 2 + products: + BraveBull: 3 + +- type: reaction + id: BrownStar + reactants: + Cola: + amount: 1 + JuiceOrange: + amount: 2 + products: + BrownStar: 3 + +- type: reaction + id: CafeLatte + reactants: + Coffee: + amount: 1 + Milk: + amount: 1 + products: + CafeLatte: 2 + +- type: reaction + id: CubaLibre + reactants: + Cola: + amount: 1 + Rum: + amount: 2 + products: + CubaLibre: 3 + +- type: reaction + id: DoctorsDelight + reactants: + Cream: + amount: 2 + JuiceLime: + amount: 1 + JuiceOrange: + amount: 1 + JuiceTomato: + amount: 1 + Tricordrazine: + amount: 1 + products: + DoctorsDelight: 6 + +- type: reaction + id: DriestMartini + reactants: + Gin: + amount: 1 + Nothing: + amount: 1 + products: + DriestMartini: 2 + +- type: reaction + id: ErikaSuprise + reactants: + Ale: + amount: 2 + Ice: + amount: 1 + JuiceBanana: + amount: 1 + JuiceLime: + amount: 1 + Whiskey: + amount: 1 + products: + ErikaSuprise: 6 + +- type: reaction + id: FourteenLoko + reactants: + Coffee: + amount: 1 + JuiceLime: + amount: 1 + Vodka: + amount: 1 + products: + FourteenLoko: 3 + +- type: reaction + id: GargleBlaster + reactants: + Cognac: + amount: 1 + Gin: + amount: 1 + JuiceLime: + amount: 1 + Vodka: + amount: 1 + Whiskey: + amount: 1 + products: + GargleBlaster: 5 + +- type: reaction + id: GinFizz + reactants: + Gin: + amount: 1 + JuiceLime: + amount: 1 + SodaWater: + amount: 1 + products: + GinFizz: 3 + +- type: reaction + id: GinTonic + reactants: + Gin: + amount: 2 + TonicWater: + amount: 1 + products: + GinTonic: 3 + +- type: reaction + id: Goldschlager + reactants: + Gold: + amount: 1 + Vodka: + amount: 10 + products: + Goldschlager: 10 + +- type: reaction + id: Grog + reactants: + Rum: + amount: 1 + Water: + amount: 1 + products: + Grog: 2 + +- type: reaction + id: IcedCoffee + reactants: + Coffee: + amount: 2 Ice: amount: 1 products: - Antifreeze: 4 + IcedCoffee: 3 - type: reaction - id: Moonshine + id: IcedGreenTea reactants: - Vodka: - amount: 1 - Tequila: - amount: 1 - Whiskey: + GreenTea: + amount: 2 + Ice: amount: 1 products: - Moonshine: 3 + IcedGreenTea: 3 - type: reaction - id: CreamyDelight + id: IcedTea reactants: - Moonshine: + Ice: amount: 1 + Tea: + amount: 2 + products: + IcedTea: 3 + +- type: reaction + id: IrishCarBomb + reactants: + Ale: + amount: 1 + IrishCream: + amount: 1 + products: + IrishCarBomb: 2 + +- type: reaction + id: IrishCoffee + reactants: + Coffee: + amount: 2 + IrishCream: + amount: 2 + products: + IrishCoffee: 4 + +- type: reaction + id: IrishCream + reactants: Cream: amount: 1 - Wine: - amount: 1 + Whiskey: + amount: 2 products: - CreamyDelight: 3 + IrishCream: 3 - type: reaction id: LeanShine @@ -135,3 +323,209 @@ amount: 1 products: LeanShine: 2 + +- type: reaction + id: Lemonade + reactants: + JuiceLemon: + amount: 1 + Sugar: + amount: 1 + Water: + amount: 1 + products: + Lemonade: 3 + +- type: reaction + id: LemonLime + reactants: + JuiceLemon: + amount: 1 + JuiceLime: + amount: 1 + SodaWater: + amount: 1 + products: + LemonLime: 3 + +- type: reaction + id: LongIslandIcedTea + reactants: + CubaLibre: + amount: 3 + Gin: + amount: 1 + Tequila: + amount: 1 + Vodka: + amount: 1 + products: + LongIslandIcedTea: 6 + +- type: reaction + id: KiraSpecial + reactants: + JuiceLime: + amount: 1 + JuiceOrange: + amount: 1 + SodaWater: + amount: 1 + products: + KiraSpecial: 3 + +- type: reaction + id: ManlyDorf + reactants: + Ale: + amount: 2 + Beer: + amount: 1 + products: + ManlyDorf: 3 + +- type: reaction + id: Martini + reactants: + Gin: + amount: 2 + Vermouth: + amount: 1 + products: + Martini: 3 + +- type: reaction + id: Mojito + reactants: + JuiceLime: + amount: 1 + Rum: + amount: 1 + SodaWater: + amount: 1 + Sugar: + amount: 1 + products: + Mojito: 4 + +- type: reaction + id: Moonshine + reactants: + Tequila: + amount: 1 + Vodka: + amount: 1 + Whiskey: + amount: 1 + products: + Moonshine: 3 + +- type: reaction + id: NukaCola + reactants: + Cola: + amount: 5 + Uranium: + amount: 1 + products: + NukaCola: 5 + +- type: reaction + id: Patron + reactants: + Tequila: + amount: 10 + Silver: + amount: 1 + products: + Patron: 10 + +- type: reaction + id: Rewriter + reactants: + Coffee: + amount: 1 + SpaceMountainWind: + amount: 1 + products: + Rewriter: 2 + +- type: reaction + id: ScrewdriverCocktail + reactants: + JuiceOrange: + amount: 1 + Vodka: + amount: 2 + products: + ScrewdriverCocktail: 3 + +- type: reaction + id: SoyLatte + reactants: + Coffee: + amount: 1 + MilkSoy: + amount: 1 + products: + SoyLatte: 2 + +- type: reaction + id: SyndicateBomb + reactants: + Beer: + amount: 1 + WhiskeyCola: + amount: 1 + products: + SyndicateBomb: 2 + +- type: reaction + id: TequilaSunrise + reactants: + JuiceOrange: + amount: 1 + Tequila: + amount: 2 + products: + TequilaSunrise: 3 + +- type: reaction + id: ThreeMileIsland + reactants: + LongIslandIcedTea: + amount: 10 + Uranium: + amount: 1 + products: + ThreeMileIsland: 10 + +- type: reaction + id: VodkaMartini + reactants: + Vermouth: + amount: 1 + Vodka: + amount: 2 + products: + VodkaMartini: 3 + +- type: reaction + id: WhiskeyCola + reactants: + Cola: + amount: 1 + Whiskey: + amount: 2 + products: + WhiskeyCola: 3 + +- type: reaction + id: WhiteRussian + reactants: + BlackRussian: + amount: 2 + Cream: + amount: 1 + products: + WhiteRussian: 3 diff --git a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/icon.png new file mode 100644 index 0000000000..a9c14d6e75 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/icon_open.png new file mode 100644 index 0000000000..de9a1e6eb7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/thirteen_loko.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/thirteen_loko.rsi/inhand-left.png rename to Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/thirteen_loko.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/thirteen_loko.rsi/inhand-right.png rename to Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/thirteen_loko.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/thirteen_loko.rsi/meta.json rename to Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/meta.json diff --git a/Resources/Textures/Objects/Consumable/Drinks/thirteen_loko_glass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/thirteen_loko_glass.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/icon.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/thirteen_loko_glass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/thirteen_loko_glass.rsi/meta.json rename to Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/meta.json diff --git a/Resources/Textures/Objects/Consumable/Drinks/thirteen_loko.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/thirteen_loko.rsi/icon.png deleted file mode 100644 index 454a5b81aa..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/thirteen_loko.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/thirteen_loko.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/thirteen_loko.rsi/icon_open.png deleted file mode 100644 index b966efa0b2..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/thirteen_loko.rsi/icon_open.png and /dev/null differ