From: SharkSnake98 Date: Sat, 19 Apr 2025 05:12:10 +0000 (-0400) Subject: New Drinks (#36287) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=9599f582f3e08c711431910b2f4043fc8fdf75cb;p=space-station-14.git New Drinks (#36287) Co-authored-by: RedBookcase Co-authored-by: SharkSnake98 --- diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 38efd407ae..14e4ed5adb 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -236,8 +236,11 @@ 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 flavor-complex-root-beer-float = like ice cream in root beer +flavor-complex-crush-depth = like the Hadal Zone flavor-complex-black-russian = like alcoholic coffee flavor-complex-white-russian = like alcoholic sweetened coffee +flavor-complex-electric-shark = like Shark Week in the tropics +flavor-complex-tortuga = like sweet tea flavor-complex-moonshine = like pure alcohol flavor-complex-singulo = like a bottomless hole flavor-complex-syndie-bomb = like bitter whiskey @@ -253,6 +256,12 @@ flavor-complex-atomic-cola = like hoarding bottle caps flavor-complex-cuba-libre = like spiked cola flavor-complex-gin-tonic = refreshingly bitter flavor-complex-screwdriver = like spiked orange juice +flavor-complex-jack-rose = like a testimony +flavor-complex-jungle-bird = like you’re in a tropical aviary +flavor-complex-kalimotxo = like fancy spiked cola +flavor-complex-vampiro = fruity, savoury, and spicy +flavor-complex-bronx = like mildly sweet, alcoholic fruit +flavor-complex-monkey-business = like going ape flavor-complex-vodka-red-bool = like a heart attack flavor-complex-irish-bool = like caffeine and Ireland flavor-complex-xeno-basher = like killing bugs @@ -260,13 +269,14 @@ flavor-complex-budget-insuls-drink = like door hacking flavor-complex-watermelon-wakeup = like a sweet wakeup call flavor-complex-rubberneck = like synthetics flavor-complex-irish-slammer = like a spiked cola float +flavor-complex-alien-brain-hemorrhage = like an extraterrestrial injury flavor-complex-themartinez = like violets and lemon vodka flavor-complex-cogchamp = like brass flavor-complex-white-gilgamesh = like lightly carbonated cream flavor-complex-antifreeze = warm flavor-complex-caipirinha = like Brazil flavor-complex-daiquiri = like rum, lime and sugar -flavor-complex-deathintheafternoon = like anise and champagne +flavor-complex-deathintheafternoon = like anise and champagne flavor-complex-empress75 = like tyrian purple flavor-complex-espressomartini = like vodka and coffee flavor-complex-mayojito = like stomach turmoil @@ -294,6 +304,7 @@ flavor-complex-driest-martini = like a drunk mimic flavor-complex-erika-surprise = like the bartender made a mistake flavor-complex-gin-fizz = refreshing and lemony flavor-complex-gildlager = like the Tzar's gold +flavor-complex-dark-and-stormy = like ginger ale spiked with rum flavor-complex-grog = like a sea shanty flavor-complex-hippies-delight = like your blood pressure is dropping flavor-complex-hooch = like it would be delicious if you were a diesel engine @@ -304,6 +315,7 @@ flavor-complex-martini = like a spy movie flavor-complex-mojito = like going into the shade after being in the hot sun flavor-complex-neurotoxin = like an underground testing facility flavor-complex-patron = like being serenaded by mariachi +flavor-complex-radler = like spiked lemonade flavor-complex-red-mead = like a viking battle flavor-complex-sbiten = like fire flavor-complex-snowwhite = like sour and bitter hops 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 5a22328900..df9e6ce78f 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl @@ -61,6 +61,9 @@ reagent-desc-champagne = A premium sparkling wine reagent-name-acid-spit = acidspit reagent-desc-acid-spit = A drink for the daring, can be deadly if incorrectly prepared! +reagent-name-alien-brain-hemorrhage = alien brain hemorrhage +reagent-desc-alien-brain-hemorrhage = You might want to get that checked out at Med. + reagent-name-allies-cocktail = allies cocktail reagent-desc-allies-cocktail = A drink made from your allies, not as sweet as when made from your enemies. @@ -109,15 +112,24 @@ reagent-desc-booger = Ewww... reagent-name-brave-bull = Brave Bull reagent-desc-brave-bull = It's just as effective as Dutch-Courage! +reagent-name-bronx = Bronx +reagent-desc-bronx = The orange-flavoured cousin of the Manhattan and Martini. + 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-crush-depth = crush depth +reagent-desc-crush-depth = A stygian drink, harkening back to the abyssopelagic. Dark and Cold, it serves as a reminder that the most ancient emotion is fear, and the strongest type of fear is that of the unknown. + reagent-name-cuba-libre = Cuba libre reagent-desc-cuba-libre = Rum, mixed with cola. Viva la revolucion. +reagent-name-dark-and-stormy = dark & stormy +reagent-desc-dark-and-stormy = You can almost hear the thunder. + reagent-name-demons-blood = Demon's Blood reagent-desc-demons-blood = AHHHH!!!! @@ -130,6 +142,9 @@ reagent-desc-doctors-delight = A gulp a day keeps the MediBot away. That's proba reagent-name-driest-martini = driest martini reagent-desc-driest-martini = Only for the experienced. You think you see sand floating in the glass. +reagent-name-electric-shark = electric shark +reagent-desc-electric-shark = Fun Shark fact: Selachians make up 20% of Space Station 16’s Engineering staff! + reagent-name-erika-surprise = Erika surprise reagent-desc-erika-surprise = The surprise is, it's green! @@ -166,9 +181,21 @@ reagent-desc-irish-cream = Whiskey-imbued cream. What else could you expect from reagent-name-irish-coffee = Irish coffee reagent-desc-irish-coffee = Coffee served with irish cream. Regular cream just isn't the same! +reagent-name-jack-rose = Jack rose +reagent-desc-jack-rose = Excessively Red. + +reagent-name-jungle-bird = jungle bird +reagent-desc-jungle-bird = Despite the name, it’s not exceptionally popular among Voxes. + +reagent-name-kalimotxo = kalimotxo +reagent-desc-kalimotxo = A high-class Cuba Libre, for the discerning alcoholic. + reagent-name-kira-special = Kira special reagent-desc-kira-special = Long live the guy who everyone had mistaken for a girl. Baka! +reagent-name-tortuga = Tortuga +reagent-desc-tortuga = Perfect for pirates who’ve been selected as the designated driver. Yarr! + reagent-name-long-island-iced-tea = Long Island iced tea reagent-desc-long-island-iced-tea = The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only. @@ -196,6 +223,9 @@ reagent-desc-mead = A Viking's drink, though a cheap one. reagent-name-mojito = Mojito reagent-desc-mojito = If it's good enough for Spesscuba, it's good enough for you. +reagent-name-monkey-business = monkey business +reagent-desc-monkey-business = You’ve got to wonder how the monkeys feel about this drink. + reagent-name-moonshine = moonshine reagent-desc-moonshine = Artisanal homemade liquor. What could go wrong? @@ -211,6 +241,9 @@ reagent-desc-patron = Tequila with silver in it, a favorite of alcoholic women i reagent-name-pina-colada = Piña Colada reagent-desc-pina-colada = For getting lost in the rain. +reagent-name-radler = radler +reagent-desc-radler = A simple but staple classic, straight out of Space-Germany. + reagent-name-red-mead = red mead reagent-desc-red-mead = The true Viking's drink! Even though it has a strange red color. @@ -250,6 +283,9 @@ reagent-desc-three-mile-island = "Made for a woman, strong enough for a man." reagent-name-toxins-special = toxins special reagent-desc-toxins-special = This thing is ON FIRE! CALL THE DAMN SHUTTLE! +reagent-name-vampiro = vampiro +reagent-desc-vampiro = Popular in Mexico and Transylvania. + reagent-name-vodka-martini = vodka martini reagent-desc-vodka-martini = Vodka instead of Gin. Not quite how 007 enjoyed it, but still delicious. 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 c3a9a3a143..8504925528 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 @@ -16,6 +16,7 @@ prototypes: - DrinkAbsintheGlass - DrinkAleGlass + - DrinkAlienBrainHemorrhage - DrinkAloe - DrinkAndalusia - DrinkAntifreeze @@ -32,17 +33,21 @@ - DrinkBloodyMaryGlass - DrinkBooger - DrinkBraveBullGlass + - DrinkBronxGlass - BudgetInsulsDrinkGlass - DrinkCarrotJuice - DrinkCoconutRum - DrinkChocolateGlass - DrinkCognacGlass - DrinkCosmopolitan + - DrinkCrushDepthGlass - DrinkCubaLibreGlass + - DrinkDarkandStormyGlass - DrinkDeadRumGlass - DrinkDevilsKiss - DrinkDriestMartiniGlass - DrinkDrGibbGlass + - DrinkElectricSharkGlass - DrinkErikaSurprise - DrinkFourteenLokoGlass - DrinkGargleBlasterGlass @@ -62,6 +67,9 @@ - DrinkIrishSlammer - DrinkIrishCoffeeGlass - DrinkLemonadeGlass + - DrinkJackRoseGlass + - DrinkJungleBirdGlass + - DrinkKalimotxoGlass - DrinkKiraSpecial - DrinkLongIslandIcedTeaGlass - DrinkManhattanGlass @@ -71,11 +79,13 @@ - DrinkMeadGlass - DrinkMilkshake - DrinkMojito + - DrinkMonkeyBusinessGlass - DrinkNTCahors - DrinkPainkillerGlass - DrinkPatronGlass - DrinkPinaColadaGlass - DrinkPoscaGlass + - DrinkRadlerGlass - DrinkRedMeadGlass - DrinkRewriter - DrinkRoyRogersGlass @@ -92,7 +102,9 @@ - DrinkSyndicatebomb - DrinkTequilaSunriseGlass - DrinkThreeMileIslandGlass + - DrinkTortugaGlass - DrinkToxinsSpecialGlass + - DrinkVampiroGlass - DrinkVodkaMartiniGlass - DrinkVodkaRedBool - DrinkVodkaTonicGlass diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 1891ed71ec..9b50ed8a1e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -187,6 +187,22 @@ sprite: Objects/Consumable/Drinks/aleglass.rsi state: icon +- type: entity + parent: DrinkGlass + id: DrinkAlienBrainHemorrhage + suffix: alien brain hemorrhage + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: AlienBrainHemorrhage + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/alienbrainhemorrhage.rsi + state: icon + - type: entity parent: DrinkGlass id: DrinkAlliesCocktail @@ -507,6 +523,22 @@ sprite: Objects/Consumable/Drinks/bravebullglass.rsi state: icon +- type: entity + parent: DrinkGlass + id: DrinkBronxGlass + suffix: bronx + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Bronx + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/bronx.rsi + state: icon + - type: entity parent: DrinkGlass id: BudgetInsulsDrinkGlass @@ -661,6 +693,22 @@ - ReagentId: Cream Quantity: 30 +- type: entity + parent: DrinkGlass + id: DrinkCrushDepthGlass + suffix: crush depth + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: CrushDepth + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/crushdepth.rsi + state: icon + - type: entity parent: DrinkGlass id: DrinkCubaLibreGlass @@ -677,6 +725,22 @@ sprite: Objects/Consumable/Drinks/cubalibreglass.rsi state: icon +- type: entity + parent: DrinkGlass + id: DrinkDarkandStormyGlass + suffix: dark and stormy + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: DarkandStormy + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/dark&stormy.rsi + state: icon + - type: entity parent: DrinkGlass id: DrinkDeadRumGlass @@ -773,6 +837,22 @@ sprite: Objects/Consumable/Drinks/dr_gibb_glass.rsi state: icon +- type: entity + parent: DrinkGlass + id: DrinkElectricSharkGlass + suffix: electric shark + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ElectricShark + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/electricshark.rsi + state: icon + - type: entity parent: DrinkGlass id: DrinkErikaSurprise @@ -1177,6 +1257,54 @@ sprite: Objects/Consumable/Drinks/coffeeliqueurglass.rsi state: icon +- type: entity + parent: DrinkGlass + id: DrinkJackRoseGlass + suffix: jack rose + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: JackRose + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/jackrose.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: DrinkJungleBirdGlass + suffix: jungle bird + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: JungleBird + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/junglebird.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: DrinkKalimotxoGlass + suffix: kalimotxo + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Kalimotxo + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/kalimotxo.rsi + state: icon + - type: entity parent: DrinkGlass id: DrinkKiraSpecial @@ -1193,6 +1321,7 @@ sprite: Objects/Consumable/Drinks/kiraspecial.rsi state: icon + - type: entity parent: DrinkGlass id: DrinkLemonadeGlass @@ -1391,6 +1520,22 @@ sprite: Objects/Consumable/Drinks/mojito.rsi state: icon +- type: entity + parent: DrinkGlass + id: DrinkMonkeyBusinessGlass + suffix: monkey business + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: MonkeyBusiness + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/monkeybusiness.rsi + state: icon + - type: entity parent: DrinkGlass id: DrinkNeurotoxinGlass @@ -1567,6 +1712,22 @@ sprite: Objects/Consumable/Drinks/glass_light_yellow.rsi state: icon +- type: entity + parent: DrinkGlass + id: DrinkRadlerGlass + suffix: radler + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Radler + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/radler.rsi + state: icon + - type: entity parent: DrinkGlass id: DrinkRedMeadGlass @@ -2045,6 +2206,22 @@ - ReagentId: JuiceTomato Quantity: 30 +- type: entity + parent: DrinkGlass + id: DrinkTortugaGlass + suffix: tortuga + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Tortuga + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/tortuga.rsi + state: icon + - type: entity parent: DrinkGlass id: DrinkToxinsSpecialGlass @@ -2061,6 +2238,22 @@ sprite: Objects/Consumable/Drinks/toxinsspecialglass.rsi state: icon +- type: entity + parent: DrinkGlass + id: DrinkVampiroGlass + suffix: vampiro + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Vampiro + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/vampiro.rsi + state: icon + - type: entity parent: DrinkGlass id: DrinkVermouthGlass @@ -2309,7 +2502,7 @@ drink: maxVol: 30 reagents: - - ReagentId: Daiquiri + - ReagentId: Daiquiri Quantity: 30 - type: Icon sprite: Objects/Consumable/Drinks/daiquiri.rsi diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index ffd6fe40b8..0aa9341647 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -599,6 +599,11 @@ flavorType: Complex description: flavor-complex-irish-slammer +- type: flavor + id: alienbrainhemorrhage + flavorType: Complex + description: flavor-complex-alien-brain-hemorrhage + - type: flavor id: vodkaredbool flavorType: Complex @@ -624,6 +629,11 @@ flavorType: Complex description: flavor-complex-watermelon-wakeup +- type: flavor + id: electricshark + flavorType: Complex + description: flavor-complex-electric-shark + - type: flavor id: rubberneck flavorType: Complex @@ -749,6 +759,11 @@ flavorType: Complex description: flavor-complex-coconut-rum +- type: flavor + id: darkandstormy + flavorType: Complex + description: flavor-complex-dark-and-stormy + - type: flavor id: coffeeliquor flavorType: Complex @@ -799,6 +814,11 @@ flavorType: Complex description: flavor-complex-arnold-palmer +- type: flavor + id: tortuga + flavorType: Complex + description: flavor-complex-tortuga + - type: flavor id: bluehawaiian flavorType: Complex @@ -859,6 +879,11 @@ flavorType: Complex description: flavor-complex-iced-beer +- type: flavor + id: radler + flavorType: Complex + description: flavor-complex-radler + - type: flavor id: gargleblaster flavorType: Complex @@ -894,6 +919,11 @@ flavorType: Complex description: flavor-complex-atomic-cola +- type: flavor + id: crushdepth + flavorType: Complex + description: flavor-complex-crush-depth + - type: flavor id: cubalibre flavorType: Complex @@ -904,6 +934,31 @@ flavorType: Complex description: flavor-complex-gin-tonic +- type: flavor + id: jackrose + flavorType: Complex + description: flavor-complex-jack-rose + +- type: flavor + id: junglebird + flavorType: Complex + description: flavor-complex-jungle-bird + +- type: flavor + id: kalimotxo + flavorType: Complex + description: flavor-complex-kalimotxo + +- type: flavor + id: vampiro + flavorType: Complex + description: flavor-complex-vampiro + +- type: flavor + id: bronx + flavorType: Complex + description: flavor-complex-bronx + - type: flavor id: screwdriver flavorType: Complex @@ -1049,6 +1104,11 @@ flavorType: Complex description: flavor-complex-mojito +- type: flavor + id: monkeybusiness + flavorType: Complex + description: flavor-complex-monkey-business + - type: flavor id: neurotoxin flavorType: Complex diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index e13b34e5fc..e041e23900 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -473,6 +473,21 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false +- type: reagent + id: AlienBrainHemorrhage + name: reagent-name-alien-brain-hemorrhage + parent: BaseAlcohol + desc: reagent-desc-alien-brain-hemorrhage + physicalDesc: reagent-physical-desc-creamy + flavor: alienbrainhemorrhage + color: "#FFFDD0" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/alienbrainhemorrhage.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + - type: reagent id: AlliesCocktail name: reagent-name-allies-cocktail @@ -753,6 +768,21 @@ reagent: Ethanol amount: 0.2 +- type: reagent + id: Bronx + name: reagent-name-bronx + parent: BaseAlcohol + desc: reagent-desc-bronx + physicalDesc: reagent-physical-desc-strong-smelling + flavor: bronx + color: "#d68829" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/bronx.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + - type: reagent id: CoconutRum name: reagent-name-coconut-rum @@ -799,6 +829,21 @@ reagent: Ethanol amount: 0.15 +- type: reagent + id: CrushDepth + name: reagent-name-crush-depth + parent: BaseAlcohol + desc: reagent-desc-crush-depth + physicalDesc: reagent-physical-desc-cloudy + flavor: crushdepth + color: "#0a0a33" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/crushdepth.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + - type: reagent id: CubaLibre name: reagent-name-cuba-libre @@ -823,6 +868,21 @@ amount: 0.07 fizziness: 0.2 +- type: reagent + id: DarkandStormy + name: reagent-name-dark-and-stormy + parent: BaseAlcohol + desc: reagent-desc-dark-and-stormy + physicalDesc: reagent-physical-desc-bubbly + flavor: darkandstormy + color: "#cf7f17" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/dark&stormy.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + - type: reagent id: DemonsBlood name: reagent-name-demons-blood @@ -909,6 +969,21 @@ reagent: Ethanol amount: 0.15 +- type: reagent + id: ElectricShark + name: reagent-name-electric-shark + parent: BaseAlcohol + desc: reagent-desc-electric-shark + physicalDesc: reagent-physical-desc-tropical + flavor: electricshark + color: "#3097cf" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/electricshark.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + - type: reagent id: ErikaSurprise name: reagent-name-erika-surprise @@ -1143,6 +1218,51 @@ reagent: Ethanol amount: 0.15 +- type: reagent + id: JackRose + name: reagent-name-jack-rose + parent: BaseAlcohol + desc: reagent-desc-jack-rose + physicalDesc: reagent-physical-desc-tart + flavor: jackrose + color: "#f53b3b" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/jackrose.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + +- type: reagent + id: JungleBird + name: reagent-name-jungle-bird + parent: BaseAlcohol + desc: reagent-desc-jungle-bird + physicalDesc: reagent-physical-desc-tropical + flavor: junglebird + color: "#f27c3d" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/junglebird.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + +- type: reagent + id: Kalimotxo + name: reagent-name-kalimotxo + parent: BaseAlcohol + desc: reagent-desc-kalimotxo + physicalDesc: reagent-physical-desc-bubbly + flavor: kalimotxo + color: "#360606" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/kalimotxo.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + - type: reagent id: LongIslandIcedTea name: reagent-name-long-island-iced-tea @@ -1282,6 +1402,21 @@ metamorphicChangeColor: false fizziness: 0.3 +- type: reagent + id: MonkeyBusiness + name: reagent-name-monkey-business + parent: BaseAlcohol + desc: reagent-desc-monkey-business + physicalDesc: reagent-physical-desc-tart + flavor: monkeybusiness + color: "#d6b929" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/monkeybusiness.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + - type: reagent id: Moonshine name: reagent-name-moonshine @@ -1426,6 +1561,21 @@ reagent: Ethanol amount: 0.2 +- type: reagent + id: Radler + name: reagent-name-radler + parent: BaseAlcohol + desc: reagent-desc-radler + physicalDesc: reagent-physical-desc-citric + flavor: radler + color: "#edff2b" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/radler.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + - type: reagent id: Sbiten name: reagent-name-sbiten @@ -1656,6 +1806,21 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false +- type: reagent + id: Vampiro + name: reagent-name-vampiro + parent: BaseAlcohol + desc: reagent-desc-vampiro + physicalDesc: reagent-physical-desc-spicy + flavor: vampiro + color: "#b51b1b" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/vampiro.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + - type: reagent id: VodkaMartini name: reagent-name-vodka-martini diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index c722c42162..4f65cc0f25 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -590,3 +590,18 @@ effects: - !type:SatiateThirst factor: 0.6 + +- type: reagent + id: Tortuga + name: reagent-name-tortuga + parent: BaseDrink + desc: reagent-desc-tortuga + physicalDesc: reagent-physical-desc-sweet + flavor: tortuga + color: "#1c8c40" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/tortuga.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index b307166aa8..8cc2da8623 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -8,6 +8,18 @@ products: AcidSpit: 3 +- type: reaction + id: AlienBrainHemorrhage + reactants: + IrishCream: + amount: 1 + BlueCuracao: + amount: 1 + Grenadine: + amount: 1 + products: + AlienBrainHemorrhage: 3 + - type: reaction id: AlliesCocktail requiredMixerCategories: @@ -238,6 +250,20 @@ products: BraveBull: 3 +- type: reaction + id: Bronx + requiredMixerCategories: + - Shake + reactants: + Gin: + amount: 1 + Vermouth: + amount: 1 + JuiceOrange: + amount: 1 + products: + Bronx: 3 + - type: reaction id: CafeLatte reactants: @@ -282,6 +308,16 @@ products: CreamOfCoconut: 3 +- type: reaction + id: CrushDepth + reactants: + RootBeerFloat: + amount: 1 + Rum: + amount: 1 + products: + CrushDepth: 2 + - type: reaction id: CubaLibre reactants: @@ -292,6 +328,16 @@ products: CubaLibre: 3 +- type: reaction + id: DarkandStormy + reactants: + SolDry: + amount: 1 + Rum: + amount: 1 + products: + DarkandStormy: 2 + - type: reaction id: DemonsBlood requiredMixerCategories: @@ -352,6 +398,20 @@ products: DriestMartini: 2 +- type: reaction + id: ElectricShark + requiredMixerCategories: + - Shake + reactants: + DarkandStormy: + amount: 4 + BlueCuracao: + amount: 1 + JuicePineapple: + amount: 1 + products: + ElectricShark: 6 + - type: reaction id: ErikaSurprise requiredMixerCategories: @@ -598,6 +658,48 @@ products: IrishCream: 3 +- type: reaction + id: JackRose + requiredMixerCategories: + - Shake + reactants: + JuiceApple: + amount: 1 + Cognac: + amount: 1 + Grenadine: + amount: 1 + JuiceLemon: + amount: 1 + products: + JackRose: 4 + +- type: reaction + id: JungleBird + requiredMixerCategories: + - Shake + reactants: + Rum: + amount: 3 + JuicePineapple: + amount: 1 + Grenadine: + amount: 1 + JuiceLime: + amount: 1 + products: + JungleBird: 6 + +- type: reaction + id: Kalimotxo + reactants: + Cola: + amount: 1 + Wine: + amount: 1 + products: + Kalimotxo: 2 + - type: reaction id: KiraSpecial requiredMixerCategories: @@ -737,6 +839,22 @@ products: Mojito: 4 +- type: reaction + id: MonkeyBusiness + requiredMixerCategories: + - Shake + reactants: + Gin: + amount: 1 + JuiceOrange: + amount: 1 + Grenadine: + amount: 1 + Absinthe: + amount: 1 + products: + MonkeyBusiness: 4 + - type: reaction id: Moonshine reactants: @@ -838,6 +956,16 @@ products: Posca: 3 +- type: reaction + id: Radler + reactants: + Lemonade: + amount: 1 + Beer: + amount: 1 + products: + Radler: 2 + - type: reaction id: RedMead reactants: @@ -1041,6 +1169,18 @@ products: ThreeMileIsland: 10 +- type: reaction + id: Tortuga + requiredMixerCategories: + - Stir + reactants: + IcedTea: + amount: 1 + Sugar: + amount: 1 + products: + Tortuga: 2 + - type: reaction id: ToxinsSpecial requiredMixerCategories: @@ -1055,6 +1195,22 @@ products: ToxinsSpecial: 5 +- type: reaction + id: Vampiro + requiredMixerCategories: + - Shake + reactants: + TequilaSunrise: + amount: 3 + BloodyMary: + amount: 1 + Hotsauce: + amount: 1 + LemonLime: + amount: 1 + products: + Vampiro: 6 + - type: reaction id: VodkaMartini requiredMixerCategories: @@ -1221,7 +1377,7 @@ amount: 1 products: Cola: 4 - + - type: reaction id: Caipirinha requiredMixerCategories: diff --git a/Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/fill-1.png new file mode 100644 index 0000000000..735ad356e8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/fill-2.png new file mode 100644 index 0000000000..c17e37680e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/fill-3.png new file mode 100644 index 0000000000..1852a05e35 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/fill-4.png new file mode 100644 index 0000000000..f29fe70e8b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/fill-5.png new file mode 100644 index 0000000000..ec670c6cfa Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/icon.png new file mode 100644 index 0000000000..111507b00b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/icon_empty.png new file mode 100644 index 0000000000..2e029295f8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/meta.json new file mode 100644 index 0000000000..fb5566d3dc --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/alienbrainhemorrhage.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by SharkSnake98 on Github", + "states": + [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/fill-1.png new file mode 100644 index 0000000000..7c10712880 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/fill-2.png new file mode 100644 index 0000000000..adaedaca73 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/fill-3.png new file mode 100644 index 0000000000..6e3e63da2e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/fill-4.png new file mode 100644 index 0000000000..88d25fbe7b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/icon.png new file mode 100644 index 0000000000..d56aa94afc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/icon_empty.png new file mode 100644 index 0000000000..bfb6c282c0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/meta.json new file mode 100644 index 0000000000..52c392be67 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/bronx.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by SharkSnake98 on Github", + "states": + [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/fill-1.png new file mode 100644 index 0000000000..41520971b1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/fill-2.png new file mode 100644 index 0000000000..aef4008182 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/fill-3.png new file mode 100644 index 0000000000..ef796be597 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/fill-4.png new file mode 100644 index 0000000000..9963457a6e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/fill-5.png new file mode 100644 index 0000000000..5a83559b9f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/icon.png new file mode 100644 index 0000000000..64cdd3eb8c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/icon_empty.png new file mode 100644 index 0000000000..14bad18f6c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/meta.json new file mode 100644 index 0000000000..fb5566d3dc --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/crushdepth.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by SharkSnake98 on Github", + "states": + [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/fill-1.png new file mode 100644 index 0000000000..ca76f8d344 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/fill-2.png new file mode 100644 index 0000000000..aefd7e17cf Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/fill-3.png new file mode 100644 index 0000000000..d9008407c6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/fill-4.png new file mode 100644 index 0000000000..1216e99cb6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/fill-5.png new file mode 100644 index 0000000000..3f12cd164b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/icon.png new file mode 100644 index 0000000000..90cd2bf570 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/icon_empty.png new file mode 100644 index 0000000000..8ad26bfc2e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/meta.json new file mode 100644 index 0000000000..fb5566d3dc --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/dark&stormy.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by SharkSnake98 on Github", + "states": + [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/fill-1.png new file mode 100644 index 0000000000..7fd25a8b79 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/fill-2.png new file mode 100644 index 0000000000..35985ab459 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/fill-3.png new file mode 100644 index 0000000000..c2ed2bbdd3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/fill-4.png new file mode 100644 index 0000000000..ef1da7eb09 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/fill-5.png new file mode 100644 index 0000000000..6d7ec355bc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/icon.png new file mode 100644 index 0000000000..bddb1cd6a9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/icon_empty.png new file mode 100644 index 0000000000..5ae82dc839 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/meta.json new file mode 100644 index 0000000000..fb5566d3dc --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/electricshark.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by SharkSnake98 on Github", + "states": + [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/fill-1.png new file mode 100644 index 0000000000..e91fcca8dc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/fill-2.png new file mode 100644 index 0000000000..6b07b1de3a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/fill-3.png new file mode 100644 index 0000000000..58ac6675e5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/fill-4.png new file mode 100644 index 0000000000..7d452d9314 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/icon.png new file mode 100644 index 0000000000..b89e6ffd22 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/icon_empty.png new file mode 100644 index 0000000000..5607707f40 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/meta.json new file mode 100644 index 0000000000..52c392be67 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/jackrose.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by SharkSnake98 on Github", + "states": + [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/fill-1.png new file mode 100644 index 0000000000..85821df5d9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/fill-2.png new file mode 100644 index 0000000000..44e1ca3e35 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/fill-3.png new file mode 100644 index 0000000000..802d422c3f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/fill-4.png new file mode 100644 index 0000000000..5c57ae9737 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/icon.png new file mode 100644 index 0000000000..b63c467af2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/icon_empty.png new file mode 100644 index 0000000000..c21ad2a11e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/meta.json new file mode 100644 index 0000000000..52c392be67 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/junglebird.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by SharkSnake98 on Github", + "states": + [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/fill-1.png new file mode 100644 index 0000000000..a48cfa933c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/fill-2.png new file mode 100644 index 0000000000..a41f789084 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/fill-3.png new file mode 100644 index 0000000000..dba0ef1770 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/fill-4.png new file mode 100644 index 0000000000..47ddc76e44 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/fill-5.png new file mode 100644 index 0000000000..9ba296aae2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/icon.png new file mode 100644 index 0000000000..237652ba74 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/icon_empty.png new file mode 100644 index 0000000000..e2caac82a4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/meta.json new file mode 100644 index 0000000000..fb5566d3dc --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/kalimotxo.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by SharkSnake98 on Github", + "states": + [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/fill-1.png new file mode 100644 index 0000000000..9fdd9db4c4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/fill-2.png new file mode 100644 index 0000000000..e1fd43182e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/fill-3.png new file mode 100644 index 0000000000..8b802c67fb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/fill-4.png new file mode 100644 index 0000000000..2ea71b9702 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/icon.png new file mode 100644 index 0000000000..842091e98d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/icon_empty.png new file mode 100644 index 0000000000..ea020e72a8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/meta.json new file mode 100644 index 0000000000..52c392be67 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/monkeybusiness.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by SharkSnake98 on Github", + "states": + [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/radler.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/radler.rsi/fill-1.png new file mode 100644 index 0000000000..030a2ea926 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/radler.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/radler.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/radler.rsi/fill-2.png new file mode 100644 index 0000000000..b5e942dc85 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/radler.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/radler.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/radler.rsi/fill-3.png new file mode 100644 index 0000000000..c94a2809b0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/radler.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/radler.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/radler.rsi/fill-4.png new file mode 100644 index 0000000000..9e44a20822 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/radler.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/radler.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/radler.rsi/fill-5.png new file mode 100644 index 0000000000..72396bb28a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/radler.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/radler.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/radler.rsi/icon.png new file mode 100644 index 0000000000..dead0ec31d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/radler.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/radler.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/radler.rsi/icon_empty.png new file mode 100644 index 0000000000..efa22b2808 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/radler.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/radler.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/radler.rsi/meta.json new file mode 100644 index 0000000000..fb5566d3dc --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/radler.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by SharkSnake98 on Github", + "states": + [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/fill-1.png new file mode 100644 index 0000000000..2eb13c4fcb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/fill-2.png new file mode 100644 index 0000000000..2b64762c11 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/fill-3.png new file mode 100644 index 0000000000..d6334a476c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/fill-4.png new file mode 100644 index 0000000000..dda1d511aa Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/icon.png new file mode 100644 index 0000000000..0902145f2b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/icon_empty.png new file mode 100644 index 0000000000..433a627e84 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/meta.json new file mode 100644 index 0000000000..52c392be67 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/tortuga.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by SharkSnake98 on Github", + "states": + [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/fill-1.png new file mode 100644 index 0000000000..596d98eef1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/fill-2.png new file mode 100644 index 0000000000..9b3f32db5e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/fill-3.png new file mode 100644 index 0000000000..50afc91678 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/fill-4.png new file mode 100644 index 0000000000..a47a7fd0a9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/icon.png new file mode 100644 index 0000000000..f99adfbb1a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/icon_empty.png new file mode 100644 index 0000000000..5c537f1f7d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/meta.json new file mode 100644 index 0000000000..52c392be67 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/vampiro.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by SharkSnake98 on Github", + "states": + [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + } + ] +}