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 | 355 +++++++++++------- .../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, 298 insertions(+), 146 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,34 +568,6 @@ - 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. - components: - - type: Item - size: Small - - type: SolutionContainerManager - solutions: - drink: - maxVol: 50 - 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 - - DrinkBottle - - type: entity parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkBeerGrowler # Needs to be renamed DrinkBeerBottleFull @@ -584,29 +593,7 @@ - DrinkBottle - type: entity - parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull] - id: DrinkAleBottleFull - name: Magm-Ale bottle - description: A true dorf's drink of choice. - components: - - type: Item - size: Small - - type: SolutionContainerManager - solutions: - drink: - maxVol: 50 - 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: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull] + parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkAleBottleFullGrowler name: Magm-Ale growler description: A true dorf's drink of choice. XL growler bottle. @@ -625,42 +612,64 @@ - type: Openable closeable: false +# Large Plastic Bottles + - 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: DrinkColaBottleFull + name: Space Cola bottle + description: Cola. In spaaace! components: - - type: Item - size: Small - type: SolutionContainerManager solutions: drink: - maxVol: 30 reagents: - - ReagentId: Water - Quantity: 30 + - ReagentId: Cola + Quantity: 100 - type: Label - currentLabel: reagent-name-water - - type: Drink + currentLabel: reagent-name-cola - 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/colabottle.rsi - type: Sealable - type: entity - parent: DrinkWaterBottleFull + 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: 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: Label + currentLabel: reagent-name-space-up + - type: Sprite + sprite: Objects/Consumable/Drinks/space-up_bottle.rsi + - type: Sealable + +- type: entity + 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!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jPK-BC>eMqZFtDUM z`Z_W&Z0zU$lgJ8End}kd%fL{j#=y|f!ocv0fq|jn1p`B=0RzLU1O^7H84L{K1#@-< z+AuIMczC)vhD02Gd+9bOg93-!!>(-^4(Y$zi+G-I;AK*N@wDc_WQBWC%pfC}JSWaP zK0##atj)JtcH7Hl{kfO5-}10#ep+|B>rpngjav6B_x-uXz`(%Z>FVdQ&MBb@0L!32 ACIA2c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/fill-2.png new file mode 100644 index 0000000000000000000000000000000000000000..78710f564c43a0c70b694e38af0aef147458fd22 GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jPK-BC>eMqZFtDUM z`Z_W&Z0zU$lgJ8End}kd%fL{j#=y|f!ocv0fq|jn1p`B=0RzLU1O^7H84L{K1#@-< z+AuIMM0>h8hD02Gd-)>g0Rs-#z~Ei3#|u`R`O;R@b0$$-BbTT3&mHEULQgu6@h~tj zXiPFO`ux#T>T2C{ua1r%xeLPP-n(mm`0Ks(H|HIHH&rO1x?$TV-uthnGP9gHllOS8 WmQwXC*=hy`1_n=8KbLh*2~7YQ%T1L4 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!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jPK-BC>eMqZFtDUM z`Z_W&Z0zU$lgJ8End}kd%fL{j#=y|f!ocv0fq|jn1p`B=0RzLU1O^7H84L{K1#@-< z+AuIM#Cy6phD02Gd-)(|g8@(L!{s|#lT%ilnX=Hx?RkfK{vwwtasT+Mw5D8t7RtoH zkkQo<7&={B$?f}|x4s=`{=9K|{YG5%z!wJZ@9Z;fCOh7(O=n^Gv9u*!@clPyRu+|) a3`h91v{WeMqZFtDUM z`Z_W&Z0zU$lgJ8End}kd%fL{j#=y|f!ocv0fq|jn1p`B=0RzLU1O^7H84L{K1#@-< z+AuIMgnGI-hD02Gd-WhEg91luVs`Jb0*&+{jpG^p>tvMzn)Lpcn?6bGP-0+EIC%GY zxB2cc&V{RvN4a#&?Dg6IuX+`W!h!D$Z?AHNg-_I1aCj+p=he+<2A!Sn#48@jTD@jq PU|{fc^>bP0l+XkK9nD2x 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!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jPK-BC>eMqZFtDUM z`Z_W&Z0zU$lgJ8End}kd%fL{j#=y|f!ocv0fq|jn1p`B=0RzLU1O^7H84L{K1#@-< z+AuIM-pWilp)5auH5t~pF qDzH{*eFM{l=mHb>f2~jM>&y=}zQn)nMJ@va1B0ilpUXO@geCyEzEe*C literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a57d4b4aca463813bdb7b0bbe972cd07e9d96cdf GIT binary patch literal 579 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jPK-BC>eMqZFtDUM z`Z_W&Z0zU$lgJ8End}kd%fL{j#=y|f!ocv0fq|jn1p`B=0RzLU1O^7H84L{K1#@-< z+AuIM9`tl^42d}WHr&?xu!BV1JLS-g5!#L#>tdJ8p56W8fyxhN7RT>S;^y_O0xM=e zsDE+cWdGHb3KkYCyS)~)N!l9a$g2VF5jC!-m z7{6q1y?WZd|KdX#Jw=Pm@RD^>HzH@Z_DIG5y77fk?tPJ1;?27Z zcX}uOJHC5wjq8j1As4?!&wsYNj{BeQRX@p7D;Vvw8Y;ba^oneVICSV)e_=Etsz`Je8n7F+893R9=`G{ElpwSp_GLTD@A0^1u7l6H@iTA zMPliLo>U%>rEeHLmeh!U&=t^TxYQuu7?Jv5eS-v}fG5*Rk*dNuccU$vwg@kK8eT9* zr+DR*z-Y6kvl^}|BhIXoJ@>Zr!|u&y7a2{@{(F18!$T-ptY=o>hd*;(D#*G{y75#0 jhiA(Ex2(z1x3w?loOk*EZ?QQ80|SGntDnm{r-UW|bnN=k 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 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jPK-BC>eMqZFtDUM z`Z_W&Z0zU$lgJ8End}kd%fL{j#=y|f!ocv0fq|jn1p`B=0RzLU1O^7H84L{K1#@-< z+AuIM9`|%{42d}WcKUwr!ww?H_eZraZr>6#(d(rU*HJz8JU%hmIV^=@EZ1l6`q9tf z6cal)MrO{Ub!9JATs1Ppvx7}qy4Pn&vu9@f?QFN4zEAa}YWe%m_x8$*C+Pgw5#A;I z_U+CMPul~oG|SsOesJh|RJND+gJ0{q-M=;+N$FT1omK51{b1#W(rsaShd85o|+IB{4k|D3qSaYxL&xR)zWJ%9J4dPn}TIjqK;Umtk$ zYx?{5vv+??Ypf1F&|Li~@y|iq#_C{$VD_q2OyQvuZp0s1`-+)c^NHEH$LpEhkIzn5 zX7)DDzpnlMb^gCy;vSlFlQwc3ljz{+F=Sv6To||h@V2*CZ)hj33}F&foP4sOeMqZFtDUM z`Z_W&Z0zU$lgJ8End}kd%fL{j#=y|f!ocv0fq|jn1p`B=0RzLU1O^7H84L{K1#@-< z+AuIM9`ST>42d}WcKUvAWoSNerHw4gWq#w)||C+u39cz%+_6VIOLpCL*WF7_wmlq{gE3UtuJu&=H&`K61C$-6pf{n#;O%a+$ z4?h&>F;o%i)Z~s}mgsd0=DOb$!8k*shCk^lQ$1@E%YvVF8JoTK n?H}p`yDb?Q7#KWV{an^LB{Ts5*LeAF literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/meta.json new file mode 100644 index 0000000000..1190465440 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/sodawater-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 sodawater.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/tonic-bottle.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..6fbbd2f8bb9bd87cbff700481594dcb607a2398a GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>VDR;H zaSVxQeS6^`=K%vA=ZgWmT-h$1k@8AT;VW-$xP9-F{ErMp6Oe8OlN)iNTWxQzo?Kb( yt@3hTPVD|=doM&eT=Lm8H{#NtFwW(b49cu7(8A5T-G@yGywpHm@)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!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>V94@x zaSVxQeS6uF_kaOMYvQIeuB-|STX!5}U=nEHOIr}_G(D|-ul~!GTYmEE3NkP-FgP^N zoVY42)OY%-Wiz+Fvk7;)Q~UJBm5Y*n9U>EN*9tD|IFZX}t?=M;!!`YcXAj@?_xH>^ dzFXzTY;JF31C`iohVMa!c)I$ztaD0e0stmcK~(?% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/fill-3.png new file mode 100644 index 0000000000000000000000000000000000000000..1f207025925d111016259f7279bce1df45b3603d GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>V94`y zaSVxQeS5``_kaOMYvQIeuB-|STX!5}U=nEPJLj;yCGRX>ZTzKR=AZn&oeT^N3|wb= zLQJdQA6~pFGi~YI=RO^~&-d`k&d+r^AjT*-QK_g}Ur9u8r%nPZ%OAObUz{^{?)?2& gIr-T)JV94@x zaSVxQeS7sF=K%vAW{1FCu52F|=3R5HWZ<1(`|IsuU5;7q4&Qq@lvE58($dnJR?VtU zdFQ7pBe-}~TAJOua&x65jcPfs3Rdxg#=TqU|8qr z;usRq`gZC?UMEE!*Y(GAB^EGGVVu!6H$jSR0kgq@+lTefT-FG>(l1`U&*Rn>^MESG z!#~RXW<3cy_4ZEG?W7)thB?L^C%#5-B<^|^shn_s&P+um0YL-fsO;Nbx?3CW{h1gl zxJsR&A?o#p&hPhnAGLiH)Lgnf*lzOX=Zieml%@w&{o-YGaCs+oiO0M9#q1dj!UZ~v y>*s9P{HWvjE=J)G+*jfhlnyIiu4+t-Vcay^`e@`u!^I2?3=E#GelF{r5}E)v?O|j9 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 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jPK-BC>eMqZFtDUM z`Z_W&Z0zU$lgJ8End}kd%fL{j#=y|f!ocv0fq|jn1p`B=0RzLU1O^7H84L{K1#@-< z+AuIMe)4p242d}WcACAnOrXfo`kOQ7UM%&ExmkGOg^%D-e!&|opGDUMd1&o#;^2yA zamwO$*7BU?u%^YNu_H5R>CGZXrgffkdXJ=({y#ha__Bz!0%Z<6BmJ}Yvf55pKfm+) zT;=zJ2LFohOp2|jf1mgM`$@~j>yIBTY5wly@pkG&)q=3xq$=T#%RDnZs-#P9w({?{ zvD299W%7n?s#k07wyQ!by4=4TwF__A&D!T8sKV*-H7~Pt`?ILZW5sGa1!b?F+Pq~~ zbgx-K~d|w%N8m-cegH_4|SL z?d&^rKD_%{ZMXNQPA&hP83%5ivdY$e%`m0hY~7Qfz3g*-UHkYs{QNV9Q~vYfPEId3 zD|i)syj^E`_Tia_G$Lb_dsrg(zHc%Rs`-D_^Lkt18Na(~JuE-xI7)E(ID2jwd*9SsA9ih?cCk?}`tQ@@9r7JdVi&lyeBCV8yUaddtNe+b4q0L` i)AzsBkvL}XkAchNvSGd73j+oQ1_n=8KbLh*2~7ax_7zqD literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/icon_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..6a4afaf31541be63926abb112298998922651cbd GIT binary patch literal 619 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jPK-BC>eMqZFtDUM z`Z_W&Z0zU$lgJ8End}kd%fL{j#=y|f!ocv0fq|jn1p`B=0RzLU1O^7H84L{K1#@-< z+AuIMzVvi)42d}WcKZ2jVMmeU_Pwosn==+|R8w8nx>R+-=|7CE68w9=zghTYSG}X= zmI=)Y|5!gtd{z3QR-x(f_-L@6rJjeMm++;I*JYO+eI99gCp(_JA*)}xJhpA-_saLR z_y08P{F@$aFn7mSGy8vK-{#8CHGFteb*{Mc;;ll<7~=nOPqWHw+so29|Jdmb8CDxF z)m_qVaim$FQrTyUvwWr$W+Om^=Sq4S^plFv5? zFkLTQoWDBv$MUGzFA^@A{8~L-aA`=1{syH(WxIX1-=5nQrJ4FX_JjGvvsGeea`W~x Z^fO(E{8()hz`(%3;OXk;vd$@?2>_(J4M+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 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jPK-BC>eMqZFtDUM z`Z_W&Z0zU$lgJ8End}kd%fL{j#=y|f!ocv0fq|jn1p`B=0RzLU1O^7H84L{K1#@-< z+AuIMKKFES42d}WcDiG>u%pQF`io7Mb;=fRR8w8nx>R+>={v<8A1_p&m-AZxo6~Dy zs|?G;nuZt~m%SXe-<3Qrd;9NvA~9i3NX(@M?>ldq4L?p#%vd7CT5)HC`ss&U_u1@}rq@({J)E&#HMk+_ zf8_3{wU3_H?7FMxJIn3&on4u{cg)uOUwLho)4~H4Hfobk2Iz==x0-wI^$o^l=VXs3 zTF5;5ZO8Dl<{n4VI-wl7wZ2=fF-$Bzy@_Fi4)1COjXi6OEMqlswy*wSH6SdKbO#6TW`sRet{e3afnI?VJrqPu~7MXa8%7 z@`HC6e(z>~^Inc2AYV2vy8Elbt$jB#_t$)0#1?SBx-NI`J*$-8Nz4Bh_Bm^&UTRw! z#JN;NsVRtyL2%*q*B5il<{w+vShTaJW5U@qK|!6L@hG+nLc&O7Ol#E>X) z&SDSOB#r}D9==!TOnXq@D8b0$*wA4h!Lz7RNp;4(mdoEZ=UR8gxLk;Oyz5=&8_58# zhZcS&ep`6|hhz)O>dbVj|7s}2;`l|+!=>eKo&5RFX^Z%p6lVT!+TWRTZ+Ai>_ixs< YGcRuGx%8Nifq{X+)78&qol`;+0A-#MiU0rr 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 zcmeyzw2XOzW*8o|0J?9Ffb@2dj$D1FjT2AFf_Cy;Z{=u;H{DT>eXS7|8C?*_KfAK`YkC9ViVf}0`=}Q3|#}y@Y@;YOt z|MvYZWAXjp_k#b$j*Bm5%zCh^>Gi4obM0rIOEH>jDwJ?VSEjx5OS>(@z58}MtYoj; zI=!a)$H%(q5*>~IHXOI`ahch$KV`Mw#iXrl3HrJW5&uqT9{g;>7@v2ToiV;iK|o?< z$zhLq^Ws@*Iv05ym>x8x-bs9lx!uZZ{RieQ^f}=AL2GyO+}=CspN^jWxp3hV!MyF! zG9@{Ww8|P5-3@x(R5>j<{NtWR?yPc!_c!(zonpI~wDlO{8=d3lie#?J8mw(fjk<7D zi#;$ZA*%J(`4^w;ZhiRs_2$Gzx5XE)JdnP5Cv)wFV_Y{G7#J8lUHx3vIVCg!0NW9; AqyPW_ delta 350 zcmZ3+{EumZW1SBD1M;_k{%zBd1zMNZ7-vU=}| zlBGfmj!ZrNT%0lfk%icYrT5>jmi~DCO!__158Y3_R{n4J{!8!q<EdlI4l)m z+|4_?cDLV#9de)Ad{?YkI*%z_dv1XCBgJ2u0oDdvU)vW+v4V6^ab zaSVxQeLKa_`*483@p{pAohfY`0Zm(e}EGWKw(QvVd%%;xW7amMH z>r*DMr6X7-=F-Bm8HzX0E!^1Q7pL0&o}K@m?4IiSfA8Nl9!xOM=vdUD(RHAZ<@iL` zH3_AXis{SaHlDs}8n%V~@R><|+kKbcRy(7k8R{@2vgl5h5Cfx*s?*y8@e5xy22OHX zeezz#zi%hg{Tfd-Hoxhedsh0|{C5^PF`LWky(>zV3N1J?_4spf#`s4TVjq^?f4^G# z(7*n`=H>kRD^Li@9f&$ej9ekeQNVvv0~{wChfTa z+K&`}X$DvuY<+ECB*h+*Y~dAD<)Aw^z+3%`#!bf6R?3pkb2c+N7@ga=YV#+SIX9xG oc0Y93_nb|OldbvT{?Cj%bV@btR~z^+FfcH9y85}Sb4q9e0D}3aBme*a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon_open.png index e38ba306507f624519762f569aa7fc88ffb828f1..aedfedaa0b76a058cd563bd1f02e7a5caf4b48a3 100644 GIT binary patch delta 382 zcmeyzG>>_LW*8o|0J?9Ffb@2dj$D1FjT2AFf_Ct80NCKmzr=a-hwUoc-ex=>J@T{FVUq_psI!vfbi^_w~-@O-oqJM&GZ$GPzI z!OnvHFYh()u6|$tzCK}NgpSmgW1U})b-tLh@yq(%^E*zsxJ0)`P2Yb$?ULxkb!me2 z|5#3!n)w>DuGKC3B-HRmJ>9GE@Og8y>+Ean?qB57i`*$MSgz;8Rj%Z(zn-bq^K!@n z{Xmhcvl!i%bKF>eZTo@p1BPJ-4*v8gJABPaPts1PyiZ2id53Jpn@ZodP#LDw2ZFOp z8dr1u(W<*p;F!y5x98dVn4D8>mwg18_Gx_xb?ISfx*+&&t;ucLK6V>be-`4 delta 350 zcmbQo{EumZWpKIiH|Sh5^?hv795(sz5(b5T>ofx_3+C+KyubMLwa>Qd-*{*9m$NLt zuEppTQ(09hD&ZmG%EbK9#(!@I_h(V(@B{i8UXJUwQoxy@<>3d;1ijk)o1>QN3ZKuKWAkSnV+`dvUf9NbW%HD(X^#Rn zF{kBv%@KLCk=J34$c(L-l}zW>#y&1GnR0*YLN6y**Q2XGb56XF|NF$lTRjX63=E#G KelF{r5}E+rT%{`j 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 + ] }