From: Firewatch <54725557+musicmanvr@users.noreply.github.com> Date: Mon, 1 Apr 2024 06:41:14 +0000 (-0400) Subject: Bartender "Essentials" (#25367) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=ea3e98e1208f21aa2a52b0a9938ee22e07b74ccd;p=space-station-14.git Bartender "Essentials" (#25367) * drinks round 1 saving my progress before my hard drive explodes * test 2 please work * name fixes whoops * Update drinks.yml * various fixes am dumb * add sol dry to vends more fixes and changes, yippee! * more fixes & ingame testing shrimple tests * last fixes :trollface: should be ready for pr now * Update soda.yml sate thirst --- diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 35de5555a2..61567d8695 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -188,6 +188,7 @@ flavor-complex-tonic-water = like angry water flavor-complex-cola = like cola flavor-complex-energy-drink = like battery acid flavor-complex-dr-gibb = like malpractice +flavor-complex-ginger-soda = like ginger flavor-complex-grape-soda = like grape soda flavor-complex-lemon-lime-soda = like lemon-lime soda flavor-complex-pwr-game-soda = like gaming @@ -200,6 +201,7 @@ flavor-complex-vodka = like fermented grain flavor-complex-tequila = like fermented death flavor-complex-sake = like sweet, alcoholic rice flavor-complex-rum = like fermented sugar +flavor-complex-coconut-rum = like nutty fermented sugar flavor-complex-coffee-liquor = like strong, bitter coffee flavor-complex-whiskey = like molasses flavor-complex-shitty-wine = like grape rinds @@ -212,6 +214,11 @@ flavor-complex-ice = like ice flavor-complex-mopwata = like stagnant, dirty water ## Cocktails +flavor-complex-arnold-palmer = like a hole-in-one +flavor-complex-blue-hawaiian = like the tropics +flavor-complex-cosmopolitan = sweet and tangy +flavor-complex-painkiller = like spiked pineapple juice +flavor-complex-pina-colada = like tropical sun flavor-complex-long-island = suspiciously like iced tea flavor-complex-three-mile-island = like tea brewed in nuclear runoff flavor-complex-whiskey-cola = like carbonated molasses diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl index 099d23c465..4c38e92558 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl @@ -82,6 +82,9 @@ reagent-desc-atomic-bomb = Nuclear proliferation never tasted so good. reagent-name-b52 = b-52 reagent-desc-b52 = Coffee, irish cream, and cognac. You will get bombed. +reagent-name-blue-hawaiian = blue hawaiian +reagent-desc-blue-hawaiian = Aloha! Does that mean hello or goodbye? + reagent-name-bahama-mama = bahama mama reagent-desc-bahama-mama = Tropical cocktail. @@ -106,6 +109,12 @@ reagent-desc-booger = Ewww... reagent-name-brave-bull = brave bull reagent-desc-brave-bull = It's just as effective as Dutch-Courage! +reagent-name-coconut-rum = coconut rum +reagent-desc-coconut-rum = Rum with coconut for that tropical feel. + +reagent-name-cosmopolitan = cosmopolitan +reagent-desc-cosmopolitan = Even in the worst situations, nothing beats a fresh cosmopolitan. + reagent-name-cuba-libre = cuba libre reagent-desc-cuba-libre = Rum, mixed with cola. Viva la revolucion. @@ -190,9 +199,15 @@ reagent-desc-moonshine = Artisanal homemade liquor. What could go wrong? reagent-name-neurotoxin = neurotoxin reagent-desc-neurotoxin = A strong neurotoxin that puts the subject into a death-like state. +reagent-name-painkiller = painkiller +reagent-desc-painkiller = A cure for what ails you. + reagent-name-patron = patron reagent-desc-patron = Tequila with silver in it, a favorite of alcoholic women in the club scene. +reagent-name-pina-colada = piña colada +reagent-desc-pina-colada = For getting lost in the rain. + reagent-name-red-mead = red mead reagent-desc-red-mead = The true Viking's drink! Even though it has a strange red color. diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl index ad0ade7c96..359e866fd9 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl @@ -4,6 +4,12 @@ reagent-desc-coffee = A drink made from brewed coffee beans. Contains a moderate reagent-name-cream = cream reagent-desc-cream = The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh? +reagent-name-coconut-water = coconut water +reagent-desc-coconut-water = A favorite of survivors on deserted islands. + +reagent-name-cream-of-coconut = cream of coconut +reagent-desc-cream-of-coconut = Sweet, syrupy version of coconut cream with added sugar. + reagent-name-cafe-latte = cafe latte reagent-desc-cafe-latte = A nice, strong and tasty beverage while you are reading. @@ -17,7 +23,7 @@ reagent-name-iced-coffee = iced coffee reagent-desc-iced-coffee = Coffee and ice, refreshing and cool. reagent-name-iced-green-tea = iced green tea -reagent-desc-iced-green-tea = cold green tea. +reagent-desc-iced-green-tea = Cold green tea. reagent-name-iced-tea = iced tea reagent-desc-iced-tea = No relation to a certain rap artist/actor. @@ -25,6 +31,9 @@ reagent-desc-iced-tea = No relation to a certain rap artist/actor. reagent-name-lemonade = lemonade reagent-desc-lemonade = Drink using lemon juice, water, and a sweetener such as cane sugar or honey. +reagent-name-arnold-palmer = arnold palmer +reagent-desc-arnold-palmer = Now watch this drive. + reagent-name-milk = milk reagent-desc-milk = An opaque white liquid produced by the mammary glands of mammals. @@ -86,4 +95,4 @@ reagent-name-white-gilgamesh = white gilgamesh reagent-desc-white-gilgamesh = A sickening mixture of milk and beer. Makes you feel like you're made of wood. reagent-name-mopwata = mopwata -reagent-desc-mopwata = Dirty, stagnant mop water. \ No newline at end of file +reagent-desc-mopwata = Dirty, stagnant mop water. diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl index 08017c265d..300284aee9 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl @@ -1,6 +1,9 @@ reagent-name-cola = cola reagent-desc-cola = A sweet, carbonated soft drink. Caffeine free. +reagent-name-shirley-temple = shirley temple +reagent-desc-shirley-temple = A favorite amongst younger members of the crew. + reagent-name-changeling-sting = changeling sting reagent-desc-changeling-sting = You take a tiny sip and feel a burning sensation... @@ -28,6 +31,12 @@ reagent-desc-root-beer = A very sweet, carbonated drink reminiscent of sarsparil reagent-name-root-beer-float = root beer float reagent-desc-root-beer-float = Root beer, but now with ice cream on top. It truly is the magnum opus of Canadian summertime drinks. +reagent-name-sol-dry = sol dry +reagent-desc-sol-dry = Sweet ginger soda from outer space! + +reagent-name-roy-rogers = roy rogers +reagent-desc-roy-rogers = Solid proof that there IS something known as too sweet. + reagent-name-space-mountain-wind = Space Mountain Wind reagent-desc-space-mountain-wind = Blows right through you like a space wind. diff --git a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml index d337d23f2a..975541a502 100644 --- a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml +++ b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml @@ -1,11 +1,11 @@ - type: reagentDispenserInventory id: SodaDispenserInventory inventory: + - DrinkCoconutWaterJug - DrinkCoffeeJug - DrinkColaBottleFull - DrinkCreamCartonXL - DrinkDrGibbJug - - DrinkEnergyDrinkJug - DrinkGreenTeaJug - DrinkIceJug - DrinkJuiceLimeCartonXL diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index 91dc9f51cb..eaa4c839af 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -13,6 +13,7 @@ DrinkBeerBottleFull: 5 DrinkBlueCuracaoBottleFull: 2 DrinkCognacBottleFull: 4 + DrinkCoconutWaterCarton: 3 DrinkColaBottleFull: 4 DrinkMilkCarton: 2 DrinkCreamCarton: 5 @@ -27,6 +28,7 @@ DrinkPatronBottleFull: 2 DrinkRumBottleFull: 4 DrinkSodaWaterCan: 8 + DrinkSolDryCan: 8 DrinkSpaceMountainWindBottleFull: 3 DrinkSpaceUpBottleFull: 3 DrinkTequilaBottleFull: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml index 2f9ce3d3ae..ace9102562 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml @@ -5,6 +5,7 @@ DrinkGrapeCan: 2 DrinkRootBeerCan: 2 DrinkIcedTeaCan: 2 + DrinkSolDryCan: 2 DrinkLemonLimeCan: 2 DrinkFourteenLokoCan: 2 emaggedInventory: diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml index 38ea3a0012..98513a48a4 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml @@ -5,6 +5,7 @@ DrinkGrapeCan: 2 DrinkRootBeerCan: 2 DrinkIcedTeaCan: 2 + DrinkSolDryCan: 2 DrinkLemonLimeCan: 2 DrinkFourteenLokoCan: 2 emaggedInventory: diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml index 96513fca8a..cb5a4f5c4b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml @@ -6,6 +6,7 @@ DrinkGrapeCan: 2 DrinkRootBeerCan: 2 DrinkIcedTeaCan: 2 + DrinkSolDryCan: 2 DrinkLemonLimeCan: 2 DrinkFourteenLokoCan: 2 emaggedInventory: diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml index 08c0162c08..6ac70b26db 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml @@ -5,6 +5,7 @@ DrinkGrapeCan: 2 DrinkRootBeerCan: 2 DrinkIcedTeaCan: 2 + DrinkSolDryCan: 2 DrinkLemonLimeCan: 2 DrinkFourteenLokoCan: 2 emaggedInventory: diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml index 494f05f6a3..339683d2c9 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml @@ -5,6 +5,7 @@ DrinkGrapeCan: 3 DrinkRootBeerCan: 3 DrinkIcedTeaCan: 3 + DrinkSolDryCan: 3 DrinkLemonLimeCan: 3 DrinkFourteenLokoCan: 3 emaggedInventory: diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml index 0dc33cf07f..a5f570bd46 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml @@ -6,6 +6,7 @@ DrinkGrapeCan: 2 DrinkRootBeerCan: 2 DrinkIcedTeaCan: 2 + DrinkSolDryCan: 2 DrinkLemonLimeCan: 2 DrinkFourteenLokoCan: 2 emaggedInventory: diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml index 6afbe1eae6..b1a74fc13e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml @@ -5,6 +5,7 @@ DrinkGrapeCan: 2 DrinkRootBeerCan: 2 DrinkIcedTeaCan: 2 + DrinkSolDryCan: 2 DrinkLemonLimeCan: 2 DrinkFourteenLokoCan: 2 emaggedInventory: diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml index 1104214668..ff9e512432 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml @@ -19,6 +19,7 @@ - DrinkAloe - DrinkAndalusia - DrinkAntifreeze + - DrinkArnoldPalmer - DrinkB52Glass - DrinkBahamaMama - DrinkBananaHonkGlass @@ -27,12 +28,15 @@ - DrinkBerryJuice - DrinkBlackRussianGlass - DrinkBlueCuracaoGlass + - DrinkBlueHawaiianGlass - DrinkBloodyMaryGlass - DrinkBooger - DrinkBraveBullGlass - DrinkCarrotJuice + - DrinkCoconutRum - DrinkChocolateGlass - DrinkCognacGlass + - DrinkCosmopolitan - DrinkCubaLibreGlass - DrinkDeadRumGlass - DrinkDevilsKiss @@ -66,15 +70,19 @@ - DrinkMilkshake - DrinkMojito - DrinkNTCahors + - DrinkPainkillerGlass - DrinkPatronGlass + - DrinkPinaColadaGlass - DrinkPoscaGlass - DrinkRedMeadGlass - DrinkRewriter + - DrinkRoyRogersGlass - DrinkRootBeerFloatGlass - DrinkRumGlass - DrinkSakeGlass - DrinkSbitenGlass - DrinkScrewdriverCocktailGlass + - DrinkShirleyTempleGlass - DrinkSuiDreamGlass - DrinkSingulo - DrinkSoyLatte diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml index c8a941c128..e3339082b3 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml @@ -31,6 +31,7 @@ - DrinkDrGibbCan - DrinkEnergyDrinkCan - DrinkShamblersJuiceCan + - DrinkSolDryCan - DrinkPwrGameCan - DrinkHotCoco - DrinkHotCoffee diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml index 67d7954038..84639c9af0 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml @@ -112,6 +112,24 @@ - type: Sprite sprite: Objects/Consumable/Drinks/tomatojuice.rsi +- type: entity + parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull] + id: DrinkCoconutWaterCarton + name: coconut water + description: It's the inside of the coconut that counts. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: CoconutWater + Quantity: 50 + - type: Drink + - type: Label + currentLabel: coconut water + - type: Sprite + sprite: Objects/Consumable/Drinks/coconutwater.rsi + - type: entity parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] id: DrinkCreamCarton diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index bf00dd6327..aac2803dd2 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -258,6 +258,22 @@ - ReagentId: Antifreeze Quantity: 30 +- type: entity + parent: DrinkGlass + id: DrinkArnoldPalmer + suffix: arnold palmer + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ArnoldPalmer + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/arnoldpalmer.rsi + state: icon + - type: entity parent: DrinkGlass id: DrinkAtomicBombGlass @@ -437,6 +453,22 @@ sprite: Objects/Consumable/Drinks/bloodymaryglass.rsi state: icon +- type: entity + parent: DrinkGlass + id: DrinkBlueHawaiianGlass + suffix: blue hawaiian + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: BlueHawaiian + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/bluehawaiian.rsi + state: icon + - type: entity parent: DrinkGlass id: DrinkBooger @@ -501,6 +533,35 @@ sprite: Objects/Consumable/Drinks/chocolateglass.rsi state: icon +- type: entity + parent: DrinkGlass + id: DrinkCoconutRum + suffix: coconut rum + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: CoconutRum + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/coconutrum.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: DrinkCoconutWaterGlass + suffix: coconut water + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: CoconutWater + Quantity: 30 + - type: entity parent: DrinkGlass id: DrinkCoffee @@ -533,6 +594,22 @@ sprite: Objects/Consumable/Drinks/cognacglass.rsi state: icon +- type: entity + parent: DrinkGlass + id: DrinkCosmopolitan + suffix: cosmopolitan + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Cosmopolitan + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/cosmopolitan.rsi + state: icon + - type: entity parent: DrinkGlass id: DrinkCream @@ -1340,6 +1417,22 @@ sprite: Objects/Consumable/Drinks/orangejuice.rsi state: icon +- type: entity + parent: DrinkGlass + id: DrinkPainkillerGlass + suffix: painkiller + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Painkiller + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/painkiller.rsi + state: icon + - type: entity parent: DrinkGlass id: DrinkPatronGlass @@ -1356,6 +1449,22 @@ sprite: Objects/Consumable/Drinks/patronglass.rsi state: icon +- type: entity + parent: DrinkGlass + id: DrinkPinaColadaGlass + suffix: piña colada + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: PinaColada + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/pinacolada.rsi + state: icon + - type: entity parent: DrinkGlass id: DrinkPoisonBerryJuice @@ -1484,6 +1593,22 @@ sprite: Objects/Consumable/Drinks/rumglass.rsi state: icon +- type: entity + parent: DrinkGlass + id: DrinkRoyRogersGlass + suffix: roy rogers + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: RoyRogers + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/royrogers.rsi + state: icon + - type: entity parent: DrinkGlass id: DrinkSakeGlass @@ -1609,6 +1734,22 @@ sprite: Objects/Consumable/Drinks/glass_white.rsi state: icon +- type: entity + parent: DrinkGlass + id: DrinkShirleyTempleGlass + suffix: shirley temple + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ShirleyTemple + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/shirleytemple.rsi + state: icon + - type: entity parent: DrinkGlass id: DrinkSilencerGlass @@ -1641,6 +1782,22 @@ sprite: Objects/Consumable/Drinks/singulo.rsi state: icon +- type: entity + parent: DrinkGlass + id: DrinkSolDryGlass + suffix: sol dry + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: SolDry + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/sol_dry_glass.rsi + state: icon + - type: entity parent: DrinkGlass id: DrinkSnowWhite diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index face999df8..e2361cfa6e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -789,6 +789,23 @@ - type: Label currentLabel: ice +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkCoconutWaterJug + name: coconut water jug + description: It's on the inside of the coconut that counts. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 300 + reagents: + - ReagentId: CoconutWater + Quantity: 300 + - type: Drink + - type: Label + currentLabel: coconut water + - type: entity parent: DrinkBottlePlasticBaseFull id: DrinkCoffeeJug diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index 2aec576177..585e5ed14d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -239,6 +239,24 @@ - type: Item sprite: Objects/Consumable/Drinks/space-up.rsi +- type: entity + parent: DrinkCanBaseFull + id: DrinkSolDryCan + name: sol dry + description: Sweet ginger soda from outer space! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: SolDry + Quantity: 30 + - type: Sprite + sprite: Objects/Consumable/Drinks/sol_dry.rsi + - type: Item + sprite: Objects/Consumable/Drinks/sol_dry.rsi + - type: entity parent: DrinkCanBaseFull id: DrinkStarkistCan diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index 446abf99ed..2b55efc21b 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -624,6 +624,11 @@ flavorType: Complex description: flavor-complex-dr-gibb +- type: flavor + id: gingersoda + flavorType: Complex + description: flavor-complex-ginger-soda + - type: flavor id: lemonlimesoda flavorType: Complex @@ -694,6 +699,11 @@ flavorType: Complex description: flavor-complex-rum +- type: flavor + id: coconutrum + flavorType: Complex + description: flavor-complex-coconut-rum + - type: flavor id: coffeeliquor flavorType: Complex @@ -739,6 +749,31 @@ flavorType: Complex description: flavor-complex-ice +- type: flavor + id: arnoldpalmer + flavorType: Complex + description: flavor-complex-arnold-palmer + +- type: flavor + id: bluehawaiian + flavorType: Complex + description: flavor-complex-blue-hawaiian + +- type: flavor + id: cosmopolitan + flavorType: Complex + description: flavor-complex-cosmopolitan + +- type: flavor + id: painkiller + flavorType: Complex + description: flavor-complex-painkiller + +- type: flavor + id: pinacolada + flavorType: Complex + description: flavor-complex-pina-colada + - type: flavor id: longisland flavorType: Complex diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index f6bac28b32..44eba0f848 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -79,6 +79,26 @@ reagent: Ethanol amount: 0.1 +- type: reagent + id: BlueHawaiian + name: reagent-name-blue-hawaiian + parent: BaseAlcohol + desc: reagent-desc-blue-hawaiian + physicalDesc: reagent-physical-desc-tropical + flavor: bluehawaiian + color: "#47687b" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/bluehawaiian.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 + - type: reagent id: Cognac name: reagent-name-cognac @@ -732,6 +752,46 @@ reagent: Ethanol amount: 0.2 +- type: reagent + id: CoconutRum + name: reagent-name-coconut-rum + parent: BaseAlcohol + desc: reagent-desc-coconut-rum + physicalDesc: reagent-physical-desc-strong-smelling + flavor: rum + color: "#cccbc8" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/coconutrum.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 + +- type: reagent + id: Cosmopolitan + name: reagent-name-cosmopolitan + parent: BaseAlcohol + desc: reagent-desc-cosmopolitan + physicalDesc: reagent-physical-desc-citric + flavor: cosmopolitan + color: "#f73030" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/cosmopolitan.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.15 + - type: reagent id: CubaLibre name: reagent-name-cuba-libre @@ -1254,6 +1314,26 @@ types: Poison: 1 +- type: reagent + id: Painkiller + name: reagent-name-painkiller + parent: BaseAlcohol + desc: reagent-desc-painkiller + physicalDesc: reagent-physical-desc-refreshing + flavor: painkiller + color: "#e6cb47" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/painkiller.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 + - type: reagent id: Patron name: reagent-name-patron @@ -1292,6 +1372,18 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: true +- type: reagent + id: PinaColada + name: reagent-name-pina-colada + parent: BaseAlcohol + desc: reagent-desc-pina-colada + physicalDesc: reagent-physical-desc-tropical + flavor: alcohol + color: "#e8dba4" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/pinacolada.rsi + state: icon + - type: reagent id: Sbiten name: reagent-name-sbiten diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 946a2a6e44..5c09b3c909 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -48,6 +48,34 @@ - !type:SatiateThirst factor: 1 +- type: reagent + id: CoconutWater + name: reagent-name-coconut-water + parent: BaseDrink + desc: reagent-desc-coconut-water + physicalDesc: reagent-physical-desc-milky + flavor: nutty + color: "#f4eadb" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 4 # Coconut water is 94% water + +- type: reagent + id: CreamOfCoconut + name: reagent-name-cream-of-coconut + parent: BaseDrink + desc: reagent-desc-cream-of-coconut + physicalDesc: reagent-physical-desc-syrupy + flavor: creamy + color: "#FFEABF" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - type: reagent id: CafeLatte name: reagent-name-cafe-latte @@ -406,6 +434,26 @@ - !type:SatiateHunger factor: 4 +- type: reagent + id: ArnoldPalmer + name: reagent-name-arnold-palmer + parent: BaseAlcohol + desc: reagent-desc-arnold-palmer + physicalDesc: reagent-physical-desc-sweet + flavor: arnoldpalmer + color: "#d8cc5d" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/arnoldpalmer.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 4 + - !type:AdjustReagent + reagent: Theobromine + amount: 0.05 + - type: reagent id: Pilk name: reagent-name-pilk diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml index 63ae5b25d5..ba5adc4f2a 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml @@ -8,6 +8,23 @@ color: "#6c2828" recognizable: true +- type: reagent + id: RoyRogers + name: reagent-name-roy-rogers + parent: BaseSoda + desc: reagent-desc-roy-rogers + physicalDesc: reagent-physical-desc-sweet + flavor: cola + color: "#262019" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/royrogers.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 4 + - type: reagent id: ChangelingSting name: reagent-name-changeling-sting @@ -116,6 +133,35 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false +- type: reagent + id: SolDry + name: reagent-name-sol-dry + parent: BaseSoda + desc: reagent-desc-sol-dry + physicalDesc: reagent-physical-desc-fizzy + flavor: gingersoda + color: "#ccb87e" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/sol_dry_glass.rsi + state: icon + +- type: reagent + id: ShirleyTemple + name: reagent-name-shirley-temple + parent: BaseSoda + desc: reagent-desc-shirley-temple + physicalDesc: reagent-physical-desc-fizzy + flavor: sweet + color: "#af2221" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/shirleytemple.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 4 + - type: reagent id: SpaceMountainWind name: reagent-name-space-mountain-wind diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index 7608369b2c..c810ebb0ce 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -54,6 +54,16 @@ products: Antifreeze: 4 +- type: reaction + id: ArnoldPalmer + reactants: + IcedTea: + amount: 1 + Lemonade: + amount: 1 + products: + ArnoldPalmer: 2 + - type: reaction id: AtomicBomb reactants: @@ -76,6 +86,20 @@ products: B52: 3 +- type: reaction + id: BlueHawaiian + reactants: + CoconutRum: + amount: 2 + JuicePineapple: + amount: 1 + JuiceLemon: + amount: 1 + BlueCuracao: + amount: 1 + products: + BlueHawaiian: 5 + - type: reaction id: CogChamp reactants: @@ -90,6 +114,24 @@ sound: path: /Audio/Magic/Cults/ClockCult/steam_whoosh.ogg +- type: reaction + id: BahamaMama + reactants: + Ice: + amount: 1 + JuiceOrange: + amount: 1 + JuicePineapple: + amount: 1 + Rum: + amount: 1 + CoconutRum: + amount: 1 + Grenadine: + amount: 1 + products: + BahamaMama: 6 + - type: reaction id: Barefoot reactants: @@ -182,6 +224,40 @@ products: CafeLatte: 2 +- type: reaction + id: CoconutRum + reactants: + Rum: + amount: 2 + CoconutWater: + amount: 1 + products: + CoconutRum: 3 + +- type: reaction + id: Cosmopolitan + reactants: + Vodka: + amount: 1 + JuiceBerry: + amount: 1 + JuiceLime: + amount: 1 + products: + Cosmopolitan: 3 + +- type: reaction + id: CreamOfCoconut + reactants: + CoconutWater: + amount: 1 + Sugar: + amount: 1 + Milk: + amount: 1 + products: + CreamOfCoconut: 3 + - type: reaction id: CubaLibre reactants: @@ -638,6 +714,34 @@ products: Patron: 10 +- type: reaction + id: Painkiller + reactants: + JuicePineapple: + amount: 3 + CoconutRum: + amount: 1 + JuiceOrange: + amount: 1 + CreamOfCoconut: + amount: 1 + products: + Painkiller: 6 + +- type: reaction + id: PinaColada + reactants: + JuicePineapple: + amount: 3 + JuiceLime: + amount: 1 + Rum: + amount: 1 + CreamOfCoconut: + amount: 1 + products: + PinaColada: 6 + - type: reaction id: Posca reactants: @@ -680,6 +784,16 @@ products: RootBeerFloat: 3 +- type: reaction + id: RoyRogers + reactants: + Cola: + amount: 2 + Grenadine: + amount: 1 + products: + RoyRogers: 3 + - type: reaction id: Sbiten reactants: @@ -700,6 +814,16 @@ products: ScrewdriverCocktail: 3 +- type: reaction + id: ShirleyTemple + reactants: + SolDry: + amount: 2 + Grenadine: + amount: 1 + products: + ShirleyTemple: 3 + - type: reaction id: Silencer reactants: diff --git a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon.png new file mode 100644 index 0000000000..81261d0f54 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/meta.json new file mode 100644 index 0000000000..f76e611841 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/icon.png new file mode 100644 index 0000000000..d192a88461 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/meta.json new file mode 100644 index 0000000000..f76e611841 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/icon.png new file mode 100644 index 0000000000..4adab5cb6e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/meta.json new file mode 100644 index 0000000000..f76e611841 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/icon.png new file mode 100644 index 0000000000..a270180dcd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/icon_open.png new file mode 100644 index 0000000000..a81a799855 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/meta.json new file mode 100644 index 0000000000..d7f3d6da42 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC0-1.0", + "copyright": "Original work by noctis on Discord", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/icon.png new file mode 100644 index 0000000000..bd1eff6943 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/meta.json new file mode 100644 index 0000000000..f76e611841 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/icon.png new file mode 100644 index 0000000000..caa81b36f0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/meta.json new file mode 100644 index 0000000000..f76e611841 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/icon.png new file mode 100644 index 0000000000..7a6b0624da Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/meta.json new file mode 100644 index 0000000000..f76e611841 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon.png new file mode 100644 index 0000000000..9426978d72 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/meta.json new file mode 100644 index 0000000000..d16d731d7f --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 1, + 1, + 1, + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon.png new file mode 100644 index 0000000000..88fdd5e79b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/meta.json new file mode 100644 index 0000000000..f76e611841 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/icon.png new file mode 100644 index 0000000000..ace08a9ffb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/icon_open.png new file mode 100644 index 0000000000..39281831dc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-left.png new file mode 100644 index 0000000000..3c03c07742 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-right.png new file mode 100644 index 0000000000..2f68635d90 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/meta.json new file mode 100644 index 0000000000..8bc80009c5 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/meta.json @@ -0,0 +1,53 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi, Sol Dry from /tg/.", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/icon.png new file mode 100644 index 0000000000..c4bf829e5d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/meta.json new file mode 100644 index 0000000000..f76e611841 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", + "states": [ + { + "name": "icon" + } + ] +}