From 6cdc436f5f8fd2a375ef23e06de448cf93d43dc9 Mon Sep 17 00:00:00 2001 From: Prole <172158352+Prole0@users.noreply.github.com> Date: Tue, 6 May 2025 11:13:33 -0700 Subject: [PATCH] Water bottle dispenser fix & Bottle Yaml Organizing (#37108) * A New Parent/Category For The Soda & Tonic Water Bottle Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * New Parent For water bottle & Cleanup Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * More Cleanup Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * Details Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * Organizing For Additions Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * Streamlining waterbottle to be compatible with DrinkBottleVisualsAll Parent Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * Replacing/Renaming Parents Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * New Tonic/Soda Water Bottle Sprites Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * Misc Fixes Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * New Parent for Small Glass Bottles & Organizing Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * Organizing & uSize Parity. Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * File Parity Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * Merged Categories & Misc Fixes Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * Removed Silly Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * Parent Name Parity & Cleanup Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * Large Glass Bottles Category & Cleanup Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> --------- Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> --- .../Consumable/Drinks/drinks_bottles.yml | 335 +++++++++++------- .../Drinks/sodawater-bottle.rsi/fill-1.png | Bin 0 -> 202 bytes .../Drinks/sodawater-bottle.rsi/fill-2.png | Bin 0 -> 221 bytes .../Drinks/sodawater-bottle.rsi/fill-3.png | Bin 0 -> 225 bytes .../Drinks/sodawater-bottle.rsi/fill-4.png | Bin 0 -> 215 bytes .../Drinks/sodawater-bottle.rsi/fill-5.png | Bin 0 -> 241 bytes .../Drinks/sodawater-bottle.rsi/icon.png | Bin 0 -> 579 bytes .../sodawater-bottle.rsi/icon_empty.png | Bin 0 -> 585 bytes .../Drinks/sodawater-bottle.rsi/icon_open.png | Bin 0 -> 582 bytes .../Drinks/sodawater-bottle.rsi/meta.json | 35 ++ .../Drinks/tonic-bottle.rsi/fill-1.png | Bin 0 -> 147 bytes .../Drinks/tonic-bottle.rsi/fill-2.png | Bin 0 -> 176 bytes .../Drinks/tonic-bottle.rsi/fill-3.png | Bin 0 -> 180 bytes .../Drinks/tonic-bottle.rsi/fill-4.png | Bin 0 -> 176 bytes .../Drinks/tonic-bottle.rsi/fill-5.png | Bin 0 -> 244 bytes .../Drinks/tonic-bottle.rsi/icon.png | Bin 0 -> 628 bytes .../Drinks/tonic-bottle.rsi/icon_empty.png | Bin 0 -> 619 bytes .../Drinks/tonic-bottle.rsi/icon_open.png | Bin 0 -> 617 bytes .../Drinks/tonic-bottle.rsi/meta.json | 35 ++ .../{icon-1.png => fill-1.png} | Bin .../{icon-2.png => fill-2.png} | Bin .../{icon-3.png => fill-3.png} | Bin .../{icon-4.png => fill-4.png} | Bin .../{icon-5.png => fill-5.png} | Bin .../Drinks/waterbottle.rsi/icon.png | Bin 382 -> 422 bytes .../Drinks/waterbottle.rsi/icon_empty.png | Bin 0 -> 382 bytes .../Drinks/waterbottle.rsi/icon_open.png | Bin 382 -> 414 bytes .../Drinks/waterbottle.rsi/meta.json | 19 +- 28 files changed, 288 insertions(+), 136 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/fill-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/fill-2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/fill-3.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/fill-4.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/fill-5.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/icon_empty.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/icon_open.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/fill-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/fill-2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/fill-3.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/fill-4.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/fill-5.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/icon_empty.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/icon_open.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/meta.json rename Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/{icon-1.png => fill-1.png} (100%) rename Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/{icon-2.png => fill-2.png} (100%) rename Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/{icon-3.png => fill-3.png} (100%) rename Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/{icon-4.png => fill-4.png} (100%) rename Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/{icon-5.png => fill-5.png} (100%) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon_empty.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index 0a712faa09..00303bfb8b 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -44,6 +44,97 @@ solution: drink - type: Shakeable +- type: entity + parent: DrinkBase + id: DrinkBottlePlasticSmallBaseFull + abstract: true + suffix: Full + components: + - type: Item + size: Small + - type: Tag + tags: + - DrinkCup + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + - type: FitsInDispenser + solution: drink + - type: Openable + sound: + collection: bottleOpenSounds + closeable: true + closeSound: + collection: bottleCloseSounds + - type: Sprite + state: icon + sprite: Objects/Consumable/Drinks/waterbottle.rsi + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 5 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:SpillBehavior { } + - type: DnaSubstanceTrace + - type: PressurizedSolution + solution: drink + - type: TrashOnSolutionEmpty + solution: drink + - type: Shakeable + - type: PhysicalComposition + materialComposition: + Plastic: 100 + +- type: entity + parent: DrinkBottlePlasticSmallBaseFull + id: DrinkBottleGlassSmallBaseFull + abstract: true + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/beer.rsi + - type: DamageOnLand + damage: + types: + Blunt: 5 + - type: DamageOtherOnHit + damage: + types: + Blunt: 4 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 5 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpillBehavior { } + - !type:SpawnEntitiesBehavior + spawn: + BrokenBottle: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Tool + qualities: + - Rolling + speedModifier: 0.75 + - type: PhysicalComposition + materialComposition: + Glass: 100 + - type: entity parent: DrinkBottlePlasticBaseFull id: DrinkBottleGlassBaseFull @@ -125,6 +216,8 @@ maxFillLevels: 5 fillBaseName: fill- +# Large Glass Bottles + - type: entity parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkAbsintheBottleFull @@ -224,24 +317,6 @@ sprite: Objects/Consumable/Drinks/cognacbottle.rsi - type: Sealable -- type: entity - parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull] - id: DrinkColaBottleFull - name: Space Cola bottle - description: Cola. In spaaace! - components: - - type: SolutionContainerManager - solutions: - drink: - reagents: - - ReagentId: Cola - Quantity: 100 - - type: Label - currentLabel: reagent-name-cola - - type: Sprite - sprite: Objects/Consumable/Drinks/colabottle.rsi - - type: Sealable - - type: entity parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkGrenadineBottleFull @@ -399,44 +474,6 @@ sprite: Objects/Consumable/Drinks/rumbottle.rsi - type: Sealable -- type: entity - parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull] - id: DrinkSpaceMountainWindBottleFull - name: Space Solar Wind bottle - description: Blows right through you like a solar wind. - components: - - type: SolutionContainerManager - solutions: - drink: - reagents: - - ReagentId: SpaceMountainWind - Quantity: 100 - - type: Drink - - type: Label - currentLabel: reagent-name-space-mountain-wind - - type: Sprite - sprite: Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi - - type: Sealable - -- type: entity - parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull] - id: DrinkSpaceUpBottleFull - name: Space-Up bottle - description: Tastes like a hull breach in your mouth. - components: - - type: SolutionContainerManager - solutions: - drink: - reagents: - - ReagentId: SpaceUp - Quantity: 100 - - type: Drink - - type: Label - currentLabel: reagent-name-space-up - - type: Sprite - sprite: Objects/Consumable/Drinks/space-up_bottle.rsi - - type: Sealable - - type: entity parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkTequilaBottleFull @@ -531,23 +568,19 @@ - Wine - DrinkBottle -# Small Bottles - - type: entity parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] - id: DrinkBeerBottleFull - name: beer bottle # beer it is. coffee. beer? coff-ee? be-er? c-o... b-e - description: An alcoholic beverage made from malted grains, hops, yeast, and water. + id: DrinkBeerGrowler # Needs to be renamed DrinkBeerBottleFull + name: beer growler # beer it is. coffee. beer? coff-ee? be-er? c-o... b-e + description: An alcoholic beverage made from malted grains, hops, yeast, and water. XL growler bottle. components: - - type: Item - size: Small - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 150 reagents: - ReagentId: Beer - Quantity: 50 + Quantity: 150 - type: Label currentLabel: reagent-name-beer - type: Sprite @@ -561,106 +594,82 @@ - type: entity parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] - id: DrinkBeerGrowler # Needs to be renamed DrinkBeerBottleFull - name: beer growler # beer it is. coffee. beer? coff-ee? be-er? c-o... b-e - description: An alcoholic beverage made from malted grains, hops, yeast, and water. XL growler bottle. + id: DrinkAleBottleFullGrowler + name: Magm-Ale growler + description: A true dorf's drink of choice. XL growler bottle. components: - type: SolutionContainerManager solutions: drink: maxVol: 150 reagents: - - ReagentId: Beer + - ReagentId: Ale Quantity: 150 - type: Label - currentLabel: reagent-name-beer + currentLabel: reagent-name-ale - type: Sprite - sprite: Objects/Consumable/Drinks/beer.rsi + sprite: Objects/Consumable/Drinks/alebottle.rsi - type: Openable closeable: false - - type: Tag - tags: - - Beer - - DrinkBottle + +# Large Plastic Bottles - type: entity parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull] - id: DrinkAleBottleFull - name: Magm-Ale bottle - description: A true dorf's drink of choice. + id: DrinkColaBottleFull + name: Space Cola bottle + description: Cola. In spaaace! components: - - type: Item - size: Small - type: SolutionContainerManager solutions: drink: - maxVol: 50 reagents: - - ReagentId: Ale - Quantity: 50 + - ReagentId: Cola + Quantity: 100 - type: Label - currentLabel: reagent-name-ale + currentLabel: reagent-name-cola - type: Sprite - sprite: Objects/Consumable/Drinks/alebottle.rsi - - type: Openable - closeable: false + sprite: Objects/Consumable/Drinks/colabottle.rsi + - type: Sealable - type: entity parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull] - id: DrinkAleBottleFullGrowler - name: Magm-Ale growler - description: A true dorf's drink of choice. XL growler bottle. + id: DrinkSpaceMountainWindBottleFull + name: Space Solar Wind bottle + description: Blows right through you like a solar wind. components: - type: SolutionContainerManager solutions: drink: - maxVol: 150 reagents: - - ReagentId: Ale - Quantity: 150 + - ReagentId: SpaceMountainWind + Quantity: 100 - type: Label - currentLabel: reagent-name-ale + currentLabel: reagent-name-space-mountain-wind - type: Sprite - sprite: Objects/Consumable/Drinks/alebottle.rsi - - type: Openable - closeable: false + sprite: Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi + - type: Sealable - type: entity - parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull] - id: DrinkWaterBottleFull - name: water bottle - description: Simple clean water of unknown origin. You think that maybe you dont want to know it. + parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull] + id: DrinkSpaceUpBottleFull + name: Space-Up bottle + description: Tastes like a hull breach in your mouth. components: - - type: Item - size: Small - type: SolutionContainerManager solutions: drink: - maxVol: 30 reagents: - - ReagentId: Water - Quantity: 30 + - ReagentId: SpaceUp + Quantity: 100 - type: Label - currentLabel: reagent-name-water - - type: Drink + currentLabel: reagent-name-space-up - type: Sprite - sprite: Objects/Consumable/Drinks/waterbottle.rsi - layers: - - state: icon - map: ["enum.OpenableVisuals.Layer"] - - state: icon-1 - map: ["enum.SolutionContainerLayers.Fill"] - visible: false - - type: Appearance - - type: SolutionContainerVisuals - maxFillLevels: 5 - fillBaseName: icon- - inHandsMaxFillLevels: 2 - inHandsFillBaseName: -fill- + sprite: Objects/Consumable/Drinks/space-up_bottle.rsi - type: Sealable - type: entity - parent: DrinkWaterBottleFull + parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull] id: DrinkSodaWaterBottleFull name: soda water bottle description: Like water, but angry! @@ -668,15 +677,18 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 150 + maxVol: 100 reagents: - ReagentId: SodaWater - Quantity: 150 + Quantity: 100 + - type: Sprite + sprite: Objects/Consumable/Drinks/sodawater-bottle.rsi - type: Label currentLabel: reagent-name-soda-water + - type: Sealable - type: entity - parent: DrinkWaterBottleFull + parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull] id: DrinkTonicWaterBottleFull name: tonic water bottle description: Like soda water, but angrier maybe? Often sweeter. @@ -684,15 +696,82 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 150 + maxVol: 100 reagents: - ReagentId: TonicWater - Quantity: 150 + Quantity: 100 + - type: Sprite + sprite: Objects/Consumable/Drinks/tonic-bottle.rsi - type: Label currentLabel: reagent-name-tonic-water + - type: Sealable + +# Small Bottles - type: entity - parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull] + parent: [DrinkBottleVisualsAll, DrinkBottlePlasticSmallBaseFull] + id: DrinkWaterBottleFull + name: water bottle + description: Simple clean water of unknown origin. You think that maybe you dont want to know it. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Water + Quantity: 30 + - type: Sprite + sprite: Objects/Consumable/Drinks/waterbottle.rsi + - type: SolutionContainerVisuals + inHandsMaxFillLevels: 2 + inHandsFillBaseName: -fill- + - type: Label + currentLabel: reagent-name-water + - type: Sealable + +- type: entity + parent: [DrinkBottleVisualsAll, DrinkBottleGlassSmallBaseFull] + id: DrinkBeerBottleFull + name: beer bottle # beer it is. coffee. beer? coff-ee? be-er? c-o... b-e + description: An alcoholic beverage made from malted grains, hops, yeast, and water. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Beer + Quantity: 50 + - type: Label + currentLabel: reagent-name-beer + - type: Sprite + sprite: Objects/Consumable/Drinks/beer.rsi + - type: Openable + closeable: false + - type: Tag + tags: + - Beer + +- type: entity + parent: [DrinkBottleVisualsAll, DrinkBottleGlassSmallBaseFull] + id: DrinkAleBottleFull + name: Magm-Ale bottle + description: A true dorf's drink of choice. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Ale + Quantity: 50 + - type: Label + currentLabel: reagent-name-ale + - type: Sprite + sprite: Objects/Consumable/Drinks/alebottle.rsi + - type: Openable + closeable: false + +- type: entity + parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassSmallBaseFull] id: DrinkSakeBottleFull name: small sake bottle description: The regret of the next morning seems to be nipping on the bottle too. diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..995108596b514f065479ac9a33d0ec1922a95000 GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%C&rs6b?Si}mUKs7M+SzC z{oH>NSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10!o$NSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10BHGi% zF(l&f+shX@4;XN`1_tkPJzlWl%$K&Jo->K!8o4~Jf9^2<6nfHmj0dP%W0Hx{=Z~IJ zSL>d8b#(m5T@W_+-d+2{U+=BIIq&$psX__W4ck8P-hVZfndQuxyvK93l&WvZRs%IM Nc)I$ztaD0e0stAyO_cxu literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/fill-3.png new file mode 100644 index 0000000000000000000000000000000000000000..c62c6b1f7555d7d70398db0f538a26bf352bc52d GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%C&rs6b?Si}mUKs7M+SzC z{oH>NSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10BHq)* zF(l&f+sg+z8w_|_A1>d~nw+xY%#?*jZqGZ^^B1{HiTlT2r8VXHvrr}mhK#O`z|iU1 zN^alxy!Guk^XHAz>o?-62fi?Pe`lX@GuiQOZ8{6fkEJc?g73dsv$CkXWH`d7rKOr# RF9fuT!PC{xWt~$(69DK^N|^uv literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/fill-4.png new file mode 100644 index 0000000000000000000000000000000000000000..b63c0c0c560a09bfb6602c0524b620e45fe4af54 GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%C&rs6b?Si}mUKs7M+SzC z{oH>NSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10BGl8x zF(l&f+p7mTfi|=zX7?T|&`2-RIG)kJPF5+PN$-ET>663`C7`JX?>_G~-yO!eaMkfB zmyVgeKKuVwuVPU+@SWl9Rj#n`iTVl-FU9V>x*5%&v-6#J#Uoj(*FXyxJYD@<);T3K F0RSD%MPL8` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/fill-5.png new file mode 100644 index 0000000000000000000000000000000000000000..07a3f829f59ebb1e65b9cce3469fd9e452ef97f4 GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%C&rs6b?Si}mUKs7M+SzC z{oH>NSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10BHz=+ zF(l&f+i7<>8w_|_g0C0!@JyX)6msl@%*V(N?B_c=zT28D{qATPCFsP_u{%99HFW82 z^{R6YheJ!ZiU}sAeSXXo{jgkR*=nZhhv~*nw|3p%`24o%n>Hqqir9pbP=U2d>l>IZ iL>HL2|7(46UuS->@g@FkFLHraGkCiCxvXz@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUz!AV3xR9M69S3OI^Kp1}RBUQ0jD?uo(U8I|vi|F7a_yYt%_d*vp ze}xdJo8W)w(8-V0sUSEwsf$XWh8WxQa(50T!LKSF=3M$Nm)x7X_j#Xt-nf-RPtoBVE+IH+S9Go#*jbx}j2d71*z^G&?{XGl+1&u#jgkJx zyS;ox=-*V)^;@6jyM7D)P1Q~r%BTT9YJho5xQ!IBSi-{QS^i~se7*mEV!1pVuY%Ff z{56nb%--CH?=v=gS~S8$vxbE%Y3TQ-8tC`GAQ z%&r~I?TPTavo_HIHO>C*$B0N0V-}2>QSkhn=^!0NlGyn#_(^2H?FC~S+bh#-&qV+J Rqc;Em002ovPDHLkV1jh)`q2OY literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/icon_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..36a0e24c5eb890910bdf62f41a057c203fcc8640 GIT binary patch literal 585 zcmV-P0=E5$P)z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUz$4Nv%R9M69m%mHHKorNnT8E>Dv{I2u=@JUXE(dN779E@faTWyE zo4WXq2tr(4om?E8qONx7Bt0 z($-pM^1ovsp)*NJ=?Ec^%jMAT_mNJgk;MDhmSv&S>A>?m06;dI)q?od z7C5K#p%4N9BITTO008G4LI^mg^I@z(xLlrI>8Z-+?&N#8Z^oPjGqdZ!?E07Q@0+{v zW`TQCz=M18Vf?{8fqPRhQwMsg0#{X#*k8o0>H`ZY3IK#Y`P-}k{7Lo%5h z@qjUaAP7bj4ucp07$|%XV$=hF1)>F@lmZc<-EK$EMz&zk2?yzyN~I#pi3manNGYAz zJ-`@)Wm(a^(KP&SuXW;JO4s_~!-!HUIu{rT!bYQkR;x8)wNlE=f5A^d_S;@Cma)77 X57NvQH>Z>~00000NkvXXu0mjf8Jhd& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/icon_open.png new file mode 100644 index 0000000000000000000000000000000000000000..056896120ad92950b195a1196c1961ab1359bde7 GIT binary patch literal 582 zcmV-M0=fN(P)z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUz#7RU!R9M69m%mE`F%-wYwhpmD+ERx~>2ef`T>@?vEIK#|;_T#_ zsf+(bCqd|}gM*WcL#L~=T{=lY3fd|5iX0{NIoNZM9@d{2ytwo&cbB{5ee!L68A>TArBJKYjMkbr1z5N_h1)(sJQiT|6c}5;7~rw6*W9X9;QKz>?KW^# zH(Dq5-!Tw3^uH^FKrWZVcsxcbl|nwB-*2^A$B_d}lsk@t!C(O2_W=OeY}N?kS1xcH z%YhIA07B)Qa{vJ696|`VjpZQHAY893ZanMi=jP;xxbH=r1?i=2U}^iy_xHVnXtTh( zE#Ses_%Qz9UBJ67*r@~0x(ZKM5kFeRogM=#N#u4eqpt&J=ey0RfwlDO_1gdXo4@V_ zQcAa2EP^oxA_8L!06;|ObULWl>zk2R!cwUOB0?sU0TF?79)egY#lztcj4>nFUBQA8S?d{c*E6crAUhd0@ q-M?(_g(!zhKAYx7T>2BnxxA7=Iab>*LY?m&NV%u0pUXO@geCxnm@)tW literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/fill-2.png new file mode 100644 index 0000000000000000000000000000000000000000..aea5ea2c0921f7d6aa0bc66801b4b6f7ad6402c6 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}S)MMAArY-_ zFFW!cFyLrS+;qm3Re@paj)M$L0u6j=3!$rG@%V zU$t!J)^|4HPIqdb-nep6vadsA;_X_&g&iky8Lbr_d~Ud=pYZJAyZ-*3na6jl{Fu${ WZET7^FyLrS+;qm3Re@paj)M$L0u6oV9JaUQo#m^IzZA^;li#-!sDXj&Oizeu_4~t% zS7oLxo%`IUWB2(UUfKD%P6xyo1t%&MRqHE>2=3HLU}gCu7x0U7=FXkJA1fz6`=-ZP ZR?KLpZJ^U6c3Ku>kf*Dk%Q~loCICN8Jazy8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/fill-4.png new file mode 100644 index 0000000000000000000000000000000000000000..42fd7dc5d40d60bde105787e7c925e8bdf83f1ff GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}S)MMAArY-_ zuO8$)V8Fxd5V*^g?E}NSYtEGnyc2AHypWc?Ln2z= zPQA$Mq{!pC{+O=B0_G`P6L8bMe3#jE#u+}dIuP{nxoN4eju zCqbv)-if-M)Wgs)$GGFf*9eZpUC$zw6YkHMsi-6%XkZ+becMZSYs0-i6GH`8sWUW0 zz24CI{a){*wvU3EOScExP2T)`k*Au{^q{I=yo?Sm@5CpF literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e8ff0eafc36553500409458357ec8b92e0b06b6d GIT binary patch literal 628 zcmV-)0*n2LP)z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUz@<~KNR9M69mOo1zQ5400*_oZubxmB^anR^Y5ycM?*aY(xtWroS zzk&z~TLeOC3qvYNnn0|CG=Yd|Ql;5)K?1HxoQ=d}b^pzu$EH|ja3cslGB3^EYKF^u z=iK|wdH2CE{&U=tU3h=*ZtwTWIf2*X;-rK3LP+hEktJ|eZDM*8h|>(2NO~J|*@X|k zJU%FuN;K>Sl}d$ew$&1-ibwY{hZD5B1&%}!Bne3MZfSM5=305ib0)bF9oNdUw7OeU zBElHlo*d(%?bGf?N$%*h$^Oe_C$$dDZ%+4ID-V!>n}!B}X=u1sp83t`UaA_X&6MY6 zAJ`aXk>cn$-A)&;`HdexTQsU|@Dym^>&H6Q9gBs+BDOt+Yb)yjly^3+JZYr~ns zC|O-2j09P|?}9KAeE-!+*M@P-PTeMq1o@mn7zs>6ONb~DVaE^2>KbNN8|Z*C0)8k4 z0520!LLdhGn~2g5{3{}I1cE-`c`Hc%l^j7l31j=^M)aieFcMN@S*inBUBjLnOTLxb z@Vc{>(Sa^o{pH7qABf~#phSfAvlfk}KTx$F$hkmj7F?IV=`0w=F#Z4vG}AGEPUtWI O0000z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUz=}AOER9M69m(ObxK@`V7jfGCLXri$uC8mX?C6LSf0fiV3z4z>) z^tyjRDYTG-ApQmM81*9bCU_}GvqyXOyVg^V?oK-9WQyOU51(W zdGCGS{D8UrXIn6xxb-$a{&x1AADuDb*(IG9L!-44rT}043zj-*hP?!dpT^6uXgaad ze$ptH%LLhgR;xvg8dfuKQ+CT_lIMA+QcCjqJfqQwbUIC;P}plWn=fMrm^gP`mwvxb z5Cj0^aycW2nM$y6v^thj0z}Ro#{s}`9Hf+N9IcLH72)x)UU~Q^%e|%h+*!VjzSMLs zz7X~mfj_V#!p|SNtfW@hyjvujeZbnpL>Vo&j4c6J@-Rl!RzG)hF!OQ^ry9ey= z9sp3SA6^@abtBq7-)TI5^{fI=-Ftd%yjnkG`+TSIX@*T{!K4j~#UerowAKhA0MJ_F z`#!Z=?Q!fHD3wZRt;u9EXsvM^Cjzk|!Y~XGLXb=*r!rs-U@#a=IlKyD1z_UvcMz)? zxG4}L0HqXKYkIw2^lzmElap}LeyLO{id<`rloHSLPGir25CYeAqi?Hi_@`Q%=wQ(_ z`m2`_rBrk;up+{CyG^&-or+p1W#?V+H<8VH7R+sKzW|Q{&{^?&JWv1t002ovPDHLk FV1lH&4M+e0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/icon_open.png new file mode 100644 index 0000000000000000000000000000000000000000..6ff1cfd5defd27d913e192636fd14bb3d78103d7 GIT binary patch literal 617 zcmV-v0+#)WP)z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUz=Sf6CR9M69mqBY2K@`V-(Sp+~cB8Q-C8mX?C78?HbBOWKd(R$9 zulor~p@kd-k$iw$JVd<+J@+C=(@RgeE9!(~LN&K<{LI2_{p zJ^=ZA-Uwo@5^Nr=O|;ekk#ozk0I)0ztu>oRYm-<-c>J?fd-Np7{W}j>S-y*03SYl} zW;6`&dtovn{B-8AYOk_&uS72QkoENqBj^9r1s{&vY_P@2+xMKm>lk;z+yMK#2kh@2 z08nooUR#UxAlkmzX}^5)q6Sdkdwy-b-a2IaVyFFajzcMB(uSo{38fSwf>H_q5uw-X z(QG!K#;$>Kxr~UA&1Ml1EX#^O5)t8OG(sswI-Q=$Kw literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/meta.json new file mode 100644 index 0000000000..7ef37142c7 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "modified from space-up_bottle.rsi and inspired by tonic.rsi by Prole0 (GitHub)", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "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/waterbottle.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/fill-1.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-1.png rename to Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/fill-1.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/fill-2.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-2.png rename to Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/fill-2.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/fill-3.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-3.png rename to Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/fill-3.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-4.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/fill-4.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-4.png rename to Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/fill-4.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-5.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/fill-5.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-5.png rename to Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/fill-5.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon.png index cf51fc855297f081ece4e3dca93f07acb1ce7727..62ce8e736bf14370dab6be7ff8d6b1316081ec62 100644 GIT binary patch delta 390 zcmV;10eSxZ0;U6yDSrXk$t-^W000DMK}|sb0I`n?{9y$E001CkNK#Dz0D2|>0Dy!5 z0Qvv`0D$NK0Cg|`0P0`>06Lfe02gqax=}m;00AUPL_t(o!|j!^O2beThQ9<;(o#f= z4nkW9g0qj1$<09uK7;rGrO)7)LCh;e#35k8C+OrLP5}uRp?{l78`4k+#~~RkZi!r% z`%U*8IQRbdaQ|~bqtR%Z;JSkA%DI%Xu*Wz|M45oUWUEfmVzmZfFD(FA{>Ul8^E?4xZo>xwUxFYI7^!r_NS>Zw z1bm62NWhm;lz&1Ols7)9){nrQp-jL<@G855osHaQ^2N>hp`qjvZns+;bZp`(c7USY zQtN_wmSb1(ynzd9cOdWBzjDe3(PFj60qiWt&T<^p9WbqeWm?e1DhE+oU|NOR&*<_# k+VK7L*^z-pqtVph8`<1xt+2)l*#H0l07*qoM6N<$g4+?WqyPW_ delta 350 zcmV-k0iph;1O5V#DSrU2&K&6g00B5jL_t(oh3%9vOT$nQ$A1-vENTbSB2--Z0R$<< zE!~PshkOKaaC6hqF{2b5vWdIU;F8Tub`Z3PQyg5y-W|Mq zfBx_8fx%!fD2SqnD2l*w1jms@tYCE+A!nyvvCGvpRn7udO$6mP)jHDDA@t4IwKk9Y_kDC wGS0E8v+@L-*jts0;XuCU1}X^#gWPx$I7vi7R9J=Wlrc-gP!Pv|6^ATp2h$={T>1e7Da9?_ic5!l1aWY4)6p@b6dbaN zyU^g0%}jO>w1`t2T+*Sn7udO$6mP)jHDDA@t4IwKk9Y_kDCGS0E8v+@L-*jts0;XuCU1}X^# cgW0Dy!5 z0Qvv`0D$NK0Cg|`0P0`>06Lfe02gqax=}m;00A6HL_t(o!|jwYOT$1E$A1xrENTan zE)f?$fFK3^0wRJ$5C`YdrJtamBU^D17Y8X=Iy7~0(}18woPV;2kPPuU7R>e>j6-qD z!HICc>E468d+&eme_*j#EE@F2iS)*a=$x_iue+a!$V5b2g<6-t&t}pUk*;PDfBpo^ zbv8{i1+6W1@)CgTCud55!_PN1*9WXV-_Z^(S-Bq(cP>l{cOp+OuL6BZ(^Q}@Q54mh z0Y|3@*ss>Nz<0ngR=~meNOr^4LM|CT5_gUqBSW|ycWrB>*7EO@Hb3+H`yExf7)c2y#=- zT1|YwhkuDsJFqO)HBI9l1gF<30ZLqX zdU+KXNEAf^1Mxghy@(6*6+>5GFgvbjqp8|~{@aIKOs;-Z9QyvFp!nES0uF48BddWw ze;x|kB2dgyr&qwtQtGq&2z?6F4os}ZpPI%2RSd^*h6B{IlzNupP_hGNZAzRJ?6D0% woD`U~X?X(9tzF}CG?d@9p-MtUMa8P~36aom`^e$ii~s-t07*qoM6N<$g56xDD*ylh diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json index 763da96dcb..e09aa519fc 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json @@ -1,5 +1,6 @@ { - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", + "version": 1, + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, icon, icon_empty, & icon_open modified from waterbottle.rsi by Prole0 (GitHub)", "license": "CC-BY-SA-3.0", "size": { @@ -15,19 +16,22 @@ "name": "icon_open" }, { - "name": "icon-1" + "name": "icon_empty" }, { - "name": "icon-2" + "name": "fill-1" }, { - "name": "icon-3" + "name": "fill-2" }, { - "name": "icon-4" + "name": "fill-3" }, { - "name": "icon-5" + "name": "fill-4" + }, + { + "name": "fill-5" }, { "name": "inhand-left", @@ -53,6 +57,5 @@ "name": "inhand-right-fill-2", "directions": 4 } - ], - "version": 1 + ] } -- 2.51.2