From: RedBookcase Date: Mon, 10 Mar 2025 23:08:23 +0000 (-0700) Subject: Added New Cocktails and new fill level sprites to existing drinks. (#33570) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=80e674a9ae774cc1e05ff9221d361de753c3a3e9;p=space-station-14.git Added New Cocktails and new fill level sprites to existing drinks. (#33570) * Added New Cocktails and new fill level sprites to existing drinks * Updated copyright info and fixed recipies for Caipirinha/Mojito. --------- Co-authored-by: RedBookcase --- diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 57d95562cb..112f26def2 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -264,6 +264,17 @@ 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-empress75 = like tyrian purple +flavor-complex-espressomartini = like vodka and coffee +flavor-complex-mayojito = like stomach turmoil +flavor-complex-mimeosa = like silence and oranges +flavor-complex-mimosa = like an early brunch +flavor-complex-moscowmule = like vodka and ginger ale +flavor-complex-thesunalsorises = like an absinthe daiquiri +flavor-complex-whiskeysour = like whiskey and egg flavor-complex-zombiecocktail = like eating brains flavor-complex-absinthe = like anise flavor-complex-blue-curacao = like orange flowers 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 a4da1b90cf..3db20a61ab 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl @@ -286,5 +286,38 @@ reagent-desc-watermelon-wakeup = If you want to be awake, this will do it... Als reagent-name-rubberneck = rubberneck reagent-desc-rubberneck = A popular drink amongst those adhering to an all synthetic diet. +reagent-name-caipirinha = caipirinha +reagent-desc-caipirinha = The São Paulo special, straight from old Brazil. + +reagent-name-daiquiri = daiquiri +reagent-desc-daiquiri = A classic rum cocktail which remains popular even in the cold reaches of space. + +reagent-name-death-in-the-afternoon = death in the afternoon +reagent-desc-death-in-the-afternoon = "Pour one jigger absinthe into a Champagne glass. Add iced Champagne until it attains the proper opalescent milkiness. Drink three to five of these slowly." - Ernest Hemingway + +reagent-name-empress-75 = empress 75 +reagent-desc-empress-75 = A more refined take on the mimosa. Just the thing Marie Antoinette might've sipped on before the revolution. + +reagent-name-espresso-martini = espresso martini +reagent-desc-espresso-martini = To wake you up and wind you down. Garnished with coffee beans and icy-cold. + +reagent-name-mayojito = mayojito +reagent-desc-mayojito = An affront to god and man. Do not drink it. + +reagent-name-mimeosa = mimeosa +reagent-desc-mimeosa = It has an orange tang so sour you just can't describe it. + +reagent-name-mimosa = mimosa +reagent-desc-mimosa = Perfect for a lively brunch out with the girls. + +reagent-name-moscow-mule = moscow mule +reagent-desc-moscow-mule = A surpsingly strong and refreshing mixed drink, served in an iconic copper mug. + +reagent-name-the-sun-also-rises = the sun also rises +reagent-desc-the-sun-also-rises = A strong cocktail mixed into a murky blend. A secret favorite of tortured authors. + +reagent-name-whiskey-sour = whiskey sour +reagent-desc-whiskey-sour = What's the secret ingredient? Eggs. It's eggs. + reagent-name-zombiecocktail = Zombie reagent-desc-zombiecocktail = It gets in your head. Your he-eyeh-ead. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 179e479135..13f46cc76e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -1675,6 +1675,9 @@ reagents: - ReagentId: Sake Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/sakeglass.rsi + state: icon - type: entity parent: DrinkGlass @@ -2280,6 +2283,182 @@ sprite: Objects/Consumable/Drinks/xenobasher.rsi state: icon +- type: entity + parent: DrinkGlass + id: DrinkCaipirinha + suffix: caipirinha + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Caipirinha + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/caipirinha.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: DrinkDaiquiri + suffix: daiquiri + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Daiquiri + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/daiquiri.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: DrinkDeathInTheAfternoon + suffix: death in the afternoon + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: DeathInTheAfternoon + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/deathintheafternoon.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: DrinkEmpress75 + suffix: empress 75 + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Empress75 + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/empress75.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: DrinkEspressoMartini + suffix: espresso martini + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: EspressoMartini + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/espressomartini.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: DrinkMayojito + suffix: mayojito + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Mayojito + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/mayojito.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: DrinkMimeosa + suffix: mimeosa + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Mimeosa + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/mimeosa.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: DrinkMimosa + suffix: mimosa + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Mimosa + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/mimosa.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: DrinkMoscowMule + suffix: moscow mule + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: MoscowMule + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/moscowmule.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: DrinkTheSunAlsoRises + suffix: the sun also rises + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: TheSunAlsoRises + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/thesunalsorises.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: DrinkWhiskeySour + suffix: whiskey sour + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: WhiskeySour + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/whiskeysour.rsi + state: icon + # TODO: MOVE - type: entity diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index b9609883ab..2d488cf0c8 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -1339,6 +1339,61 @@ flavorType: Complex description: flavor-complex-compressed-meat +- type: flavor + id: caipirinha + flavorType: Complex + description: flavor-complex-caipirinha + +- type: flavor + id: daiquiri + flavorType: Complex + description: flavor-complex-daiquiri + +- type: flavor + id: deathintheafternoon + flavorType: Complex + description: flavor-complex-deathintheafternoon + +- type: flavor + id: empress75 + flavorType: Complex + description: flavor-complex-empress75 + +- type: flavor + id: espressomartini + flavorType: Complex + description: flavor-complex-espressomartini + +- type: flavor + id: mayojito + flavorType: Complex + description: flavor-complex-mayojito + +- type: flavor + id: mimeosa + flavorType: Complex + description: flavor-complex-mimeosa + +- type: flavor + id: mimosa + flavorType: Complex + description: flavor-complex-mimosa + +- type: flavor + id: moscowmule + flavorType: Complex + description: flavor-complex-moscowmule + +- type: flavor + id: thesunalsorises + flavorType: Complex + description: flavor-complex-thesunalsorises + +- type: flavor + id: whiskeysour + flavorType: Complex + description: flavor-complex-whiskeysour + - type: flavor id: zombiecocktail flavorType: Complex diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index caa3d16276..72205a8b0c 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -67,9 +67,9 @@ flavor: bluecuracao color: "#0099FF" metamorphicSprite: - sprite: Objects/Consumable/Drinks/thin_glass.rsi + sprite: Objects/Consumable/Drinks/curacaoglass.rsi state: icon_empty - metamorphicMaxFillLevels: 5 + metamorphicMaxFillLevels: 4 metamorphicFillBaseName: fill- metamorphicChangeColor: true metabolisms: @@ -81,26 +81,6 @@ 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 @@ -252,9 +232,9 @@ flavor: watermelon color: "#00FF33" metamorphicSprite: - sprite: Objects/Consumable/Drinks/thin_glass.rsi + sprite: Objects/Consumable/Drinks/emeraldglass.rsi state: icon_empty - metamorphicMaxFillLevels: 5 + metamorphicMaxFillLevels: 4 metamorphicFillBaseName: fill- metamorphicChangeColor: true @@ -334,6 +314,20 @@ physicalDesc: reagent-physical-desc-strong-smelling flavor: sake color: "#DDDDDD" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/sakeglass.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 - type: reagent id: Tequila @@ -766,7 +760,10 @@ color: "#cccbc8" metamorphicSprite: sprite: Objects/Consumable/Drinks/coconutrum.rsi - state: icon + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false metabolisms: Drink: effects: @@ -786,7 +783,10 @@ color: "#f73030" metamorphicSprite: sprite: Objects/Consumable/Drinks/cosmopolitan.rsi - state: icon + state: icon_empty + metamorphicMaxFillLevels: 3 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false metabolisms: Drink: effects: @@ -1341,7 +1341,10 @@ color: "#e6cb47" metamorphicSprite: sprite: Objects/Consumable/Drinks/painkiller.rsi - state: icon + state: icon_empty + metamorphicMaxFillLevels: 6 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false metabolisms: Drink: effects: @@ -1383,12 +1386,19 @@ flavor: redmead color: "#bc5550" metamorphicSprite: - sprite: Objects/Consumable/Drinks/beerstein.rsi + sprite: Objects/Consumable/Drinks/red_meadglass.rsi state: icon_empty metamorphicMaxFillLevels: 5 metamorphicFillBaseName: fill- - metamorphicChangeColor: true - fizziness: 0.4 + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 - type: reagent id: PinaColada @@ -1400,7 +1410,18 @@ color: "#e8dba4" metamorphicSprite: sprite: Objects/Consumable/Drinks/pinacolada.rsi - state: icon + state: icon_empty + metamorphicMaxFillLevels: 6 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 - type: reagent id: Sbiten @@ -1664,9 +1685,9 @@ flavor: vodkatonic color: "#0064C8" metamorphicSprite: - sprite: Objects/Consumable/Drinks/gintonicglass.rsi # they look the same + sprite: Objects/Consumable/Drinks/vodkatonicglass.rsi state: icon_empty - metamorphicMaxFillLevels: 6 + metamorphicMaxFillLevels: 5 metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: @@ -1953,6 +1974,297 @@ time: 1.0 type: Remove fizziness: 0.25 + +- 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_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 + +- type: reagent + id: Caipirinha + name: reagent-name-caipirinha + parent: BaseAlcohol + desc: reagent-desc-caipirinha + physicalDesc: reagent-physical-desc-strong-smelling + flavor: caipirinha + color: "#E6EE9C" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/caipirinha.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.1 + +- type: reagent + id: MoscowMule + name: reagent-name-moscow-mule + parent: BaseAlcohol + desc: reagent-desc-moscow-mule + physicalDesc: reagent-physical-desc-strong-smelling + flavor: moscowmule + color: "#CECBAD" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/moscowmule.rsi + state: icon_empty + metamorphicMaxFillLevels: 3 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 + - !type:AdjustReagent + reagent: Copper + amount: 0.05 + +- type: reagent + id: Mimeosa + name: reagent-name-mimeosa + parent: BaseAlcohol + desc: reagent-desc-mimeosa + physicalDesc: reagent-physical-desc-strong-smelling + flavor: mimeosa + color: "#939393" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/mimeosa.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:GenericStatusEffect + key: Muted + component: Muted + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.07 + +- type: reagent + id: Mimosa + name: reagent-name-mimosa + parent: BaseAlcohol + desc: reagent-desc-mimosa + physicalDesc: reagent-physical-desc-strong-smelling + flavor: mimosa + color: "#FFCA48" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/mimosa.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.07 + +- type: reagent + id: Mayojito + name: reagent-name-mayojito + parent: BaseAlcohol + desc: reagent-desc-mayojito + physicalDesc: reagent-physical-desc-strong-smelling + flavor: mayojito + color: "#6FBE44" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/mayojito.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:ChemVomit + conditions: + - !type:ReagentThreshold + min: 5 + probability: 0.5 + - !type:HealthChange + damage: + types: + Poison: .5 + - !type:SatiateThirst + factor: 1 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.15 + +- type: reagent + id: DeathInTheAfternoon + name: reagent-name-death-in-the-afternoon + parent: BaseAlcohol + desc: reagent-desc-death-in-the-afternoon + physicalDesc: reagent-physical-desc-strong-smelling + flavor: deathintheafternoon + color: "#57A87D" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/deathintheafternoon.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.3 + +- type: reagent + id: Empress75 + name: reagent-name-empress-75 + parent: BaseAlcohol + desc: reagent-desc-empress-75 + physicalDesc: reagent-physical-desc-strong-smelling + flavor: empress75 + color: "#900296" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/empress75.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.3 + +- type: reagent + id: EspressoMartini + name: reagent-name-espresso-martini + parent: BaseAlcohol + desc: reagent-desc-espresso-martini + physicalDesc: reagent-physical-desc-strong-smelling + flavor: espressomartini + color: "#170a0c" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/espressomartini.rsi + state: icon_empty + metamorphicMaxFillLevels: 6 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 + +- type: reagent + id: Daiquiri + name: reagent-name-daiquiri + parent: BaseAlcohol + desc: reagent-desc-daiquiri + physicalDesc: reagent-physical-desc-strong-smelling + flavor: daiquiri + color: "#DAC865" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/daiquiri.rsi + state: icon_empty + metamorphicMaxFillLevels: 3 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.1 + +- type: reagent + id: TheSunAlsoRises + name: reagent-name-the-sun-also-rises + parent: BaseAlcohol + desc: reagent-desc-the-sun-also-rises + physicalDesc: reagent-physical-desc-strong-smelling + flavor: thesunalsorises + color: "#DCE2DE" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/thesunalsorises.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.3 + +- type: reagent + id: WhiskeySour + name: reagent-name-whiskey-sour + parent: BaseAlcohol + desc: reagent-desc-whiskey-sour + physicalDesc: reagent-physical-desc-strong-smelling + flavor: whiskeysour + color: "#8B7941" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/whiskeysour.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 - type: reagent id: ZombieCocktail diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 3f9fb7b53d..f72733d15d 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -506,7 +506,10 @@ color: "#d8cc5d" metamorphicSprite: sprite: Objects/Consumable/Drinks/arnoldpalmer.rsi - state: icon + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false metabolisms: Drink: effects: @@ -565,7 +568,7 @@ flavor: sweet color: "#485000" metamorphicSprite: - sprite: Objects/Consumable/Drinks/beerstein.rsi + sprite: Objects/Consumable/Drinks/rewriter.rsi state: icon_empty metamorphicMaxFillLevels: 5 metamorphicFillBaseName: fill- diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml index 7ddf19c14e..d224d1573e 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml @@ -33,7 +33,10 @@ color: "#262019" metamorphicSprite: sprite: Objects/Consumable/Drinks/royrogers.rsi - state: icon + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false metabolisms: Drink: effects: @@ -181,7 +184,10 @@ color: "#ccb87e" metamorphicSprite: sprite: Objects/Consumable/Drinks/sol_dry_glass.rsi - state: icon + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false - type: reagent id: ShirleyTemple @@ -193,7 +199,10 @@ color: "#af2221" metamorphicSprite: sprite: Objects/Consumable/Drinks/shirleytemple.rsi - state: icon + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false metabolisms: Drink: effects: @@ -247,6 +256,12 @@ physicalDesc: reagent-physical-desc-fizzy flavor: fourteenlokosoda color: "#deb928" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/fourteen_loko_glass.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false metabolisms: Drink: effects: diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index 84d79466b9..48884f0ad2 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -1219,6 +1219,144 @@ amount: 1 products: Cola: 4 + +- type: reaction + id: Caipirinha + requiredMixerCategories: + - Shake + reactants: + Rum: + amount: 1 + JuiceLime: + amount: 1 + Sugar: + amount: 1 + Ice: + amount: 1 + products: + Caipirinha: 4 + +- type: reaction + id: Daiquiri + requiredMixerCategories: + - Stir + reactants: + Rum: + amount: 4 + Sugar: + amount: 1 + JuiceLime: + amount: 1 + products: + Daiquiri: 6 + +- type: reaction + id: DeathInTheAfternoon + reactants: + Absinthe: + amount: 2 + Champagne: + amount: 1 + products: + DeathInTheAfternoon: 3 + +- type: reaction + id: Empress75 + requiredMixerCategories: + - Shake + reactants: + Champagne: + amount: 2 + Gin: + amount: 2 + JuiceLime: + amount: 1 + Grenadine: + amount: 1 + products: + Empress75: 6 + +- type: reaction + id: EspressoMartini + requiredMixerCategories: + - Shake + reactants: + BlackRussian: + amount: 1 + Coffee: + amount: 1 + products: + EspressoMartini: 2 + +- type: reaction + id: Mayojito + reactants: + Mojito: + amount: 1 + Mayo: + amount: 1 + products: + Mayojito: 2 + +- type: reaction + id: Mimeosa + reactants: + Mimosa: + amount: 2 + Nothing: + amount: 1 + products: + Mimeosa: 3 + +- type: reaction + id: Mimosa + reactants: + JuiceOrange: + amount: 2 + Champagne: + amount: 1 + products: + Mimosa: 3 + +- type: reaction + id: MoscowMule + requiredMixerCategories: + - Stir + reactants: + Vodka: + amount: 4 + JuiceLime: + amount: 1 + SolDry: + amount: 1 + products: + MoscowMule: 6 + +- type: reaction + id: TheSunAlsoRises + reactants: + Absinthe: + amount: 1 + Daiquiri: + amount: 5 + products: + TheSunAlsoRises: 6 + +- type: reaction + id: WhiskeySour + requiredMixerCategories: + - Shake + reactants: + Whiskey: + amount: 2 + Sugar: + amount: 1 + JuiceLemon: + amount: 2 + Egg: + amount: 1 + products: + WhiskeySour: 6 - type: reaction id: ZombieCocktail diff --git a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-1.png new file mode 100644 index 0000000000..acdf022479 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-2.png new file mode 100644 index 0000000000..b5da710bdd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-3.png new file mode 100644 index 0000000000..5bc942164c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-4.png new file mode 100644 index 0000000000..5da2461c4e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon.png index 81261d0f54..c9f4f08717 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon_empty.png new file mode 100644 index 0000000000..7b1ed771e2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/meta.json index f76e611841..eb79fc75a3 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/meta.json @@ -1,14 +1,31 @@ { "version": 1, - "size": { + "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": [ + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase 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/bluehawaiian.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-1.png new file mode 100644 index 0000000000..34f11f4d0d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-2.png new file mode 100644 index 0000000000..9be8b9645a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-3.png new file mode 100644 index 0000000000..44d1b19cb0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-4.png new file mode 100644 index 0000000000..fd2f038b23 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/icon.png index d192a88461..d1ce3ffbe3 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/icon_empty.png new file mode 100644 index 0000000000..865cdace01 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/meta.json index f76e611841..eb79fc75a3 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/meta.json @@ -1,14 +1,31 @@ { "version": 1, - "size": { + "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": [ + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase 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/caipirinha.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-1.png new file mode 100644 index 0000000000..fd38307d7b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-2.png new file mode 100644 index 0000000000..714a7ad9cc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-3.png new file mode 100644 index 0000000000..b640ef8e72 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-4.png new file mode 100644 index 0000000000..a97ed7113e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-5.png new file mode 100644 index 0000000000..380c07afa3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/icon.png new file mode 100644 index 0000000000..7c49798776 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/icon_empty.png new file mode 100644 index 0000000000..a65ad8097c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/meta.json new file mode 100644 index 0000000000..fb4cf99077 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by RedBookcase 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/coconutrum.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-1.png new file mode 100644 index 0000000000..59cb8b95d6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-2.png new file mode 100644 index 0000000000..8e4c467d94 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-3.png new file mode 100644 index 0000000000..bb404033f0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-4.png new file mode 100644 index 0000000000..7fe5189133 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/icon.png index 4adab5cb6e..2814b46c8f 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/icon_empty.png new file mode 100644 index 0000000000..6dc08c2f6a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/meta.json index f76e611841..eb79fc75a3 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/meta.json @@ -1,14 +1,31 @@ { "version": 1, - "size": { + "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": [ + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase 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/cosmopolitan.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/fill-1.png new file mode 100644 index 0000000000..b0c98a8afd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/fill-2.png new file mode 100644 index 0000000000..6788e1bad5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/fill-3.png new file mode 100644 index 0000000000..61aea2fa1b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/icon.png index bd1eff6943..75d89f80c1 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/icon_empty.png new file mode 100644 index 0000000000..ab35159984 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/meta.json index f76e611841..95b1af5beb 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/meta.json @@ -1,14 +1,28 @@ { "version": 1, - "size": { + "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": [ + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase on GitHub.", + "states": + [ { "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" } ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-1.png new file mode 100644 index 0000000000..02ee7d91d2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-2.png new file mode 100644 index 0000000000..55cea500d7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-3.png new file mode 100644 index 0000000000..065e1a8ff8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-4.png new file mode 100644 index 0000000000..a5d98bf34b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/icon.png index 0f6c9575fc..fb23f689c1 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/icon_empty.png new file mode 100644 index 0000000000..88a73bf915 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/meta.json index db0ac608ed..eb79fc75a3 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi/meta.json @@ -1 +1,31 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]} \ No newline at end of file +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase 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/daiquiri.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/fill-1.png new file mode 100644 index 0000000000..4ba2a35b7d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/fill-2.png new file mode 100644 index 0000000000..83e4d049d1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/fill-3.png new file mode 100644 index 0000000000..309d506c7b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/icon.png new file mode 100644 index 0000000000..b8151471be Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/icon_empty.png new file mode 100644 index 0000000000..49bd5e51a6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/meta.json new file mode 100644 index 0000000000..a8992bc11e --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by RedBookcase on Github.", + "states": + [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-1.png new file mode 100644 index 0000000000..b2a570485f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-2.png new file mode 100644 index 0000000000..5aef80b341 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-3.png new file mode 100644 index 0000000000..1678c3ab8a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-4.png new file mode 100644 index 0000000000..de6daf5c17 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/icon.png new file mode 100644 index 0000000000..2ee6ea11ec Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/icon_empty.png new file mode 100644 index 0000000000..0aca7f11b5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/meta.json new file mode 100644 index 0000000000..ebbb1faf40 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by RedBookcase 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/emeraldglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-1.png new file mode 100644 index 0000000000..0b5febc318 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-2.png new file mode 100644 index 0000000000..eb549df01f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-3.png new file mode 100644 index 0000000000..e87dfe8e13 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-4.png new file mode 100644 index 0000000000..5f314f3855 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/icon.png index cabe64b7f0..640e442ee3 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/icon_empty.png new file mode 100644 index 0000000000..88a73bf915 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/meta.json index db0ac608ed..eb79fc75a3 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi/meta.json @@ -1 +1,31 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]} \ No newline at end of file +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase 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/empress75.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-1.png new file mode 100644 index 0000000000..61a8395d1a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-2.png new file mode 100644 index 0000000000..01388755f2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-3.png new file mode 100644 index 0000000000..3fca8cee1b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-4.png new file mode 100644 index 0000000000..544f22cb59 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/icon.png new file mode 100644 index 0000000000..afc52e5db0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/icon_empty.png new file mode 100644 index 0000000000..b96c17d009 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/meta.json new file mode 100644 index 0000000000..ebbb1faf40 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/empress75.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by RedBookcase 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/espressomartini.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-1.png new file mode 100644 index 0000000000..a8e5eb8580 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-2.png new file mode 100644 index 0000000000..35d8cfd1ee Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-3.png new file mode 100644 index 0000000000..511d7cec1d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-4.png new file mode 100644 index 0000000000..93191f9373 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-5.png new file mode 100644 index 0000000000..6be0c6a865 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-6.png new file mode 100644 index 0000000000..4ac3030821 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/fill-6.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/icon.png new file mode 100644 index 0000000000..7f3b2acd46 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/icon_empty.png new file mode 100644 index 0000000000..10848c6227 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/meta.json new file mode 100644 index 0000000000..d967d4582e --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi/meta.json @@ -0,0 +1,37 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by RedBookcase on Github.", + "states": + [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + }, + { + "name": "fill-6" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-1.png new file mode 100644 index 0000000000..a8e5eb8580 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-2.png new file mode 100644 index 0000000000..35d8cfd1ee Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-3.png new file mode 100644 index 0000000000..511d7cec1d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-4.png new file mode 100644 index 0000000000..93191f9373 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-5.png new file mode 100644 index 0000000000..6be0c6a865 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-6.png new file mode 100644 index 0000000000..4ac3030821 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-6.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/icon.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/icon.png new file mode 100644 index 0000000000..7f3b2acd46 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/icon_empty.png new file mode 100644 index 0000000000..10848c6227 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/meta.json b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/meta.json new file mode 100644 index 0000000000..d967d4582e --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/meta.json @@ -0,0 +1,37 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by RedBookcase on Github.", + "states": + [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + }, + { + "name": "fill-6" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-1.png new file mode 100644 index 0000000000..6f9251bd8b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-2.png new file mode 100644 index 0000000000..68ddf67952 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-3.png new file mode 100644 index 0000000000..57c10008a5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-4.png new file mode 100644 index 0000000000..12b8082288 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-5.png new file mode 100644 index 0000000000..e2446bb4bd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/icon.png index 13fe259aac..e020b6d3e0 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/icon_empty.png new file mode 100644 index 0000000000..8399d1535f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/meta.json index db0ac608ed..8b09e6c054 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi/meta.json @@ -1 +1,34 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]} \ No newline at end of file +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase 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/mayojito.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-1.png new file mode 100644 index 0000000000..57461a568a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-2.png new file mode 100644 index 0000000000..46ce64e57d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-3.png new file mode 100644 index 0000000000..417e8a4f5e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-4.png new file mode 100644 index 0000000000..236bbfd089 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-5.png new file mode 100644 index 0000000000..7a86cdddf3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/icon.png new file mode 100644 index 0000000000..71622804f7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/icon_empty.png new file mode 100644 index 0000000000..788261e6b8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/meta.json new file mode 100644 index 0000000000..fb4cf99077 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by RedBookcase 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/milkshake.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-1.png new file mode 100644 index 0000000000..f10ac9c6ef Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-2.png new file mode 100644 index 0000000000..89461b0704 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-3.png new file mode 100644 index 0000000000..1c62d581ee Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-4.png new file mode 100644 index 0000000000..bfce01a315 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-5.png new file mode 100644 index 0000000000..5c20b500fa Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/icon.png index 3330c8791f..222fad9772 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/icon_empty.png new file mode 100644 index 0000000000..f142a2bd66 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/meta.json index db0ac608ed..8b09e6c054 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi/meta.json @@ -1 +1,34 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]} \ No newline at end of file +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase 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/mimeosa.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-1.png new file mode 100644 index 0000000000..9d844be912 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-2.png new file mode 100644 index 0000000000..ad697e5a2f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-3.png new file mode 100644 index 0000000000..04455b841f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-4.png new file mode 100644 index 0000000000..02b5bb6836 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/icon.png new file mode 100644 index 0000000000..ab028a8ad0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/icon_empty.png new file mode 100644 index 0000000000..88a73bf915 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/meta.json new file mode 100644 index 0000000000..ebbb1faf40 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by RedBookcase 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/mimosa.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-1.png new file mode 100644 index 0000000000..659d1c07a7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-2.png new file mode 100644 index 0000000000..939575a3b1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-3.png new file mode 100644 index 0000000000..5de16f9bb5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-4.png new file mode 100644 index 0000000000..b31fbdf802 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/icon.png new file mode 100644 index 0000000000..8ba082fb4e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/icon_empty.png new file mode 100644 index 0000000000..ec208ffbc5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/meta.json new file mode 100644 index 0000000000..ebbb1faf40 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by RedBookcase 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/moscowmule.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/fill-1.png new file mode 100644 index 0000000000..2aa1740d98 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/fill-2.png new file mode 100644 index 0000000000..4766be1cf4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/fill-3.png new file mode 100644 index 0000000000..788dbc39c0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/icon.png new file mode 100644 index 0000000000..841b2d49c7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/icon_empty.png new file mode 100644 index 0000000000..2dc9ca9847 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/meta.json new file mode 100644 index 0000000000..a8992bc11e --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by RedBookcase on Github.", + "states": + [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-1.png new file mode 100644 index 0000000000..6fcc2d49cd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-2.png new file mode 100644 index 0000000000..fe435073ca Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-3.png new file mode 100644 index 0000000000..8edd114a01 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-4.png new file mode 100644 index 0000000000..4f8203ddb5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-5.png new file mode 100644 index 0000000000..82553f878c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-6.png new file mode 100644 index 0000000000..9bafa75467 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/fill-6.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/icon.png index caa81b36f0..3023c7b4ec 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/icon_empty.png new file mode 100644 index 0000000000..a0f9a4ffae Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/meta.json index f76e611841..de8a24d729 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/meta.json @@ -1,14 +1,37 @@ { "version": 1, - "size": { + "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": [ + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase on GitHub.", + "states": + [ { "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + }, + { + "name": "fill-6" } ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-1.png new file mode 100644 index 0000000000..f37376365e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-2.png new file mode 100644 index 0000000000..939c7aaf49 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-3.png new file mode 100644 index 0000000000..5df996814c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-4.png new file mode 100644 index 0000000000..00a1b34766 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-5.png new file mode 100644 index 0000000000..d1f8a11c0a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-6.png new file mode 100644 index 0000000000..f68a94df9b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/fill-6.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/icon.png index 7a6b0624da..8025bc76a7 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/icon_empty.png new file mode 100644 index 0000000000..404e1f11c4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/meta.json index f76e611841..de8a24d729 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/meta.json @@ -1,14 +1,37 @@ { "version": 1, - "size": { + "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": [ + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase on GitHub.", + "states": + [ { "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + }, + { + "name": "fill-6" } ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-1.png new file mode 100644 index 0000000000..a638609b25 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-2.png new file mode 100644 index 0000000000..49f53c80d9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-3.png new file mode 100644 index 0000000000..5804191a6b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-4.png new file mode 100644 index 0000000000..808033ee0d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-5.png new file mode 100644 index 0000000000..f0b785926c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/icon.png index 036e6d23df..e5408d257d 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/icon_empty.png new file mode 100644 index 0000000000..4106655434 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/meta.json index db0ac608ed..8b09e6c054 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/meta.json @@ -1 +1,34 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]} \ No newline at end of file +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase 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/rewriter.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-1.png new file mode 100644 index 0000000000..5045d333d1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-2.png new file mode 100644 index 0000000000..b8b3afdf5a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-3.png new file mode 100644 index 0000000000..ff1609fdc9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-4.png new file mode 100644 index 0000000000..ca3d2c2ffd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-5.png new file mode 100644 index 0000000000..5e2bcb5925 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/icon.png index 825eb7a688..31842c75ef 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/icon_empty.png new file mode 100644 index 0000000000..4106655434 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/meta.json index db0ac608ed..8b09e6c054 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi/meta.json @@ -1 +1,34 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]} \ No newline at end of file +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase 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/royrogers.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-1.png new file mode 100644 index 0000000000..1da8f6179c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-2.png new file mode 100644 index 0000000000..2174d8f035 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-3.png new file mode 100644 index 0000000000..e107ae3ba9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-4.png new file mode 100644 index 0000000000..fae410e563 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon.png index 9426978d72..d4d772fa2d 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon_empty.png new file mode 100644 index 0000000000..8e07870b2f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/meta.json index d16d731d7f..e499ce642b 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/meta.json @@ -1,22 +1,76 @@ { "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 + "size": + { + "x": 32, + "y": 32 }, - "states": [ - { - "name": "icon", - "delays": [ - [ - 1, - 1, - 1, - 1 - ] - ] - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase on GitHub.", + "states": + [ + { + "name": "icon", + "delays": + [ + [ + 1.0, + 1.0, + 1.0, + 1.0 + ] + ] + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1", + "delays": + [ + [ + 1.0, + 1.0, + 1.0, + 1.0 + ] + ] + }, + { + "name": "fill-2", + "delays": + [ + [ + 1.0, + 1.0, + 1.0, + 1.0 + ] + ] + }, + { + "name": "fill-3", + "delays": + [ + [ + 1.0, + 1.0, + 1.0, + 1.0 + ] + ] + }, + { + "name": "fill-4", + "delays": + [ + [ + 1.0, + 1.0, + 1.0, + 1.0 + ] + ] + } + ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-1.png new file mode 100644 index 0000000000..0fa8025595 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-2.png new file mode 100644 index 0000000000..c4dbad7419 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-3.png new file mode 100644 index 0000000000..a86e9a1dec Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-4.png new file mode 100644 index 0000000000..eb90aeceb4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/icon.png new file mode 100644 index 0000000000..b49fd372e6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/icon_empty.png new file mode 100644 index 0000000000..88a73bf915 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/meta.json new file mode 100644 index 0000000000..ebbb1faf40 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by RedBookcase 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/shirleytemple.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-1.png new file mode 100644 index 0000000000..c253b2bf28 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-2.png new file mode 100644 index 0000000000..b153fce6b9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-3.png new file mode 100644 index 0000000000..9ee530e9ef Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-4.png new file mode 100644 index 0000000000..e059d2cd84 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon.png index 88fdd5e79b..9e8b5a8efb 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon_empty.png new file mode 100644 index 0000000000..9f73430be5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/meta.json index f76e611841..eb79fc75a3 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/meta.json @@ -1,14 +1,31 @@ { "version": 1, - "size": { + "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": [ + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by RedBookcase 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/sol_dry_glass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-1.png new file mode 100644 index 0000000000..585418efc5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-2.png new file mode 100644 index 0000000000..50920885db Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-3.png new file mode 100644 index 0000000000..d255a37bca Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-4.png new file mode 100644 index 0000000000..1a00d8fede Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-5.png new file mode 100644 index 0000000000..8b64a514f5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/fill-5.png differ 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 index c4bf829e5d..9f1e88f87a 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/icon_empty.png new file mode 100644 index 0000000000..8399d1535f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/meta.json index f76e611841..a36dd2a682 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/meta.json @@ -1,14 +1,34 @@ { "version": 1, - "size": { + "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": [ + "copyright": "Made by RedBookcase 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/thesunalsorises.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-1.png new file mode 100644 index 0000000000..1436763c71 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-2.png new file mode 100644 index 0000000000..d34afa7ef8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-3.png new file mode 100644 index 0000000000..fbbbac28ba Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-4.png new file mode 100644 index 0000000000..b2bf2def81 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/icon.png new file mode 100644 index 0000000000..20326b198a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/icon_empty.png new file mode 100644 index 0000000000..0aca7f11b5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/meta.json new file mode 100644 index 0000000000..ebbb1faf40 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by RedBookcase 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/vodkatonicglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-1.png new file mode 100644 index 0000000000..1826842813 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-2.png new file mode 100644 index 0000000000..5228156611 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-3.png new file mode 100644 index 0000000000..650e420ec2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-4.png new file mode 100644 index 0000000000..a909b73d70 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-5.png new file mode 100644 index 0000000000..d327962f9e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/icon.png index cba82f25cb..841f2966ae 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/icon_empty.png new file mode 100644 index 0000000000..936c8edb2c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/meta.json index db0ac608ed..fb4cf99077 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi/meta.json @@ -1 +1,34 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]} \ No newline at end of file +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by RedBookcase 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/whiskeysour.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-1.png new file mode 100644 index 0000000000..fca1e91b5e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-2.png new file mode 100644 index 0000000000..37550af2b4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-3.png new file mode 100644 index 0000000000..24e0b36820 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-4.png new file mode 100644 index 0000000000..b3da8f0bcc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-5.png new file mode 100644 index 0000000000..c57cf4b1bf Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/icon.png new file mode 100644 index 0000000000..b01587c97e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/icon_empty.png new file mode 100644 index 0000000000..189b862f68 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/meta.json new file mode 100644 index 0000000000..fb4cf99077 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by RedBookcase on Github.", + "states": + [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +}