From a8bf2689a4696e841ce607c7061ac73faceeeefb Mon Sep 17 00:00:00 2001 From: Hanz <41141796+Hanzdegloker@users.noreply.github.com> Date: Fri, 3 May 2024 02:57:37 -0400 Subject: [PATCH] Red bool update (#27597) * the meat and potatoes yuh yuh yuh * what the hell is a copyright? am I right? --- .../Locale/en-US/flavors/flavor-profiles.ftl | 6 + .../meta/consumable/drink/alcohol.ftl | 18 ++ .../Catalog/ReagentDispensers/beverage.yml | 1 + .../VendingMachines/Inventories/boozeomat.yml | 1 + .../VendingMachines/Inventories/discount.yml | 1 + .../Random/Food_Drinks/drinks_glass.yml | 6 + .../Objects/Consumable/Drinks/drinks.yml | 96 +++++++++++ Resources/Prototypes/Flavors/flavors.yml | 30 ++++ .../Reagents/Consumable/Drink/alcohol.yml | 162 ++++++++++++++++++ .../Reagents/Consumable/Drink/soda.yml | 2 +- .../Prototypes/Recipes/Reactions/drinks.yml | 64 +++++++ .../Drinks/budgetinsulsdrink.rsi/fill-1.png | Bin 0 -> 282 bytes .../Drinks/budgetinsulsdrink.rsi/fill-2.png | Bin 0 -> 298 bytes .../Drinks/budgetinsulsdrink.rsi/fill-3.png | Bin 0 -> 313 bytes .../Drinks/budgetinsulsdrink.rsi/icon.png | Bin 0 -> 313 bytes .../budgetinsulsdrink.rsi/icon_empty.png | Bin 0 -> 220 bytes .../Drinks/budgetinsulsdrink.rsi/meta.json | 28 +++ .../Drinks/energy_drink.rsi/icon.png | Bin 504 -> 450 bytes .../Drinks/energy_drink.rsi/icon_open.png | Bin 488 -> 440 bytes .../Drinks/rubberneck.rsi/fill-1.png | Bin 0 -> 277 bytes .../Drinks/rubberneck.rsi/fill-2.png | Bin 0 -> 278 bytes .../Drinks/rubberneck.rsi/fill-3.png | Bin 0 -> 278 bytes .../Consumable/Drinks/rubberneck.rsi/icon.png | Bin 0 -> 278 bytes .../Drinks/rubberneck.rsi/icon_empty.png | Bin 0 -> 277 bytes .../Drinks/rubberneck.rsi/meta.json | 28 +++ .../Drinks/xenobasher.rsi/fill-1.png | Bin 0 -> 790 bytes .../Drinks/xenobasher.rsi/fill-2.png | Bin 0 -> 839 bytes .../Consumable/Drinks/xenobasher.rsi/icon.png | Bin 0 -> 839 bytes .../Drinks/xenobasher.rsi/icon_empty.png | Bin 0 -> 754 bytes .../Drinks/xenobasher.rsi/meta.json | 23 +++ 30 files changed, 465 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/fill-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/fill-2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/fill-3.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/icon_empty.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/fill-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/fill-2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/fill-3.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/icon_empty.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/xenobasher.rsi/fill-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/xenobasher.rsi/fill-2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/xenobasher.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/xenobasher.rsi/icon_empty.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/xenobasher.rsi/meta.json diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index f861624fb6..39b185bd02 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -243,6 +243,12 @@ flavor-complex-atomic-cola = like hoarding bottle caps flavor-complex-cuba-libre = like spiked cola flavor-complex-gin-tonic = like spiked lemon-lime soda flavor-complex-screwdriver = like spiked orange juice +flavor-complex-vodka-red-bool = like a heart attack +flavor-complex-irish-bool = caffine and Ireland +flavor-complex-xeno-basher = like killing bugs +flavor-complex-budget-insuls-drink = like door hacking +flavor-complex-watermelon-wakeup = like a sweet wakeup call +flavor-complex-rubberneck = like synthetics flavor-complex-irish-car-bomb = like a spiked cola float flavor-complex-themartinez = like violets and lemon vodka flavor-complex-cogchamp = like brass 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 4c38e92558..1cac0495b0 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl @@ -261,3 +261,21 @@ reagent-desc-whiskey-soda = For the more refined griffon. reagent-name-white-russian = white russian reagent-desc-white-russian = That's just, like, your opinion, man... + +reagent-name-vodka-red-bool = vodka red bool +reagent-desc-vodka-red-bool = Because heart failure and liver failure go hand in hand. + +reagent-name-xeno-basher = xeno basher +reagent-desc-xeno-basher = The perfect drink before an expedition. + +reagent-name-irish-bool = irish bool +reagent-desc-irish-bool = Like a bool in a Ireland shop. + +reagent-name-budget-insuls = budget insuls +reagent-desc-budget-insuls = A tider's preferred drink. + +reagent-name-watermelon-wakeup = watermelon wakeup +reagent-desc-watermelon-wakeup = If you want to be awake, this will do it... Also sweet. + +reagent-name-rubberneck = rubberneck +reagent-desc-rubberneck = A popular drink amongst those adhering to an all synthetic diet. diff --git a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml index 975541a502..4689e26f8e 100644 --- a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml +++ b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml @@ -6,6 +6,7 @@ - DrinkColaBottleFull - DrinkCreamCartonXL - DrinkDrGibbJug + - DrinkEnergyDrinkJug - DrinkGreenTeaJug - DrinkIceJug - DrinkJuiceLimeCartonXL diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index a309b1d61d..e4f4440bd3 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -18,6 +18,7 @@ DrinkCognacBottleFull: 4 DrinkCoconutWaterCarton: 3 DrinkColaBottleFull: 4 + DrinkEnergyDrinkCan: 8 DrinkMilkCarton: 2 DrinkCreamCarton: 5 DrinkGinBottleFull: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml index ddf7943217..fc8492dcf1 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml @@ -4,6 +4,7 @@ FoodSnackCheesie: 3 FoodSnackChips: 3 FoodSnackBoritos: 3 + DrinkEnergyDrinkCan: 4 FoodSnackPopcorn: 3 FoodSnackEnergy: 3 CigPackMixed: 2 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml index ff9e512432..f8fc2998d7 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml @@ -32,6 +32,7 @@ - DrinkBloodyMaryGlass - DrinkBooger - DrinkBraveBullGlass + - BudgetInsulsDrinkGlass - DrinkCarrotJuice - DrinkCoconutRum - DrinkChocolateGlass @@ -57,6 +58,7 @@ - DrinkIcedGreenTeaGlass - DrinkIcedBeerGlass - DrinkIceCreamGlass + - IrishBoolGlass - DrinkIrishCarBomb - DrinkIrishCoffeeGlass - DrinkLemonadeGlass @@ -78,6 +80,7 @@ - DrinkRewriter - DrinkRoyRogersGlass - DrinkRootBeerFloatGlass + - RubberneckGlass - DrinkRumGlass - DrinkSakeGlass - DrinkSbitenGlass @@ -91,12 +94,15 @@ - DrinkThreeMileIslandGlass - DrinkToxinsSpecialGlass - DrinkVodkaMartiniGlass + - DrinkVodkaRedBool - DrinkVodkaTonicGlass - DrinkWatermelonJuice + - DrinkWatermelonWakeup - DrinkWhiskeyColaGlass - DrinkWhiskeySodaGlass - DrinkWhiteRussianGlass - DrinkWineGlass + - XenoBasherGlass - DrinkShakeBlue - DrinkShakeWhite - DrinkTheMartinez diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index a729eed9c8..42814f7fd8 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -503,6 +503,22 @@ sprite: Objects/Consumable/Drinks/bravebullglass.rsi state: icon +- type: entity + parent: DrinkGlass + id: BudgetInsulsDrinkGlass + suffix: budget insuls + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: BudgetInsulsDrink + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/budgetinsulsdrink.rsi + state: icon + - type: entity parent: DrinkGlass id: DrinkCarrotJuice @@ -535,6 +551,22 @@ sprite: Objects/Consumable/Drinks/chocolateglass.rsi state: icon +- type: entity + parent: DrinkGlass + id: RubberneckGlass + suffix: rubberneck + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Rubberneck + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/rubberneck.rsi + state: icon + - type: entity parent: DrinkGlass id: DrinkCoconutRum @@ -1061,6 +1093,22 @@ sprite: Objects/Consumable/Drinks/icecreamglass.rsi state: icon +- type: entity + parent: DrinkGlass + id: IrishBoolGlass + suffix: irish bool + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: IrishBool + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/beerglass.rsi + state: icon + - type: entity parent: DrinkGlass id: DrinkIrishCarBomb @@ -2054,6 +2102,22 @@ sprite: Objects/Consumable/Drinks/martiniglass.rsi state: icon +- type: entity + parent: DrinkGlass + id: DrinkVodkaRedBool + suffix: vodka red bool + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: VodkaRedBool + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi + state: icon + - type: entity parent: DrinkGlass id: DrinkVodkaTonicGlass @@ -2100,6 +2164,22 @@ - ReagentId: JuiceWatermelon Quantity: 30 +- type: entity + parent: DrinkGlass + id: DrinkWatermelonWakeup + suffix: watermelon wakeup + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: WatermelonWakeup + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/champagneglass.rsi + state: icon + - type: entity parent: DrinkGlass id: DrinkWhiskeyColaGlass @@ -2180,6 +2260,22 @@ sprite: Objects/Consumable/Drinks/wineglass.rsi state: icon +- type: entity + parent: DrinkGlass + id: XenoBasherGlass + suffix: xeno basher + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: XenoBasher + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/xenobasher.rsi + state: icon + # TODO: MOVE - type: entity diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index 47a1bc71aa..73ded93e0f 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -589,6 +589,36 @@ flavorType: Complex description: flavor-complex-irish-car-bomb +- type: flavor + id: vodkaredbool + flavorType: Complex + description: flavor-complex-vodka-red-bool + +- type: flavor + id: xenobasher + flavorType: Complex + description: flavor-complex-xeno-basher + +- type: flavor + id: irishbool + flavorType: Complex + description: flavor-complex-irish-bool + +- type: flavor + id: budgetinsulsdrink + flavorType: Complex + description: flavor-complex-budget-insuls-drink + +- type: flavor + id: watermelonwakeup + flavorType: Complex + description: flavor-complex-watermelon-wakeup + +- type: flavor + id: rubberneck + flavorType: Complex + description: flavor-complex-rubberneck + - type: flavor id: blackrussian flavorType: Complex diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 963e5fcf45..8028b6376c 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -1769,3 +1769,165 @@ - !type:AdjustReagent reagent: Ethanol amount: 0.15 + +- type: reagent + id: VodkaRedBool + name: reagent-name-vodka-red-bool + parent: BaseAlcohol + desc: reagent-desc-vodka-red-bool + physicalDesc: reagent-physical-desc-strong-smelling + flavor: vodkaredbool + color: "#c4c27655" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 1 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.10 + - !type:AdjustReagent + reagent: Theobromine + amount: 0.05 + fizziness: 0.25 + +- type: reagent + id: XenoBasher + name: reagent-name-xeno-basher + parent: BaseAlcohol + desc: reagent-desc-xeno-basher + physicalDesc: reagent-physical-desc-fizzy-and-creamy + flavor: xenobasher + color: "#4d6600" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/xenobasher.rsi + state: icon_empty + metamorphicMaxFillLevels: 2 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 1 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.15 + - !type:AdjustReagent + reagent: Theobromine + amount: 0.05 + fizziness: 0.15 + +- type: reagent + id: IrishBool + name: reagent-name-irish-bool + parent: BaseAlcohol + desc: reagent-desc-irish-bool + physicalDesc: reagent-physical-desc-bubbly + flavor: irishbool + color: "#71672e99" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/beerglass.rsi + state: icon_empty + metamorphicMaxFillLevels: 6 + metamorphicFillBaseName: fill- + metamorphicChangeColor: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 1 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.10 + - !type:AdjustReagent + reagent: Theobromine + amount: 0.05 + fizziness: 0.15 + +- type: reagent + id: BudgetInsulsDrink + name: reagent-name-budget-insuls + parent: BaseAlcohol + desc: reagent-desc-budget-insuls + physicalDesc: reagent-physical-desc-strong-smelling + flavor: budgetinsulsdrink + color: "#dede73" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/budgetinsulsdrink.rsi + state: icon_empty + metamorphicMaxFillLevels: 3 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 1 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.15 + - !type:AdjustReagent + reagent: Theobromine + amount: 0.05 + fizziness: 0.25 + +- type: reagent + id: WatermelonWakeup + name: reagent-name-watermelon-wakeup + parent: BaseAlcohol + desc: reagent-desc-watermelon-wakeup + physicalDesc: reagent-physical-desc-sweet + flavor: watermelonwakeup + color: "#d49dca" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/champagneglass.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 1 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.07 + - !type:AdjustReagent + reagent: Theobromine + amount: 0.05 + fizziness: 0.15 + +- type: reagent + id: Rubberneck + name: reagent-name-rubberneck + parent: BaseAlcohol + desc: reagent-desc-rubberneck + physicalDesc: reagent-physical-desc-strong-smelling + flavor: rubberneck + color: "#f0d74a" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/rubberneck.rsi + state: icon_empty + metamorphicMaxFillLevels: 3 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 1 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.15 + - !type:AdjustReagent + reagent: Theobromine + amount: 0.05 + fizziness: 0.25 diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml index f8d3f41af9..d78b0351ce 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml @@ -70,7 +70,7 @@ factor: 2 - !type:AdjustReagent reagent: Theobromine - amount: 0.05 + amount: 0.1 fizziness: 0.4 - type: reagent diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index c810ebb0ce..2a14c0ecd2 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -86,6 +86,16 @@ products: B52: 3 +- type: reaction + id: BudgetInsulsDrink + reactants: + Tequila: + amount: 1 + VodkaRedBool: + amount: 2 + products: + BudgetInsulsDrink: 3 + - type: reaction id: BlueHawaiian reactants: @@ -516,6 +526,16 @@ products: IcedTea: 3 +- type: reaction + id: IrishBool + reactants: + EnergyDrink: + amount: 1 + IrishCarBomb: + amount: 1 + products: + IrishBool: 2 + - type: reaction id: IrishCarBomb reactants: @@ -794,6 +814,18 @@ products: RoyRogers: 3 +- type: reaction + id: Rubberneck + reactants: + EnergyDrink: + amount: 2 + Moonshine: + amount: 1 + Sugar: + amount: 1 + products: + Rubberneck: 4 + - type: reaction id: Sbiten reactants: @@ -943,6 +975,16 @@ products: VodkaMartini: 3 +- type: reaction + id: VodkaRedBool + reactants: + Vodka: + amount: 1 + EnergyDrink: + amount: 2 + products: + VodkaRedBool: 3 + - type: reaction id: VodkaTonic reactants: @@ -963,6 +1005,18 @@ products: WhiskeyCola: 3 +- type: reaction + id: WatermelonWakeup + reactants: + JuiceWatermelon: + amount: 1 + Whiskey: + amount: 1 + EnergyDrink: + amount: 1 + products: + WatermelonWakeup: 3 + - type: reaction id: WhiteRussian reactants: @@ -983,6 +1037,16 @@ products: WhiskeySoda: 3 +- type: reaction + id: XenoBasher + reactants: + ManlyDorf: + amount: 2 + EnergyDrink: + amount: 1 + products: + XenoBasher: 3 + - type: reaction id: HotRamen minTemp: 323.15 diff --git a/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..aca8f4931d802b083f81a1b19a910fbcbfd8d3b1 GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}S3F%DLn2y} z6C_v{Cy4YkF|zd>(b9?B`rS^G?R$%*w$S3f)`-)!I;C-wA2GCrR=*d1%&|!3z@gJ; zbM%$J?JD_dr(b9?B`rS^G?R$%*w$S3f)`-)!I;C-wA2GCrR=*d1%&|!3z@gJ; zbM%$J?JD_dr(b9?B`rS^G?R$%*w$S3f)`-)!I;C-wA2GCrR=*d1%&|!3z@gJ; zbM%$J?JD_drc&fDMzrm9Yoq=~5U+_6@n{j7?q9&J|ZBo*N$-mnV z)qmkg+BoNqy~S*i$(?22j_DqYJ26eknk~(8)8h_Sm3HYW4u$AGA*L-w4BIjsmU*(e zEN>Lnx%}YguOr4mC6CybTxt96VYoy6Ok`)t^PZ+a11>iu28Qs@eorQEo&*XU22WQ% Jmvv4FO#rpoerNyy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..04bfd58d03a8e42fe0c30a49c7b05fcbf42e3773 GIT binary patch literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}pFLe1Ln2y} z6C_v{Cy4YkF|zd>(b9?B`rS^G?R$%*w$S3f)`-)!I;C-wA2GCrR=*d1%&|!3z@gJ; zbM%$J?JD_drc&fDMzrm9Yoq=~5U+_6@n{j7?q9&J|ZBo*N$-mnV z)qmkg+BoNqy~S*i$(?22j_DqYJ26eknk~(8)8h_Sm3HYW4u$AGA*L-w4BIjsmU*(e zEN>Lnx%}YguOr4mC6CybTxt96VYoy6Ok`)t^PZ+a11>iu28Qs@eorQEo&*XU22WQ% Jmvv4FO#rpoerNyy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/icon_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..4d446abc54ec550893fc1e1fbcc9228c9fcd2f16 GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}(>z@qLn2y} z6C_v{Cy4YkF|zd>(b9?B`rS^G?R$%*w$S3f)`-)!I;C-wA2GCrR=*d1%&|!3z@gJ; zbM%$J?JD_dr#y;zV9sD=yTj-*z2(TXoFz;_S%<5aNZb*Aw#H>wvD-ln307r628P&2vhSD8 SUb6$}LIzJ)KbLh*2~7a>=u)!) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/meta.json new file mode 100644 index 0000000000..14c43f186f --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Glass and fillstates by Hanzdegloker 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/energy_drink.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/icon.png index 7a577d477caa8491e525fab9049196f25d63edbb..e9e2aea71684d1d6bafd1a7fb0af40d3cc0e49e7 100644 GIT binary patch delta 411 zcmV;M0c8I81HuE4F@JnXL_t(oh3%F3(G7({0RT0ZZ)xMl(>Bf?Ycq3O6Jy zK+WY_F1HN8VJd~oE#sMVv3qbtG7)bf=&D^*0Kj@U2!P8i^Zxb>z^QsksZx z5I7yZ5zr~xp??~Q!SIlwJcfo)+r3!~3D8oF!~huk`tF?ot^H;(Gy_+gTiuR*7b*ZZ z*99Wqpk=%#8Q|;_*!Jx*+8dCAIT zGQthji6$705i2&-O>0XtJ9|gG>Mxk4Njg2t&h}=uR4T2D==ntr08CFN0Ei8Bb946y zz~S*3MXe|!Cq^_8wL-fgORK&*CzrprLc1X=nuuE8E4Y!`0Yz1a9rU?kXUPkujwgh* zqzo9kfzq!y-+%s^pWf3hB1Hbi06?`?b?)u7%gV?tp`t3B1e(xNKD3nZpXWk)0sw=# zHs>Bz!%`Yj6EJiGfcsR1`&31$u#MCNG&CUKnt-7jG|=!j25ju^2Mz<$8qx;lYbxYa z%9II8mzUfDn=<8}q{|z4NIvndzZ2Ah1ohAU6;=5r>q?glm|916Yh#V`WRbV}H|LDy z$1t^ytf-#UgJfZGV{LS}(^c&9_Bp%1x4JI+Ao1|<_;)@4eddL})Oof&00000NkvXX Hu0mjf3CG}$ diff --git a/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/icon_open.png index b26d37e3779da1e812d245188310d0fd37d39acf..44688ef3e9277fceaaac1987aec2d2ba559b3276 100644 GIT binary patch delta 414 zcmV;P0b%~=1Goc_B!2;OQb$4nuFf3k0004UNklSQh)DSdR)YQ<@qU#GnQYh#HUQsmEP=kZ6ny5p2gxZqw9uaZx z3nh5J?f&7M^FQaF%X?sBW7B0Eq5-XXVNwS>m*ts-T>NF|m4VDSB;a|Vp#w~Evb+^nv(JN92> z0Jyu=LE;ryz5=UAzk>b-_`bTg!vCDW(&-7cO4+oGilRsv5S~D(>TK-oZsQ&pGU=&Q zic;0t5X~q2{RU9H!TRLHu*v+x(`)1CaH~i3hs4IlrWfmc0y_99smFU delta 462 zcmV;<0Wto#1Ly;gB!2{FK}|sb0I`mI`%#ks00Ey#L_t(oh3%FK37#nqC8|!PtMwXPd{F37FsbK(e*(AAalKY28cJ}tk=kxYA=|49Bu#iiA zi4{)HDH~;poEp(o)D9hlY@`0>uHwb59Xbfv(Nt8q1ELwwbdC7&ct`9!eZ~AqR#{7A zz%nhg3C%tG8-ISr&W4B(`5OZO^+w&@_t7Vnkqx1yYn%ppFfu-jjPg^`fw%(zlf__6rlSd?($xGm3wP`-rC6$ef=1sZU<9h|_< Z(Bb3tt9U}?e4y7DJYD@<);T3K0RWzEbSwY> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/fill-2.png new file mode 100644 index 0000000000000000000000000000000000000000..79bcdcfb8cb7e0099c36cd60ee2180290c85ba10 GIT binary patch literal 278 zcmV+x0qOpUP)Px#&`Cr=R9J;$U>F6XU=)l3>VjvaYG9&;D+UDc3km%qM;{|8iYvCCcvfL=Al`BC z!b@cFukYW9a|;T+WME)m=+Jp1wI>;M1HqW}MY7XAP3w!r`YpGE(#*nWcK1W1u1{@;@R|L2;- z|Npn7DYBfTG=T017@O31ry8JZun${D4DFJzV*80_0~Q5CKJHPx#&`Cr=R9J;$U>F6XU=)l3>VjvaYG9&;D+UDc3km%qM;{|8iYvCCcvfL=Al`BC z!b@cFukYW9a|;T+WME)m=Zhp0N8<7D7Z1s@&Et;07*qoM6N<$g6_a|egFUf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..772aa80d6a7595e230f85f9e1fb7cecb5b0b22e2 GIT binary patch literal 278 zcmV+x0qOpUP)Px#&`Cr=R9J;$U>F6XU=)l3>VjvaYG9&;D+UDc3km%qM;{|8iYvCCcvfL=Al`BC z!b@cFukYW9a|;T+WME)m=Zhp0N8<7D7Z1s@&Et;07*qoM6N<$g6_a|egFUf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/icon_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..416d1f771769bda989124a6ab1d323acc37c18e9 GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}=RI8^NvsbE$sQ#_U3}5-<|2~a{GC{c6R-&fAI12g|4^i9)5of z9D<}A%2|4R&F4QZKGM*r_`YLdtWa2v{l}aGixN&8x8<1-%9pUY;=rk>p Y8YMlyXxnJ(0=>rI>FVdQ&MBb@0Jzw1-2eap literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/meta.json new file mode 100644 index 0000000000..a26c7355ae --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://tgstation13.org/wiki/images/archive/4/4e/20220514022531%21Rubberneck.png. Fill levels by Hanzdegloker 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/xenobasher.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/xenobasher.rsi/fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..3aef3bd8abda755f1febb0cfc320ee0ae91886a5 GIT binary patch literal 790 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/xenobasher.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/xenobasher.rsi/meta.json new file mode 100644 index 0000000000..9743bd909e --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/xenobasher.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Hanzdegloker on github", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + } + ] +} -- 2.52.0