From ea3e98e1208f21aa2a52b0a9938ee22e07b74ccd Mon Sep 17 00:00:00 2001 From: Firewatch <54725557+musicmanvr@users.noreply.github.com> Date: Mon, 1 Apr 2024 02:41:14 -0400 Subject: [PATCH] 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 --- .../Locale/en-US/flavors/flavor-profiles.ftl | 7 + .../meta/consumable/drink/alcohol.ftl | 15 ++ .../reagents/meta/consumable/drink/drinks.ftl | 13 +- .../reagents/meta/consumable/drink/soda.ftl | 9 + .../Catalog/ReagentDispensers/beverage.yml | 2 +- .../VendingMachines/Inventories/boozeomat.yml | 2 + .../VendingMachines/Inventories/cola.yml | 1 + .../VendingMachines/Inventories/gib.yml | 1 + .../VendingMachines/Inventories/pwrgame.yml | 1 + .../Inventories/shamblersjuice.yml | 1 + .../VendingMachines/Inventories/soda.yml | 1 + .../VendingMachines/Inventories/spaceup.yml | 1 + .../VendingMachines/Inventories/starkist.yml | 1 + .../Random/Food_Drinks/drinks_glass.yml | 8 + .../Random/Food_Drinks/drinks_soda.yml | 1 + .../Consumable/Drinks/drinks-cartons.yml | 18 ++ .../Objects/Consumable/Drinks/drinks.yml | 157 ++++++++++++++++++ .../Consumable/Drinks/drinks_bottles.yml | 17 ++ .../Objects/Consumable/Drinks/drinks_cans.yml | 18 ++ Resources/Prototypes/Flavors/flavors.yml | 35 ++++ .../Reagents/Consumable/Drink/alcohol.yml | 92 ++++++++++ .../Reagents/Consumable/Drink/drinks.yml | 48 ++++++ .../Reagents/Consumable/Drink/soda.yml | 46 +++++ .../Prototypes/Recipes/Reactions/drinks.yml | 124 ++++++++++++++ .../Drinks/arnoldpalmer.rsi/icon.png | Bin 0 -> 4790 bytes .../Drinks/arnoldpalmer.rsi/meta.json | 14 ++ .../Drinks/bluehawaiian.rsi/icon.png | Bin 0 -> 4796 bytes .../Drinks/bluehawaiian.rsi/meta.json | 14 ++ .../Consumable/Drinks/coconutrum.rsi/icon.png | Bin 0 -> 4451 bytes .../Drinks/coconutrum.rsi/meta.json | 14 ++ .../Drinks/coconutwater.rsi/icon.png | Bin 0 -> 4497 bytes .../Drinks/coconutwater.rsi/icon_open.png | Bin 0 -> 4474 bytes .../Drinks/coconutwater.rsi/meta.json | 17 ++ .../Drinks/cosmopolitan.rsi/icon.png | Bin 0 -> 4363 bytes .../Drinks/cosmopolitan.rsi/meta.json | 14 ++ .../Consumable/Drinks/painkiller.rsi/icon.png | Bin 0 -> 4729 bytes .../Drinks/painkiller.rsi/meta.json | 14 ++ .../Consumable/Drinks/pinacolada.rsi/icon.png | Bin 0 -> 4454 bytes .../Drinks/pinacolada.rsi/meta.json | 14 ++ .../Consumable/Drinks/royrogers.rsi/icon.png | Bin 0 -> 4915 bytes .../Consumable/Drinks/royrogers.rsi/meta.json | 22 +++ .../Drinks/shirleytemple.rsi/icon.png | Bin 0 -> 929 bytes .../Drinks/shirleytemple.rsi/meta.json | 14 ++ .../Consumable/Drinks/sol_dry.rsi/icon.png | Bin 0 -> 4764 bytes .../Drinks/sol_dry.rsi/icon_open.png | Bin 0 -> 4776 bytes .../Drinks/sol_dry.rsi/inhand-left.png | Bin 0 -> 4557 bytes .../Drinks/sol_dry.rsi/inhand-right.png | Bin 0 -> 4565 bytes .../Consumable/Drinks/sol_dry.rsi/meta.json | 53 ++++++ .../Drinks/sol_dry_glass.rsi/icon.png | Bin 0 -> 4367 bytes .../Drinks/sol_dry_glass.rsi/meta.json | 14 ++ 50 files changed, 820 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/icon_open.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/icon_open.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/meta.json 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 0000000000000000000000000000000000000000..81261d0f54f589b5acb8b36b90ae2edf528fd3bd GIT binary patch literal 4790 zcmeHLc~BH*7H>h0Fbm72vYu^IvXV{D^z<}ybQln4I7S^r80A=9>FMslUYUdLh8gfG zaHFdxY&;_b6OXv=YP_&CRzyX>;FhAINj7TKL|qgW)Lj*g(d;)ffKZ#NEo;~Rn5v%c ze&2h)_ulWl_tku}EF(QNIB0kf1VO=uG<_zx!|p54AAAdCWe>rvsmzokW>QYr!P_ld zAq$J84i;uzoCShh7p)o7LK@+~=QktYuJDx^FIBmEiLOK&Zx`B<}UdD`_QxFYd@@86MoN`Fvfpj+{tyTSJvrr zc31FEPPU9s*xcHB%Pffwj-EJ-k0QqWX2{yI(Nsr!&;#G-j7P1`)$>}uI`A2q5^ml$ zGT*aWQBoxqjvke#YUeB8R0O+yC8n z&E~I;9nZ}U$W99V5h^NiWQr@pfBGOYugT^3_D{~P(aw9&rd)RWg$Q3$3x00d!SyG1 zFE7syjG7o)zp-hGwkr2jgE0ScWAon+jX(3xgsz*nvV&rL=Oab$wl7JpONu|lwbyhl zYy9-B*ruCJtNmxa|77Kz+LQL0$sv+>MIm$kUrm&G@0Z86>^Rtd?EUu>0^4~Cg0#8gCHN-@XowOrm`7)xTS^MLb%EV-8)yyFn z|JFwTA*-$j{IvM$h!>m(>CK z4uawnT@H$#%Zjj>E#Pcg7Cc11ctznSFgrImA z2>`6DNWm^^p-muNTEv4(f@il_hQJ;bajq80F=oIzJI}&|l#pU*vWqLhk%S;Po@Xp% zraq+`0=#LFIilzwWiqGJDRnBOcD_I+*Jv~{442_J3N%om)Fx6c)Fwo`A-ouRR-k## zA#!#b?8c|I1=w~ei z6PQw2CM(#Bd74cwVQpe`UkHZowRaTrg`RX6TE-T#R-h^XukwB_Qw_$9UJEw`1)SC4 zu>xfG(-b+&OS1aK=3eon(>D-c-izB$yC-*#GSD&_Nxhvec86!sYZ149lCjeqLwX+7 zxEx~{21jv z0-y?99;d?OYFt6fJx~lyrr3Ea1&k;TgXIO#i*8goCRGp~b9Z4#kPe`h za(5~K@W??nq>g7P(axLf_ChV0Pz)tfdP-ygD25XxhLdu&Nsg1ahQyR8 z7Dr-z^z961DgAHS?(u=+y+u#s1mM5aBl6Bv7F*4Fna;hFW1s#MI{&j{?2_$bg(sBg|l0>+#K~Qx~ z6c7f824ix-EuZkPQGt0A&Vj!|1}!$|lT0~{9cz!K`y_=fJ$hkrKG9UU^z1PBKuk>2 zN2wD=L`Y`WpKdrk>F(W6zx+eM{i(+!_kCg_QzTnr+UhTjl2l$FEa_}G=gRt>#d-AU zb4%OCKO!&Yov2&39W{m+emm4JzgBytx;!_i{>Fn6pS>o@xuB7=4v+l;I+(b;Xj@B1 zz3|H#;p(D6PpVJ1i}QADy*>Qb@BQ#?*SfZtwFgFCNw|1@!zLgP$$1*x!tUR=#vl#* z`c3w+N*a7iub*~yTI;Z>^G-)Y>SyVZ7r)VN;ImQpT8^& ze@AJBs&BXP`As|gpw{{?#>8A{-q-M%`cXl7AToW)^X$P(&7m_lH(qYLpcq57jHqw# zoPpJq?rCx4U#p1d2)_R!?CbR5kLu}&itT3Ihv5sF@`YX3PC-b6bI$e09~^uhcjw_h z0x(4HyW&<(xoc=kE%ffjm4BY`e%s83szuGTAHVK%42qWcohZI^?9t&_J5841vO9r8 dr|H9>#FI5kRad+Anm~mhLvp%)*Tnpae*@Dd%6k9+ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d192a884616ee9ae73c071829e15f2a0efaa0db6 GIT binary patch literal 4796 zcmeHLX;c(f7A|BJgBpa0d(mhHjJ+>(mo&)UjW!~nEE1)ys6a4ri%|hVqt3XY0dyF{C>rKZxw+rT#KI(934Xd2CCpq`G{d*Q$*A)k!Ym{`mryh%#^YYm_ z&lMr1Up8%K9YSpk?(6+~G)u~>SJYK@@&aF#h41TW^?RP&o;B~+@jH!p0UP#(UKFko zWGkxTJ^VuxHd>A6E zMjeQpyU#E&?QF!Kf7wUNKadw(8PVogf$U6pVJn-u#bt8n>A&2*-6X$ux-l-sKE{9I zODN5tjid^l`**m+H<+|HHXD0q8oQyram1nPldPjJaDK`?vGd%~yia2s+yW+^`n+M0 zcvsx{Gx}9G>zi6?JTLvzxA(!r7{~XmSJBcocB~7o_4lbEJ4$+U>yOOyYIxAF)$YTB ze-}QkI;SaFIDVWDHx<9q(}2pqzS^jpe5`7(^QDQQE=%{Xa(_^DCS${~_=;n{il2`Q zv{lWiPcOzKiDRW@a6rfm*J#u|>~Kh4F0Zpm{BnQ3Uoc}=f-6fm?{hoXE&s6Z&$)H8 zxUs{_+snm1b7g8DHr?TuF%|1nAJ1wxJhpk_XB`vYv@&IkzO>96iNEXM)@sN2YJPF8 zeL@%HvA7zSbB=b={7k%OS}S#&On0Vij^%wFpY|V;u<-@FsZbl>LAF+&!k1M6oP`~gpyQ? zY27t-G?>K2v>3jOCDR5HNu(rGM?__YM`M{Omclq)_a&C1~7sMJ*FeI6sb|eW=vGBNvFg# z8j!=U{ZnaWvLSf2evk#g2h)UVnQR7&sZudVTIi`@0{|Ix=yxsj(V$0}k%V58uEU66 z1EHooMnd4&ki9ltmud+I$CyMap#rLUuqykFB}1jMh#?Cz1xiw-wO9eN-_WE;#V}cK z_-2+^!WroZFdxEwL;H2?7GsfP zvFUPDK;Rq^MtHM@BOn&*NKln%>PWB5P&k0%vjiLrmymj}euiagpr@jUw1LsUFqO146AWA00zt8X5cH^lz%70PtN{_0 zgsPPU*gpmf_VqmZJH^1lP@K*7=F&MrJ_i(ow}LLj6d0W+;t7S`e2k3>1~NE=uGc6i zBdR0(m4HXU6(~>(SFq<`s=VIx#+XEy^8hHLvpDo&%D6P!v=t8W1$_M@ufaV0kxRhv=pt{$?2n1U88ip6$5Xj zJX&4aWelCFjgyx(?ig>N#@%M zDlTyYllGKU7Ht1;jI+~3_Y;X~B?OI0mInDp$JTdlUo3G!-M%aB-JSNm;wC>bpo12$ zGyO}3^qya}r|HR0<%wgmcUbz07@RY|@hrdmX zE3WBVeXHF+VVj|4%5~&Iw}9K-Q+uiQR__I9Cb;@@+uGtUrk6VA7Bl~<2%dE5yCmkO zrkd*5we`YT8}41*5OATQ8ah%9op-#I&#FP!XZw8X(_rvCJ9qlJ%gsf{iyZkY`)VDJ zow47wX#Sp4I{dR8lUFE@ZVjDwIr{ppn3Vfj1z~D@chk=y=!A{x(gn2At~;saRgb4R zo$I&i(fd8UG2Zo^67H0q`ImJaMQ!m}S&2Mf(}S>UTc3Kj?{3nQtG9`4q53OJR4pHK z=cXXvr+-q{eDzLyx0`C$+P+SwYc5>V+54;cCuYe$ z@+-D(zQ6u{(^R}NyY=`4tj_f_s9^8aLy`GKEsaOqAVK65&*rm|v0kqEIqof2evEgg z&!K$)O$#u{E_D3e4od64TOuK5Z(A0T%ngbU^Q_prEdcRwKhW?g*D2wuxU#YHPVV-O z!X5Y4CWlks{Am_da+rEVR=0hvkiOUvx9miS+Yg%#9>ydAo-R{b>RR^{mfP&KEt}^~ zyNDG0xF}$I?~0?3GM?>udbC3=DssA&b%%Ajz8>5B((0rD3NC&(<{&6UNE#d-^i@D& G_J05u#{S9x literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4adab5cb6e6b935cc3878d2c6e533abe8fe82dee GIT binary patch literal 4451 zcmeHLdsGzH86S|BYe-SC0Z-I%r4bCXJNtm$9a#`rU{|xS!nQmPIWjwQ7e@BQ&ak_n zz$sW;kYY5g4-Tdnv{I{)O3blUjLOR#lF-K5w2&xCY<&f^O(GJk_RjJ&%{e`s)BMMt zGdnZ){=VP$eZTL!_w3yoLt1LEV5tB>kYJrwlL7B2e+31=Z?>%LOL)6fX3XX?NH^+m z+Rcmwpj@c~puoeJ5yaDPH6$+TK!eVGQ5)}*W4f>UwZ7o%>iD-?A{Gw}*S*;KzTl6K zE7Z6Dg6eept~%d2uq^jY?N=8(O|G=#2iHbK^c^J*R(a-EP>1(^_U}#UM=zc^mfG8O zd3dFz%^-g?)Eilma<`>x7rut{3tum&Cb~b(v$WT@4#jnJA4=K64kV1;8Q2>A_RuC^GL>;*IgmSmkkF$e_dFAq&B(L&@VVa?9cn!U%zxu=yRzTPY(|E zn66&z%E=1MN(^~~6uTT5-0nqB_J!tldK@3^a*r%`-$M@NfMb7KJkR)^^n;o+`+HB; z{x~ZrY<b%+cYQW2{JluWvRIj~p7u^&{5JrY4hjn4x{T+mMt-oD>wW$rM5;s)T4gXT%V9EI*_*n zcSbh_EZOr};FId>A2)Q}j#5O029|BMj8V@AeeQc=hqZFWfa|W`{e*d0xjmbUeA!ldmuD^yJMUjrWU~*IH^w75ceacM zD3yLMZ1_d{@IQyo4_|w%zA}6-P?qWZdGJ^HS76h*7}#9d`j-gGZWWQV-2_A)s{?i& zg2W|w93)i)IMf6R7@Jyn@9f(`l%dtatQbA6cO-#AMqB0tnPq84s;r1o(ZYmyL7azx z1XjS2sK;utv4lr0^zst$nI9GlQ7?omQVX;71~kd;1gKmj7vWg4hjB@T@d7l?Nt=lb zP09oXd{YYxInF_d#csD-hy*w3toZ(#_I4| zL9w4ga*TOetfyk*XT0gm34M#Br=SQH3LkJ$Eq-u z!X(3RnM$RIl>)O|9^<8=DI&%0w34u#jFl_^Vu!83JHZQ1BpP&Tp;UxVj~FZ@XNCrF z4KOy^?q;W_jEogzawM;(M1d=%u`(HqTPl+&71N*}0VfN4k!O|QBAMJf!xx5t=|E{o zzEdHAcN}IzBsl@e*_}qa-J%xqL7}|m)U+NhD4OI*4aosWic94LE+r&NBd#Q5v4kuJ z!(#}12Hs9H=FE>063;HnWUJBhWRQ;h0Lt{20Lpv zb8gZJ5(}V?P%GG=Uaio`iBd&*Rhx>&T?qI(K*=y%icL!vD-=&8E9Q5M$!z1q|D{Kq z7cgUsfp+6#aO;9Qp?GR5oX`vU{w_Zgb@(n_py-^FS?N0`*PL9lQeal#x$c^iYgP)( z3Ov_c|2Me=(}yWwgTH{>@Tl}BqCW{9vjR*TQ#D8`QiyEbQyt9z6ENSQ&0!H_!D9aM zK^hvv;9wx9(X7q z8NS?1fzfV=?H(KJI{9jz^m2WZZ7GE2w_JZ~Y~RU9@r&^>Mc44S)v=Ft>GSI9jD7wQ z{vW0Xyr!tEDBs(8x4ZJAcjY^Mvt6C5(>L7TRkaBhq+E>T2@s?v-Ow7PHC8~q5M6Sb K=8g6FRsR9yS6zSr literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a270180dcd4e8dc61cd9fc37ae61a2f98118fb46 GIT binary patch literal 4497 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 PW`NkN8!ac-71#U+x9KO& literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..caa81b36f0adb1d9dbc5c964dab994c504eea8b1 GIT binary patch literal 4729 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 OKoW7V|B;!Cmj4b0zCE`9 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..88fdd5e79b971275c4012ee5afd12513bc377fb6 GIT binary patch literal 929 zcmV;S177@zP)EX>4Tx04R}tkv&MmKpe$iQ>9WWqIM8*$WWc^q9Tr^ibb$c+6t{Ym|Xe=O&XFE z7e~Rh;NZt%)xpJCR|i)?5c~jfc5qU3krMxx6k5c1aNLh~_a1le0HIlBs@W3*RLwHd ziMW`{uZn?J2pB>Tz@WrTJ(*d|!gGAx!^hXVD9`df_vh$W3MK=5B5{oAhDE$VJiBS> zocD>ttSl+S=fsl+U6A;Z>$1yloJ$T1JTq)$)APh(VzJc4au>6*p%Tv!M-)|~d?Dwu z!g-6cTCKD8J^2em1#Kn6b(&*HUG?f@fCx@1U>T3B0I5-3* zN|e3s@$SCv-u^w)?(YXPQ*w>*4?Up(000JJOGiWiuK*wbAP5)L5C8xG32;bRa{vGf z6951U69E94oEQKA00(qQO+^Rj0ul`cIh?r=B>(^cpGibPR9M69l)q~fQ5?iS^Dgnw zBU*0|%d}R4h&I|p#8MkuTPu4-j3D@8!8A!zc3s_28rcPpwS2bMu&&h;w`jKc~(ps zj6gzKVVvi9p1304zW?9{gJEb)!1EiIR)4?!+`pM+$0A^O400000NkvXXu0mjf Djq#tS literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ace08a9ffb0069ae73de8e2063cb25563ad34865 GIT binary patch literal 4764 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 KGk%m>Q28G+kH&NW literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3c03c07742b267655d40be9d93adefed258463bc GIT binary patch literal 4557 zcmeHLeNYtV8DIS15QC)#i!nylC3QmU-tE_YZ8<*V4mixo70x0Kj_mEe2P=2C$L_)% zRHBvCL`;dAOrnT2i6-qN!5W=3osw81D7L22soJz8(bQ7W7%v&#hF#nOGr=sWt}j8kG$~i4HaD**JmqFd*Dpbc?5}T z7W4Al&b+*lieMe>OJOWKwf)2|T7FcPFn3Av;g`A}x9uqZ;E1yJ)2^P6Iv+cEEo-R%Qd#1nscW&? zXD)AayqlZZDPC?L+SK*t;*9S8?&soHZTV{Jl>;ZF_NB9CX3~D)^!0Ae`_`GGa_YeY zFV8-iT#&MS&)S9k2aYssKDe^u;0@c&nR(L#-|nhw;|nWiIQODU@*kPw;T9IXk>9e3 z8R)Uy-qV`x(C?_2L&%F?il4LXue!U<=Ra*bdO5?Kk)mr{?Z3s(PxxX=$Hu_Aw2$kr zO#3o>YT3%3)iqO;-FwaK%D#lTe~Q=d`(E3-x{5(0z4+HcVQb&dGEz1lzV%R3>4Le3 zrf;YTN&`*pSxEWkYi`C{EYlVhJ^$X|-vW^x#z;T`K=1=^vG+5oFeK5ejUD z>v5Ks0(wr6yg(lbgrM>eBr`h_;`kb%qFzuX25s2Y&fj3DDA=$vql<8b@<6p%*eHY2 z#$_J9v4*z_Saw!oW`u>! zPM3Q$LZhHc41}UlknC}us_45%*0|iXk!U$%6M^BQxZ}J>YL7ZYFPDq8OMIP{p3`o_ zwE0;<;zfat-dbpi0AAjUle9qM49{~oXC*B-O#_A!teilZ!5AoKP*J%c4>TwUt`{K= zplJ(lq8Xg>Ss0w*fEVX1Rx?gBW{b&U1UzA~j)5qaMW{;7KQ=23N`O!l!wICo7;ztI zf>5LYp=iQ~TL{W*rmRMb*+@m91fI>8rD)b@ z#0euyjPaKQ(bw?bytU?!u>7o&>_MWf4t<@i_$3Re$= zXr2%&HpEwR!72dvk72=%*u}3AgFpx*$C%8xMIfP`j9%D5-bCWiEciH+7g(8?7)H?* z$)|=n8RS+$9wApypi!>S$A(*#F+Q7cHPHG1DZ>d0CrJ-QvJ~XbgcY&k5;&SOo4n)G{U6I4Rm5m{nFeh`9BF2z;Xm3Pa~QLOLRw-r zxHH3z-Y~k;5Ay|EaX*h?ncdGRP;_#V3Gq8g*CbsNVqikflj@qJYeEc6$azv-|2Mi4 z?|mzRAbi0K!!N;e#;@Q9CKB&mT3|;CkZReE zI$aLkr75$MQZ3IFxhtV*yVIWQiS!QilHY93Ntt%4IOUZ4`=li&XR$qg5wT&$-kjX# zolECT-O;(DB2s+#!*hmxy$LXG{Z3Kd*m0%pHL>OCr<>06KkdJmN^iElll5L}75h%s z*)2O){dU{#^u7<9KDqOajWhaS@%Gxz%004O=V~8#XSem+pT&flSLHvfFm{jpW6l2d-^jia z7F>765AJ;PTFuR^Rzquba{7_qTV>0)n_J^ce|)<6t=9&V&g>k%%Ael(YD;zf$eE{n z$K2`prhw(IR}W~DdOX>E*o&VI_VVmQweII0_&P8+=W1G1 zL2>u`vf2J!trT5+DR%L>XvN{jnm&nHH-sdw`IyUXxU@edaZCH{CDr-M79XEmQ|9qr zscue1ihg+ZReebbRQ-FUH=X;TToE@RICbCA|nT|4APDtI+ZU&3fGm zhV$BiBINc#;~|J4E#za^G9aRM;N(3<`Ec6_Im&ZJd4a})TYQN$B@YMdcNLjpGt88qZ}dHi(9C=c_}@Lpf zBEpdc{H(zHMBeK`B~Hfftq_fJIqXNr@^kwvmT`KIe^dpihcd+Yl!O9Ty4}jj5q{AW zfFz>{{c42Y2A8Qa5BR+m0t-w5;1QE2Q*i8fystuVh0EbsC2#>Zg!wv_QW0o*@E4LjD(|B4wjdP+-DS{9>NJAtVw%8uzdEdlMt=~=Cw;21qSmEG@k zh(SgG=}xF4)Cw9jtQGq3=v1Xl#Rp4)G!IZR3@0&yu#p5!k~FE8EAM`Jte#b|b`D?^ zp@9Yk4ieLo1i%QjonUZEjYG>%P4|B+Z`={%UN8wv!wEgj%EF=dhMK)~PER()<+~dnF@*~K+h0-|-X=+{!8)HPX z#T4`X>;zfTZ`FVUY&{(-LCvPsS%))9YW@wAZC;Q7 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c4bf829e5d159a8501c10a5388bd153f99343453 GIT binary patch literal 4367 zcmeHLdr%bj9bc7Ka8L#hLriMdwK0;qce{6cugx8=y8})+BycI9wz9Vm*l>4y+%DXK zT8)g%K-36nCxntTh}P5uYawP573F0yRmZe6jY&=G7)QLsVC>6SjP|$3dy<(BGtGb8 z%--&PAD`d%`}ux<-?`t_=jCR_#V(75ASlkBZOsRFSiWMSz_(aa^G|T=t8o@d`BVV* z`2~)5v#?a{V_`PPa}X5#*pru@&=1F)9BoKRe{OZkAQ8&h{{C_+4TVXY0FP zeY&r`wke{x;d+Z0abWGiy0rGTxZJ0s7Vlek_E3!>GNZnt>tIXwgVzrY^&F`ydp9XG zw5xLI;df5oPr7^V@)MukzMlEPp5~lv@B245;)UpksyDZ^wpC?3@rUZ08-H@N+td40 z&RgQu7;fpKJ4PFOJP~o7`|(a>m9nJg!qI)(w~+CtK005V(A!*g7J}y0@)k>;-C~)@ z2ISDXt@VZpWI&+UvW0?m7DvKy$2g?NAo_8?I4>s{U_3~tV!{3R`0PZ zR|Z`l^qwg$j4n)%zXw%R`SPX4ga7ISlcN1bQ;_y1D$dBm5g3ko+3ZZ4lM z{_=pH+;A->=~9&P$WtvRqc@E}E7u=qviDv)l&pBZXY`S61C}rqrO1qRUwccCn?r*NogcaTi{NKrLP;nw)E4Bc)JRG!Z1OW4 znQzS;hX8M8q)d{0q)HVC1e5`dQt+3maHG+v!qh6Y8U+@pSnZXlAnFxY$`E51R#v3_ zyieiE~BM8vL6Y+U`4#y8=Q<+Gwt>8Dv+73-B&PKRLVNq=9Z-yKeep;fG#^#D^5tcuTAGRyABoAi(=DCIrA zuoobEhNZ-FQ)JDEP1c0dnH~smpTwPEJ&}9Z7+5(Rq*b6RSV1G#X5g8q@{` z#c7R8?ZUMN1BZv97@Eu!{2mIFllM@itjgyt4J%~A$@DzC8Br^-DM_B2k~rW1_5kl? zgn&4ua`GOwK%!(maXn^G>(mAXQGP&Cj}@! zn_dcd1YCgz4RZyr9xqk$O#46?E7t)~hGJ@TiZTLGjVG&;C&om!Ce=6iFog}KjTqoJ zCIh1jOhVP-ZY9y;IQXS@#I;R*nHZjo8>J4e?XU9)0fR>pJPHAmO17?_puTzCE7 z=!%^>OtD_@3n&1NN=-NF-vGy~DA&3yE0hJ5L0g(?zc*68egc%y=ck1i_+e1P3W=i zIhj*$Xb_0KTkjQdP&<4?l*3`aK2-p=gaLe ef36FM`ZNULrpz@oTD}Y<0@-c3)*~4uJO2wSlrY-> literal 0 HcmV?d00001 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" + } + ] +}