From: Prole <172158352+Prole0@users.noreply.github.com> Date: Tue, 6 May 2025 18:13:33 +0000 (-0700) Subject: Water bottle dispenser fix & Bottle Yaml Organizing (#37108) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=6cdc436f5f8fd2a375ef23e06de448cf93d43dc9;p=space-station-14.git 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> --- 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 0000000000..995108596b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/fill-1.png differ 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 0000000000..78710f564c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/fill-2.png differ 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 0000000000..c62c6b1f75 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/fill-3.png differ 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 0000000000..b63c0c0c56 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/fill-4.png differ 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 0000000000..07a3f829f5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/fill-5.png differ 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 0000000000..a57d4b4aca Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/icon.png differ 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 0000000000..36a0e24c5e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/icon_empty.png differ 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 0000000000..056896120a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/icon_open.png differ 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 0000000000..6fbbd2f8bb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/fill-1.png differ 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 0000000000..aea5ea2c09 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/fill-2.png differ 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 0000000000..1f20702592 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/fill-3.png differ 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 0000000000..42fd7dc5d4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/fill-5.png new file mode 100644 index 0000000000..945ebf7b49 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/fill-5.png differ 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 0000000000..e8ff0eafc3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/icon.png differ 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 0000000000..6a4afaf315 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/icon_empty.png differ 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 0000000000..6ff1cfd5de Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/icon_open.png differ 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 cf51fc8552..62ce8e736b 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon_empty.png new file mode 100644 index 0000000000..cf51fc8552 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon_empty.png differ 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 e38ba30650..aedfedaa0b 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon_open.png and b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon_open.png differ 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 + ] }