diff --git a/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl index fd151c9cb56..e42086b5c71 100644 --- a/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl @@ -1,2 +1,7 @@ flavor-base-basic = basic +flavor-complex-fast = fast +flavor-complex-greed = like greed +flavor-complex-blast = like jungle warfare +flavor-complex-torpedo = like convoy raiding +flavor-complex-bees = like buzzing and honey flavor-base-earthy = earthy diff --git a/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl index 858ae5f354e..87166bd67cb 100644 --- a/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl @@ -1,2 +1,17 @@ reagent-name-pumpkin-spice-latte = spiced pumpkin latte reagent-desc-pumpkin-spice-latte = It's autumn somewhere. Smells like cinnamon and cloves. + +reagent-name-gin-and-sonic = gin and sonic +reagent-desc-gin-and-sonic = Why did the hedgehog go to Saturn? To collect its rings! + +reagent-name-golden-cat = golden cat +reagent-desc-golden-cat = Legends speak of a golden cat that sold a burger for a fortune. Has a metallic smell. + +reagent-name-pineapple-blast = pineapple blast +reagent-desc-pineapple-blast = For when the trees start talking. Smells tropical, with notes of sulfur. + +reagent-name-torpedo-juice = torpedo juice +reagent-desc-torpedo-juice = The joys of drinking and unrestricted submarine warfare combined! Has a strong alcoholic smell. + +reagent-name-bees-knees = bee’s knees +reagent-desc-bees-knees = BEEEEEEEEEEEEEEES!!! Has a stingy smell. \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml new file mode 100644 index 00000000000..761d49039ee --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml @@ -0,0 +1,97 @@ +# Drinks +- type: entity + parent: DrinkGlass + id: DrinkPumpkinSpiceLatte + suffix: pumpkin spice latte + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: PumpkinSpiceLatte + Quantity: 30 + - type: Icon + sprite: _NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi + state: icon + +# Alcohol drinks +- type: entity + parent: DrinkGlass + id: DrinkGinAndSonic + suffix: gin and sonic + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: GinAndSonic + Quantity: 30 + - type: Icon + sprite: _NF/Objects/Consumable/Drinks/ginandsonic.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: DrinkGoldenCat + suffix: golden cat + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: GoldenCat + Quantity: 30 + - type: Icon + sprite: _NF/Objects/Consumable/Drinks/goldencat.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: DrinkPineappleBlast + suffix: pineapple blast + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: PineappleBlast + Quantity: 30 + - type: Icon + sprite: _NF/Objects/Consumable/Drinks/pineappleblast.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: DrinkTorpedoJuice + suffix: torpedo juice + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: TorpedoJuice + Quantity: 30 + - type: Icon + sprite: _NF/Objects/Consumable/Drinks/torpedojuice.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: DrinkBeesKnees + suffix: bee's knees + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: BeesKnees + Quantity: 30 + - type: Icon + sprite: _NF/Objects/Consumable/Drinks/beesknees.rsi + state: icon diff --git a/Resources/Prototypes/_NF/Flavors/flavors.yml b/Resources/Prototypes/_NF/Flavors/flavors.yml index 931dae9501d..ddc84c1aab7 100644 --- a/Resources/Prototypes/_NF/Flavors/flavors.yml +++ b/Resources/Prototypes/_NF/Flavors/flavors.yml @@ -2,3 +2,28 @@ id: basic flavorType: Base description: flavor-base-basic + +- type: flavor + id: fast + flavorType: Complex + description: flavor-complex-fast + +- type: flavor + id: greed + flavorType: Complex + description: flavor-complex-greed + +- type: flavor + id: blast + flavorType: Complex + description: flavor-complex-blast + +- type: flavor + id: torpedo + flavorType: Complex + description: flavor-complex-torpedo + +- type: flavor + id: bees + flavorType: Complex + description: flavor-complex-bees \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml index ebc6a5b1264..f3a5baa5a72 100644 --- a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml +++ b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml @@ -23,3 +23,141 @@ metamorphicMaxFillLevels: 2 metamorphicFillBaseName: fill- metamorphicChangeColor: false + +- type: reagent + id: GinAndSonic + name: reagent-name-gin-and-sonic + parent: BaseAlcohol + desc: reagent-desc-gin-and-sonic + physicalDesc: reagent-physical-desc-aromatic + flavor: fast + color: "#3061e3" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 1 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.03 + - !type:AdjustReagent + reagent: Desoxyephedrine + amount: 0.25 + metamorphicSprite: + sprite: _NF/Objects/Consumable/Drinks/ginandsonic.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + +- type: reagent + id: GoldenCat + name: reagent-name-golden-cat + parent: BaseAlcohol + desc: reagent-desc-golden-cat + physicalDesc: reagent-physical-desc-aromatic + flavor: greed + color: "#eed037" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 0.2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.3 + metamorphicSprite: + sprite: _NF/Objects/Consumable/Drinks/goldencat.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + +- type: reagent + id: PineappleBlast + name: reagent-name-pineapple-blast + parent: BaseAlcohol + desc: reagent-desc-pineapple-blast + physicalDesc: reagent-physical-desc-aromatic + flavor: blast + color: "#8c934c" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 1 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.4 + - !type:ExplosionReactionEffect + explosionType: Default + maxIntensity: 0.1 + intensityPerUnit: 0.05 + intensitySlope: 1 + maxTotalIntensity: 0.1 + probability: 0.1 + metamorphicSprite: + sprite: _NF/Objects/Consumable/Drinks/pineappleblast.rsi + state: icon_empty + metamorphicMaxFillLevels: 3 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + +- type: reagent + id: TorpedoJuice + name: reagent-name-torpedo-juice + parent: BaseAlcohol + desc: reagent-desc-torpedo-juice + physicalDesc: reagent-physical-desc-aromatic + flavor: torpedo + color: "#d4db9a" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 0.8 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.4 + metamorphicSprite: + sprite: _NF/Objects/Consumable/Drinks/torpedojuice.rsi + state: icon_empty + metamorphicMaxFillLevels: 6 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + +- type: reagent + id: BeesKnees + name: reagent-name-bees-knees + parent: BaseAlcohol + desc: reagent-desc-bees-knees + physicalDesc: reagent-physical-desc-aromatic + flavor: bees + color: "#f1d25f" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 0.5 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 + - !type:SatiateHunger + factor: 0.1 + - !type:HealthChange + damage: + types: + Poison: -0.05 + Radiation: -0.05 + Asphyxiation: 1 + conditions: + - !type:ReagentThreshold + min: 35 + - !type:ModifyBloodLevel + amount: 0.2 + metamorphicSprite: + sprite: _NF/Objects/Consumable/Drinks/beesknees.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false diff --git a/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml b/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml index 670fadacde2..d6dd29724cd 100644 --- a/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml @@ -1,6 +1,8 @@ - type: reaction id: Coffee minTemp: 353 # ~80 deg C + requiredMixerCategories: + - Stir reactants: Water: amount: 3 @@ -22,3 +24,69 @@ amount: 1 products: PumpkinSpiceLatte: 6 + +- type: reaction + id: GinAndSonic + requiredMixerCategories: + - Shake + reactants: + GinTonic: + amount: 1 + Desoxyephedrine: + amount: 1 + products: + GinAndSonic: 2 + +- type: reaction + id: GoldenCat + requiredMixerCategories: + - Stir + reactants: + Whiskey: + amount: 1 + Rum: + amount: 2 + Gold: + amount: 2 + products: + GoldenCat: 5 + +- type: reaction + id: PineappleBlast + reactants: + JuicePineapple: + amount: 2 + Moonshine: + amount: 2 + Napalm: + amount: 1 + products: + PineappleBlast: 5 + +- type: reaction + id: TorpedoJuice + requiredMixerCategories: + - Shake + reactants: + JuicePineapple: + amount: 2 + Ethanol: + amount: 2 + Thermite: + amount: 1 + products: + TorpedoJuice: 5 + +- type: reaction + id: BeesKnees + reactants: + JuiceLemon: + amount: 1 + BuzzochloricBees: + amount: 2 + Gin: + amount: 1 + Mead: + amount: 1 + products: + BeesKnees: 5 diff --git a/Resources/Prototypes/_NF/SoundCollections/emotes.yml b/Resources/Prototypes/_NF/SoundCollections/emotes.yml index 06e2bde35f3..6df7a996ade 100644 --- a/Resources/Prototypes/_NF/SoundCollections/emotes.yml +++ b/Resources/Prototypes/_NF/SoundCollections/emotes.yml @@ -3,4 +3,4 @@ files: - /Audio/_NF/Voice/Human/belch_1.ogg - /Audio/_NF/Voice/Human/belch_2.ogg - - /Audio/_NF/Voice/Human/belch_3.ogg + - /Audio/_NF/Voice/Human/belch_3.ogg \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-1.png new file mode 100644 index 00000000000..bb1b998278d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-1.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-2.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-2.png new file mode 100644 index 00000000000..9ce4372e960 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-2.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-3.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-3.png new file mode 100644 index 00000000000..f0e81737907 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-3.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-4.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-4.png new file mode 100644 index 00000000000..259535120af Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-4.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/icon.png new file mode 100644 index 00000000000..259535120af Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/icon_empty.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/icon_empty.png new file mode 100644 index 00000000000..e8b4b304ec2 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/icon_empty.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/meta.json new file mode 100644 index 00000000000..0c2133f4dfd --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Made by ra.Y (Discord)", + "size": { + "x": 16, + "y": 16 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-1.png new file mode 100644 index 00000000000..0725e124046 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-1.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-2.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-2.png new file mode 100644 index 00000000000..e68ecc04f90 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-2.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-3.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-3.png new file mode 100644 index 00000000000..17eaee814b7 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-3.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-4.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-4.png new file mode 100644 index 00000000000..88169286dcc Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-4.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/icon.png new file mode 100644 index 00000000000..43df9c2ee53 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/icon_empty.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/icon_empty.png new file mode 100644 index 00000000000..eb74c06fde1 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/icon_empty.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/meta.json new file mode 100644 index 00000000000..0c2133f4dfd --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Made by ra.Y (Discord)", + "size": { + "x": 16, + "y": 16 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-1.png new file mode 100644 index 00000000000..fcb002305b0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-1.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-2.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-2.png new file mode 100644 index 00000000000..c05bf4bf32e Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-2.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-3.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-3.png new file mode 100644 index 00000000000..1a1552dbae0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-3.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-4.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-4.png new file mode 100644 index 00000000000..d133dbe7c24 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-4.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-5.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-5.png new file mode 100644 index 00000000000..1452f3269ba Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-5.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/icon.png new file mode 100644 index 00000000000..1452f3269ba Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/icon_empty.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/icon_empty.png new file mode 100644 index 00000000000..1530481d1f9 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/icon_empty.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/meta.json new file mode 100644 index 00000000000..4d25b5bd818 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Made by ra.Y (Discord)", + "size": { + "x": 16, + "y": 16 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/fill-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/fill-1.png new file mode 100644 index 00000000000..4840ec06d22 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/fill-1.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/fill-2.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/fill-2.png new file mode 100644 index 00000000000..4840ec06d22 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/fill-2.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/fill-3.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/fill-3.png new file mode 100644 index 00000000000..25825757fd5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/fill-3.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/icon.png new file mode 100644 index 00000000000..25825757fd5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/icon_empty.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/icon_empty.png new file mode 100644 index 00000000000..4840ec06d22 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/icon_empty.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/meta.json new file mode 100644 index 00000000000..aca22de7671 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Made by ra.Y (Discord)", + "size": { + "x": 16, + "y": 16 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-1.png new file mode 100644 index 00000000000..cc38bd2d9d8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-1.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-2.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-2.png new file mode 100644 index 00000000000..a83effc4986 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-2.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-3.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-3.png new file mode 100644 index 00000000000..a83effc4986 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-3.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-4.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-4.png new file mode 100644 index 00000000000..99dd9928c5d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-4.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-5.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-5.png new file mode 100644 index 00000000000..fdaa7fc1e6f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-5.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-6.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-6.png new file mode 100644 index 00000000000..6be478ea812 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-6.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/icon.png new file mode 100644 index 00000000000..6be478ea812 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/icon_empty.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/icon_empty.png new file mode 100644 index 00000000000..dde6e4001ba Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/icon_empty.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/meta.json new file mode 100644 index 00000000000..6cf768acb8d --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/meta.json @@ -0,0 +1,91 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Made by ra.Y (Discord)", + "size": { + "x": 32, + "y": 16 + }, + "states": [ + { + "name": "icon", + "delays": + [ + [ + 1.0, + 1.0 + ] + ] + }, + { + "name": "icon_empty", + "delays": + [ + [ + 1.0, + 1.0 + ] + ] + }, + { + "name": "fill-1", + "delays": + [ + [ + 1.0, + 1.0 + ] + ] + }, + { + "name": "fill-2", + "delays": + [ + [ + 1.0, + 1.0 + ] + ] + }, + { + "name": "fill-3", + "delays": + [ + [ + 1.0, + 1.0 + ] + ] + }, + { + "name": "fill-4", + "delays": + [ + [ + 1.0, + 1.0 + ] + ] + }, + { + "name": "fill-5", + "delays": + [ + [ + 1.0, + 1.0 + ] + ] + }, + { + "name": "fill-6", + "delays": + [ + [ + 1.0, + 1.0 + ] + ] + } + ] +} \ No newline at end of file