From ceedfb6d39ebb8331473550fb2d4a8f0202da082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=81da?= <ss.adasts@gmail.com>
Date: Tue, 7 Oct 2025 11:05:30 -0500
Subject: [PATCH] Standardize state names in drinks yml (#40316)

* drinks_base

* drinks_special

* drinks_fun

* drinks_cans - the holy minus diff

* bottles_glass and metamorphic

* mugs

* Solar's Best Hot Drinks

* misc drinks_cups

* slight addition to base

* lint fix

* metamorphic glass

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
---
 .../Objects/Consumable/Drinks/drinks_base.yml |  16 +-
 .../Drinks/drinks_bottles_glass.yml           |   4 +-
 .../Objects/Consumable/Drinks/drinks_cans.yml | 156 +++---------------
 .../Objects/Consumable/Drinks/drinks_cups.yml |  75 +++------
 .../Objects/Consumable/Drinks/drinks_fun.yml  |  13 +-
 .../Consumable/Drinks/drinks_metamorphic.yml  |  22 +--
 .../Consumable/Drinks/drinks_special.yml      |  14 --
 .../Reagents/Consumable/Drink/drinks.yml      |   2 +-
 .../Drinks/cafe_latte.rsi/icon-vend.png       | Bin 0 -> 299 bytes
 .../Consumable/Drinks/cafe_latte.rsi/icon.png | Bin 299 -> 293 bytes
 .../Drinks/cafe_latte.rsi/icon_empty.png      | Bin 293 -> 0 bytes
 .../Drinks/cafe_latte.rsi/meta.json           |   6 +-
 .../glass_clear.rsi/{fill1.png => fill-1.png} | Bin
 .../glass_clear.rsi/{fill2.png => fill-2.png} | Bin
 .../glass_clear.rsi/{fill3.png => fill-3.png} | Bin
 .../glass_clear.rsi/{fill4.png => fill-4.png} | Bin
 .../glass_clear.rsi/{fill5.png => fill-5.png} | Bin
 .../glass_clear.rsi/{fill6.png => fill-6.png} | Bin
 .../glass_clear.rsi/{fill7.png => fill-7.png} | Bin
 .../glass_clear.rsi/{fill8.png => fill-8.png} | Bin
 .../glass_clear.rsi/{fill9.png => fill-9.png} | Bin
 .../Drinks/glass_clear.rsi/meta.json          |  18 +-
 .../{fill1.png => fill-1.png}                 | Bin
 .../{fill2.png => fill-2.png}                 | Bin
 .../{fill3.png => fill-3.png}                 | Bin
 .../{fill4.png => fill-4.png}                 | Bin
 .../{fill5.png => fill-5.png}                 | Bin
 .../Drinks/glass_coupe_shape.rsi/meta.json    |  10 +-
 .../glue-tube.rsi/{fill1.png => fill-1.png}   | Bin
 .../glue-tube.rsi/{fill2.png => fill-2.png}   | Bin
 .../glue-tube.rsi/{fill3.png => fill-3.png}   | Bin
 .../glue-tube.rsi/{fill4.png => fill-4.png}   | Bin
 .../glue-tube.rsi/{fill5.png => fill-5.png}   | Bin
 .../glue-tube.rsi/{fill6.png => fill-6.png}   | Bin
 .../{icon.png => icon_empty.png}              | Bin
 .../Consumable/Drinks/glue-tube.rsi/meta.json |  14 +-
 .../Consumable/Drinks/hot_coco.rsi/icon-0.png | Bin 318 -> 0 bytes
 .../Consumable/Drinks/hot_coco.rsi/icon-1.png | Bin 149 -> 0 bytes
 .../Consumable/Drinks/hot_coco.rsi/icon-2.png | Bin 158 -> 0 bytes
 .../Consumable/Drinks/hot_coco.rsi/icon-3.png | Bin 160 -> 0 bytes
 .../Consumable/Drinks/hot_coco.rsi/icon-4.png | Bin 164 -> 0 bytes
 .../Consumable/Drinks/hot_coco.rsi/meta.json  |  28 ----
 .../Drinks/hot_coffee.rsi/icon-0.png          | Bin 318 -> 0 bytes
 .../Drinks/hot_coffee.rsi/icon-1.png          | Bin 149 -> 0 bytes
 .../Drinks/hot_coffee.rsi/icon-2.png          | Bin 158 -> 0 bytes
 .../Drinks/hot_coffee.rsi/icon-3.png          | Bin 160 -> 0 bytes
 .../Drinks/hot_coffee.rsi/icon-4.png          | Bin 164 -> 0 bytes
 .../Drinks/hot_coffee.rsi/icon-vend.png       | Bin 295 -> 0 bytes
 .../Drinks/hot_coffee.rsi/meta.json           |  28 ----
 .../Drinks/jar.rsi/{fill1.png => fill-1.png}  | Bin
 .../Drinks/jar.rsi/{fill2.png => fill-2.png}  | Bin
 .../Drinks/jar.rsi/{fill3.png => fill-3.png}  | Bin
 .../Drinks/jar.rsi/{fill4.png => fill-4.png}  | Bin
 .../Drinks/jar.rsi/{fill5.png => fill-5.png}  | Bin
 .../Drinks/jar.rsi/{fill6.png => fill-6.png}  | Bin
 .../Drinks/jar.rsi/{fill7.png => fill-7.png}  | Bin
 .../Drinks/jar.rsi/{fill8.png => fill-8.png}  | Bin
 .../Drinks/jar.rsi/{fill9.png => fill-9.png}  | Bin
 .../Consumable/Drinks/jar.rsi/meta.json       |  18 +-
 .../lube-tube.rsi/{fill1.png => fill-1.png}   | Bin
 .../lube-tube.rsi/{fill2.png => fill-2.png}   | Bin
 .../lube-tube.rsi/{fill3.png => fill-3.png}   | Bin
 .../lube-tube.rsi/{fill4.png => fill-4.png}   | Bin
 .../lube-tube.rsi/{fill5.png => fill-5.png}   | Bin
 .../lube-tube.rsi/{fill6.png => fill-6.png}   | Bin
 .../{icon.png => icon_empty.png}              | Bin
 .../Consumable/Drinks/lube-tube.rsi/meta.json |  14 +-
 .../Drinks/mug.rsi/{icon-1.png => fill-1.png} | Bin
 .../Drinks/mug.rsi/{icon-2.png => fill-2.png} | Bin
 .../Drinks/mug.rsi/{icon-3.png => fill-3.png} | Bin
 .../icon-vend-brown.png}                      | Bin
 .../Drinks/mug.rsi/{icon-0.png => icon.png}   | Bin
 .../Consumable/Drinks/mug.rsi/meta.json       |  11 +-
 .../mug_black.rsi/{icon-1.png => fill-1.png}  | Bin
 .../mug_black.rsi/{icon-2.png => fill-2.png}  | Bin
 .../mug_black.rsi/{icon-3.png => fill-3.png}  | Bin
 .../mug_black.rsi/{icon-0.png => icon.png}    | Bin
 .../Consumable/Drinks/mug_black.rsi/meta.json |   8 +-
 .../mug_blue.rsi/{icon-1.png => fill-1.png}   | Bin
 .../mug_blue.rsi/{icon-2.png => fill-2.png}   | Bin
 .../mug_blue.rsi/{icon-3.png => fill-3.png}   | Bin
 .../mug_blue.rsi/{icon-0.png => icon.png}     | Bin
 .../Consumable/Drinks/mug_blue.rsi/meta.json  |   8 +-
 .../mug_dog.rsi/{icon-1.png => fill-1.png}    | Bin
 .../mug_dog.rsi/{icon-2.png => fill-2.png}    | Bin
 .../mug_dog.rsi/{icon-3.png => fill-3.png}    | Bin
 .../mug_dog.rsi/{icon-0.png => icon.png}      | Bin
 .../Consumable/Drinks/mug_dog.rsi/meta.json   |   8 +-
 .../mug_green.rsi/{icon-1.png => fill-1.png}  | Bin
 .../mug_green.rsi/{icon-2.png => fill-2.png}  | Bin
 .../mug_green.rsi/{icon-3.png => fill-3.png}  | Bin
 .../mug_green.rsi/{icon-0.png => icon.png}    | Bin
 .../Consumable/Drinks/mug_green.rsi/meta.json |   8 +-
 .../mug_heart.rsi/{icon-1.png => fill-1.png}  | Bin
 .../mug_heart.rsi/{icon-2.png => fill-2.png}  | Bin
 .../mug_heart.rsi/{icon-3.png => fill-3.png}  | Bin
 .../mug_heart.rsi/{icon-0.png => icon.png}    | Bin
 .../Consumable/Drinks/mug_heart.rsi/meta.json |   8 +-
 .../mug_metal.rsi/{icon-1.png => fill-1.png}  | Bin
 .../mug_metal.rsi/{icon-2.png => fill-2.png}  | Bin
 .../mug_metal.rsi/{icon-3.png => fill-3.png}  | Bin
 .../mug_metal.rsi/{icon-0.png => icon.png}    | Bin
 .../Consumable/Drinks/mug_metal.rsi/meta.json |   8 +-
 .../{icon-1.png => fill-1.png}                | Bin
 .../{icon-2.png => fill-2.png}                | Bin
 .../{icon-3.png => fill-3.png}                | Bin
 .../mug_moebius.rsi/{icon-0.png => icon.png}  | Bin
 .../Drinks/mug_moebius.rsi/meta.json          |   8 +-
 .../mug_one.rsi/{icon-1.png => fill-1.png}    | Bin
 .../mug_one.rsi/{icon-2.png => fill-2.png}    | Bin
 .../mug_one.rsi/{icon-3.png => fill-3.png}    | Bin
 .../mug_one.rsi/{icon-0.png => icon.png}      | Bin
 .../Consumable/Drinks/mug_one.rsi/meta.json   |   8 +-
 .../{icon-1.png => fill-1.png}                | Bin
 .../{icon-2.png => fill-2.png}                | Bin
 .../{icon-3.png => fill-3.png}                | Bin
 .../mug_rainbow.rsi/{icon-0.png => icon.png}  | Bin
 .../Drinks/mug_rainbow.rsi/meta.json          |   8 +-
 .../mug_red.rsi/{icon-1.png => fill-1.png}    | Bin
 .../mug_red.rsi/{icon-2.png => fill-2.png}    | Bin
 .../mug_red.rsi/{icon-3.png => fill-3.png}    | Bin
 .../mug_red.rsi/{icon-0.png => icon.png}      | Bin
 .../Consumable/Drinks/mug_red.rsi/meta.json   |   8 +-
 .../shotglass.rsi/{fill1.png => fill-1.png}   | Bin
 .../shotglass.rsi/{fill2.png => fill-2.png}   | Bin
 .../Consumable/Drinks/shotglass.rsi/meta.json |   4 +-
 .../teacup.rsi/{icon-1.png => fill-1.png}     | Bin
 .../teacup.rsi/{icon-2.png => fill-2.png}     | Bin
 .../teacup.rsi/{icon-3.png => fill-3.png}     | Bin
 .../teacup.rsi/{icon-4.png => fill-4.png}     | Bin
 .../teacup.rsi/{icon-0.png => icon.png}       | Bin
 .../Consumable/Drinks/teacup.rsi/meta.json    |  10 +-
 .../water_cup.rsi/{icon-1.png => fill-1.png}  | Bin
 .../water_cup.rsi/{icon-0.png => icon.png}    | Bin
 .../Consumable/Drinks/water_cup.rsi/meta.json |   4 +-
 135 files changed, 155 insertions(+), 392 deletions(-)
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon-vend.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon_empty.png
 rename Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/{fill1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/{fill2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/{fill3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/{fill4.png => fill-4.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/{fill5.png => fill-5.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/{fill6.png => fill-6.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/{fill7.png => fill-7.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/{fill8.png => fill-8.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/{fill9.png => fill-9.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/{fill1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/{fill2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/{fill3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/{fill4.png => fill-4.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/{fill5.png => fill-5.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/{fill1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/{fill2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/{fill3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/{fill4.png => fill-4.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/{fill5.png => fill-5.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/{fill6.png => fill-6.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/{icon.png => icon_empty.png} (100%)
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-0.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-1.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-2.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-3.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-4.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-0.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-1.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-2.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-3.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-4.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-vend.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json
 rename Resources/Textures/Objects/Consumable/Drinks/jar.rsi/{fill1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/jar.rsi/{fill2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/jar.rsi/{fill3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/jar.rsi/{fill4.png => fill-4.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/jar.rsi/{fill5.png => fill-5.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/jar.rsi/{fill6.png => fill-6.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/jar.rsi/{fill7.png => fill-7.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/jar.rsi/{fill8.png => fill-8.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/jar.rsi/{fill9.png => fill-9.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/{fill1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/{fill2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/{fill3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/{fill4.png => fill-4.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/{fill5.png => fill-5.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/{fill6.png => fill-6.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/{icon.png => icon_empty.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug.rsi/{icon-2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug.rsi/{icon-3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/{hot_coco.rsi/icon-vend.png => mug.rsi/icon-vend-brown.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug.rsi/{icon-0.png => icon.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/{icon-2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/{icon-3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/{icon-0.png => icon.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/{icon-2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/{icon-3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/{icon-0.png => icon.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/{icon-2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/{icon-3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/{icon-0.png => icon.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/{icon-2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/{icon-3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/{icon-0.png => icon.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/{icon-2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/{icon-3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/{icon-0.png => icon.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/{icon-2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/{icon-3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/{icon-0.png => icon.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/{icon-2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/{icon-3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/{icon-0.png => icon.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/{icon-2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/{icon-3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/{icon-0.png => icon.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/{icon-2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/{icon-3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/{icon-0.png => icon.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/{icon-2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/{icon-3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/{icon-0.png => icon.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/{fill1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/{fill2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/{icon-2.png => fill-2.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/{icon-3.png => fill-3.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/{icon-4.png => fill-4.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/{icon-0.png => icon.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/{icon-1.png => fill-1.png} (100%)
 rename Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/{icon-0.png => icon.png} (100%)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml
index c4e8b020e7..14e4b741c5 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml
@@ -91,7 +91,7 @@
 #      map: ["enum.OpenableVisuals.Layer"]
 
 ## Bases for visuals
-# TODO standardize state names for fill levels and openable visuals
+# New drinks should mirror these state names to reduce clutter when creating new prototypes
 
 # Basic visualizer for an openable entity. Requires DrinkBaseOpenable
 - type: entity
@@ -103,13 +103,14 @@
     visuals:
       enum.OpenableVisuals.Opened:
         enum.OpenableVisuals.Layer:
-          True: {state: "icon_open"}
-          False: {state: "icon"}
+          True: {state: "icon_open"} # lid off
+          False: {state: "icon"} # lid on
   - type: Sprite
     layers:
     - state: icon
       map: ["enum.OpenableVisuals.Layer"]
   - type: ExaminableSolution
+    solution: *sol
     examinableWhileClosed: false # If you can't see the fill levels on the sprite, we can assume it's opaque
     heldOnly: true # If it's opaque, you probably can't see through the open lid from a distance
 
@@ -121,11 +122,12 @@
   - type: Appearance
   - type: Sprite
     layers:
-    - state: icon_empty
+    - state: icon
     - state: fill-1
       map: ["enum.SolutionContainerLayers.Fill"]
       visible: false
   - type: SolutionContainerVisuals
+    solutionName: *sol
     maxFillLevels: 5
     fillBaseName: fill-
     inHandsMaxFillLevels: 3
@@ -139,7 +141,7 @@
   components:
   - type: Sprite
     layers:
-    - state: icon_empty
+    - state: icon
       map: [ "enum.SolutionContainerLayers.Base" ]
     - state: fill-1
       map: [ "enum.SolutionContainerLayers.Fill" ]
@@ -169,8 +171,8 @@
     visuals:
       enum.OpenableVisuals.Opened:
         enum.OpenableVisuals.Layer:
-          True: {state: "icon_open"}
-          False: {state: "icon_empty"}
+          True: {state: "icon_open"} # lid off
+          False: {state: "icon_empty"} # lid on
   - type: Sprite
     layers:
     - state: icon_empty
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml
index ec6bdf8002..3aa1e1d547 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml
@@ -106,7 +106,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/alco-bottle.rsi
     layers:
-      - state: icon_blue # todo add "icon_empty" state
+      - state: icon_empty
         map: ["enum.OpenableVisuals.Layer"]
       - state: fill-6
         map: ["enum.SolutionContainerLayers.Fill"]
@@ -260,7 +260,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/alco-bottle.rsi
     layers:
-      - state: icon_green # todo icon_empty
+      - state: icon_empty
         map: ["enum.OpenableVisuals.Layer"]
       - state: fill-6
         map: ["enum.SolutionContainerLayers.Fill"]
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
index 3102ffc522..bb3eb76c29 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -9,7 +9,7 @@
     solutions:
       drink:
         maxVol: 30
-      grindable:
+      grindable: &grindable
         reagents: # 5u -> 1/2 steel sheet (10u)
         - ReagentId: Aluminium # Fun fact: soda can makeup is approx. 75% aluminium and 25% tin/iron.
           Quantity: 4
@@ -51,12 +51,7 @@
         reagents:
         - ReagentId: Cola
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Tag
     tags:
     - Cola
@@ -76,12 +71,7 @@
     solutions:
       drink:
         maxVol: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Tag
     tags:
     - Cola
@@ -101,12 +91,7 @@
         reagents:
         - ReagentId: IcedTea
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/ice_tea_can.rsi
   - type: Item
@@ -125,12 +110,7 @@
         reagents:
         - ReagentId: LemonLime
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/lemon-lime.rsi
   - type: Item
@@ -149,12 +129,7 @@
         reagents:
         - ReagentId: LemonLimeCranberry
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/lemon-lime-cranberry.rsi
   - type: Item
@@ -206,12 +181,7 @@
         reagents:
         - ReagentId: GrapeSoda
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/purple_can.rsi
   - type: Item
@@ -230,12 +200,7 @@
         reagents:
         - ReagentId: RootBeer
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/rootbeer.rsi
   - type: Item
@@ -258,12 +223,7 @@
         reagents:
         - ReagentId: SodaWater
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/sodawater.rsi
   - type: Item
@@ -282,12 +242,7 @@
         reagents:
         - ReagentId: SpaceMountainWind
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/space_mountain_wind.rsi
   - type: Item
@@ -306,12 +261,7 @@
         reagents:
         - ReagentId: SpaceUp
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/space-up.rsi
   - type: Item
@@ -330,12 +280,7 @@
         reagents:
         - ReagentId: SolDry
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/sol_dry.rsi
   - type: Item
@@ -354,12 +299,7 @@
         reagents:
         - ReagentId: Starkist
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/starkist.rsi
   - type: Item
@@ -378,12 +318,7 @@
         reagents:
         - ReagentId: TonicWater
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/tonic.rsi
   - type: Item
@@ -402,12 +337,7 @@
         reagents:
         - ReagentId: FourteenLoko
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/fourteen_loko.rsi
   - type: Item
@@ -426,12 +356,7 @@
         reagents:
         - ReagentId: ChangelingSting
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/changelingsting.rsi
   - type: Item
@@ -450,12 +375,7 @@
         reagents:
         - ReagentId: DrGibb
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/dr_gibb.rsi
   - type: Item
@@ -478,12 +398,7 @@
           Quantity: 20
         - ReagentId: Ice
           Quantity: 5
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/robustnukie.rsi
   - type: Item
@@ -502,12 +417,7 @@
         reagents:
         - ReagentId: EnergyDrink
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/energy_drink.rsi
   - type: Item
@@ -526,12 +436,7 @@
         reagents:
         - ReagentId: ShamblersJuice
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/shamblersjuice.rsi
   - type: Item
@@ -550,12 +455,7 @@
         reagents:
         - ReagentId: PwrGame
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/pwrgame.rsi
   - type: Item
@@ -574,12 +474,7 @@
         reagents:
         - ReagentId: Beer
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/beer_can.rsi
   - type: Item
@@ -602,12 +497,7 @@
         reagents:
         - ReagentId: Wine
           Quantity: 30
-      grindable:
-        reagents:
-        - ReagentId: Aluminium
-          Quantity: 4
-        - ReagentId: Iron
-          Quantity: 1
+      grindable: *grindable
   - type: Sprite
     sprite: Objects/Consumable/Drinks/wine_can.rsi
   - type: Item
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index e1fe78c433..7b1320ba49 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -22,22 +22,16 @@
 # A mug is a type of cup.[2]
 - type: entity
   abstract: true
-  parent: [ DrinkBaseMaterialPorcelain, DrinkBaseCup ] # todo Should use DrinkVisualsFill, but inheritors have no in-hand and state names are wrong
+  parent: [ DrinkBaseMaterialPorcelain, DrinkBaseCup, DrinkVisualsFill ]
   id: DrinkBaseMug
   name: mug
   description: A mug.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mug.rsi
-    layers:
-      - state: icon-0
-      - state: icon-3
-        map: ["enum.SolutionContainerLayers.Fill"]
-        visible: false
-  - type: Appearance
   - type: SolutionContainerVisuals
     maxFillLevels: 3
-    fillBaseName: icon-
+    inHandsFillBaseName: null
 
 ## Misc Cups
 
@@ -53,18 +47,13 @@
     price: 125
 
 - type: entity
-  parent: DrinkBaseMug
+  parent: DrinkBaseMug # a teacup is basically a mug
   id: DrinkTeacupEmpty
   name: teacup
   description: A plain white porcelain teacup.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/teacup.rsi
-    layers:
-    - state: icon-0
-    - state: icon-4
-      map: ["enum.SolutionContainerLayers.Fill"]
-      visible: false
   - type: SolutionContainerVisuals
     maxFillLevels: 4
 
@@ -76,20 +65,11 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/glass_coupe_shape.rsi
-    layers:
-    - state: icon # todo add "icon_empty" state to match DrinkVisualsFillOverlay
-      map: [ "enum.SolutionContainerLayers.Base" ]
-    - state: fill1
-      map: [ "enum.SolutionContainerLayers.Fill" ]
-      visible: false
-    - state: icon-front
-      map: [ "enum.SolutionContainerLayers.Overlay" ]
   - type: SolutionContainerVisuals
-    fillBaseName: fill # todo rename to "fill-" to match DrinkVisualsFillOverlay
     inHandsMaxFillLevels: 1
 
 - type: entity
-  parent: [DrinkBaseMaterialCardboard, DrinkBaseCup] # TODO should use DrinkVisualsFill but state names are wrong and no inhand
+  parent: [DrinkBaseMaterialCardboard, DrinkBaseCup, DrinkBaseEmptyTrash, DrinkVisualsFill]
   id: DrinkWaterCup
   name: water cup
   description: A paper water cup.
@@ -102,22 +82,14 @@
     size: Tiny
   - type: Sprite
     sprite: Objects/Consumable/Drinks/water_cup.rsi
-    layers:
-    - state: icon-0
-    - state: icon-1
-      map: ["enum.SolutionContainerLayers.Fill"]
-      visible: false
   - type: SolutionContainerVisuals
     maxFillLevels: 1
-    fillBaseName: icon-
+    inHandsFillBaseName: null
   - type: Tag
     tags:
     - Trash
     - DrinkCup
     - WhitelistChameleon
-  - type: Appearance
-  - type: TrashOnSolutionEmpty
-    solution: drink
   - type: Clothing
     slots:
     - HEAD
@@ -240,16 +212,13 @@
         - ReagentId: HotCocoa
           Quantity: 20
   - type: Icon
-    sprite: Objects/Consumable/Drinks/hot_coco.rsi
-    state: icon-vend
+    sprite: Objects/Consumable/Drinks/mug.rsi
+    state: icon-vend-brown
   - type: Sprite
-    sprite: Objects/Consumable/Drinks/hot_coco.rsi
     layers:
-      - state: icon-0
-      - map: ["enum.SolutionContainerLayers.Fill"]
-        state: icon-4
-  - type: SolutionContainerVisuals
-    maxFillLevels: 4
+    - state: icon
+    - state: fill-3
+      map: ["enum.SolutionContainerLayers.Fill"]
   - type: TrashOnSolutionEmpty
     solution: drink
 
@@ -267,16 +236,13 @@
         - ReagentId: Coffee
           Quantity: 20
   - type: Icon
-    sprite: Objects/Consumable/Drinks/hot_coffee.rsi
-    state: icon-vend
+    sprite: Objects/Consumable/Drinks/mug.rsi
+    state: icon-vend-brown
   - type: Sprite
-    sprite: Objects/Consumable/Drinks/hot_coffee.rsi
     layers:
-      - state: icon-0
-      - map: ["enum.SolutionContainerLayers.Fill"]
-        state: icon-4
-  - type: SolutionContainerVisuals
-    maxFillLevels: 4
+    - state: icon
+    - state: fill-3
+      map: ["enum.SolutionContainerLayers.Fill"]
   - type: TrashOnSolutionEmpty
     solution: drink
 
@@ -293,16 +259,17 @@
         reagents:
         - ReagentId: CafeLatte
           Quantity: 20
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/cafe_latte.rsi
+    state: icon-vend
   - type: Sprite
     sprite: Objects/Consumable/Drinks/cafe_latte.rsi
     layers:
-      - state: icon_empty
-      - state: fill-1
-        map: ["enum.SolutionContainerLayers.Fill"]
-  - type: Appearance
+    - state: icon
+    - state: fill-1
+      map: ["enum.SolutionContainerLayers.Fill"]
   - type: SolutionContainerVisuals
     maxFillLevels: 1
-    fillBaseName: fill-
     changeColor: false
   - type: TrashOnSolutionEmpty
     solution: drink
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
index 1197356553..f7c984171d 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
@@ -8,9 +8,9 @@
       collection: packetOpenSounds
   - type: Sprite
     layers:
-    - state: icon
+    - state: icon_empty
       map: ["enum.OpenableVisuals.Layer"]
-    - state: fill6
+    - state: fill-6
       map: [ "enum.SolutionContainerLayers.Fill" ] # already has liquid, so no visible: false
     - state: icon-front
       map: [ "enum.SolutionContainerLayers.Overlay" ]
@@ -20,13 +20,6 @@
         maxVol: 30
   - type: SolutionContainerVisuals
     maxFillLevels: 6
-    fillBaseName: fill # TODO rename to "fill-"
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "icon_open"}
-          False: {state: "icon"}
   - type: TrashOnSolutionEmpty
     solution: drink
 
@@ -97,8 +90,6 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/jar_what.rsi
-  - type: ExaminableSolution
-    solution: drink
   - type: FitsInDispenser
     solution: drink
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
index d4fe5da5b6..10a2b76657 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
@@ -4,35 +4,23 @@
 
 # Transformable container - normal glass
 - type: entity
-  parent: [DrinkBaseMaterialGlass, DrinkBaseCup] # todo parent to DrinkVisualsFillOverlay after in-hands are added
+  parent: [DrinkBaseMaterialGlass, DrinkBaseCup, DrinkVisualsFillOverlay]
   id: DrinkGlass
   name: metamorphic glass
   description: A metamorphic glass that automagically turns into a glass appropriate for the drink within. There's a sanded off patent number on the bottom.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/glass_clear.rsi
-    layers:
-      - state: icon # TODO add "icon_empty" state to match "DrinkVisualsFillOverlay"
-        map: [ "enum.SolutionContainerLayers.Base" ]
-      - state: fill1
-        map: [ "enum.SolutionContainerLayers.Fill" ]
-        visible: false
-      - state: icon-front
-        map: [ "enum.SolutionContainerLayers.Overlay" ]
-  - type: Appearance
   - type: SolutionContainerManager
     solutions:
       drink:
         maxVol: 30
   - type: SolutionContainerVisuals
     maxFillLevels: 9
-    fillBaseName: fill # todo rename to "fill-", add in-hands, then add parent "DrinkVisualsFillOverlay"
     metamorphic: true
     metamorphicDefaultSprite:
       sprite: Objects/Consumable/Drinks/glass_clear.rsi
       state: icon
-    inHandsMaxFillLevels: 3
-    inHandsFillBaseName: -fill-
   - type: Tag
     tags:
     - DrinkCup # Do these tags
@@ -47,14 +35,6 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/jar.rsi
-    layers:
-    - state: icon
-      map: [ "enum.SolutionContainerLayers.Base" ]
-    - state: fill1
-      map: [ "enum.SolutionContainerLayers.Fill" ]
-      visible: false
-    - state: icon-front
-      map: [ "enum.SolutionContainerLayers.Overlay" ]
   - type: SolutionContainerManager
     solutions:
       drink:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
index adc99f46ad..b9929b6704 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
@@ -12,17 +12,8 @@
     size: Tiny
   - type: Sprite
     sprite: Objects/Consumable/Drinks/shotglass.rsi
-    layers:
-    - state: icon # TODO add "icon_empty" state to match "DrinkVisualsFillOverlay"
-      map: [ "enum.SolutionContainerLayers.Base" ]
-    - state: fill1
-      map: [ "enum.SolutionContainerLayers.Fill" ]
-      visible: false
-    - state: icon-front
-      map: [ "enum.SolutionContainerLayers.Overlay" ]
   - type: SolutionContainerVisuals
     maxFillLevels: 2
-    fillBaseName: fill # TODO rename to "fill-" to match "DrinkVisualsFillOverlay"
     inHandsMaxFillLevels: 1
   - type: FitsInDispenser
     solution: drink
@@ -184,11 +175,6 @@
         maxVol: 60
   - type: Sprite
     sprite: Objects/Consumable/Drinks/pitcher.rsi
-    layers:
-    - state: icon # TODO add "icon_empty" state to match "DrinkVisualsFill"
-    - state: fill-1
-      map: ["enum.SolutionContainerLayers.Fill"]
-      visible: false
   - type: SolutionContainerVisuals
     maxFillLevels: 6
     inHandsMaxFillLevels: 2
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
index 68448bc0c9..f49e9f9671 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -96,7 +96,7 @@
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/cafe_latte.rsi
-    state: icon_empty
+    state: icon
   metamorphicMaxFillLevels: 1
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon-vend.png b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon-vend.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5d52da5d391119b79ff0649f89e2c94d16ab9d1
GIT binary patch
literal 299
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJPo6H0Ar*6yZ3-SR9Clz@#<;ci
z3gcoviP8frnB8O#0D)82qte&c{vKDC7ZEw)Va)C`-|la{=6^4?y}#Hap6Z)w8I<_f
z|FkzYo~+_NL4?Wt?Q|oZS8on$rRVLR(wKNzEvQHNE@S@veW?cK=EpVN`4nz4J~<J1
zmhsS`Lp(s764}CSAaq%2mR+rt&DZGY=;YAiFE0WuW>0DHD6wQP77^omF(afqv0;fu
zLV|+*I?XZ$9jSkRejZlP(>n)p--l06z1L)|c*hWNL1<HhUf_WP4KItm7y@@PNIu|V
qEvoUK#=L@;ZI6{4$V+T@7#Z@-{CBK<RFMGmJ%gvKpUXO@geCy*;&%Z6

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon.png
index c5d52da5d391119b79ff0649f89e2c94d16ab9d1..a5564b59761db2dce9b631c3c1705a178c9b86fb 100644
GIT binary patch
delta 266
zcmV+l0rmc?0;K|wB!2;OQb$4nuFf3k0002rNkl<ZScUD9y$ysg3`Rdrw?PVzLP5g}
zG|Z5RJVP1^CZJ&fwxGxcNVzKLg!pj+#YyKUMMCl?{Nfl;6h%?~ok9{Ch5-Q3bzL~i
zHBD0hKwZ~jfwwfs%z=n7P1A0jh``LjS}VF#vH$>-WqDfb`+q*=cj*G&`$GxueRA_G
zft=c70>&5^W3n0@AzGNWZP)Fus%kegj^q06oD(nNOB#&Z9jCB8-<cGWo&d;y>)Qg%
z8~|Wh77!5tV4mmQ%;N%av{wyc&N=t2z?SXJ?~o*5tu2nGkh6e_qWlCOAFW8k1qX^K
Q00000NkvXXt^-0~f;DP%p8x;=

delta 272
zcmV+r0q_2$0;>X$B!BWrL_t(|oMSw2-~huw0;U1AebfP?4j6U7r~^hFz`(%3LW<&b
z>(>3pCm$3P#7Hv-OrJjee<}Y;2EF<RSmiG@Dll|UfB8Q%Gm|7okQ4$p?Uynv>g>ZR
zXKufgfnn1oQj8<r0dL>FWiU54$0<h+AlU)r$WhG!!otD~!hgcTWLbm@FcQ-unm&Cx
zJoQ^!TVqvo^ypDIo0Nn|bU6Ss6c!5Tm{f~lfTSp3U?4xPDRuxX8vgwG!yqm$&cMLH
z!0__rORQ?B?f_WO60(3UQNX}}>2pc|QMmva;0gtDd{34Gs0{|ZIv#bvr~?Mv0RV3{
WPq?k(cwhhk00{s|MNUMnLSTY&dvuBb

diff --git a/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon_empty.png
deleted file mode 100644
index a5564b59761db2dce9b631c3c1705a178c9b86fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 293
zcmV+=0owkFP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#-$_J4R9J=WlD!RtFbqaNPPah{k3vDi3^dG;i9ACZ3MQao0k)vX21vOo=!E!j
z0>w$^Cq+W?C;Z|VP!vT`{+&V+8ioM?&~;rn%Qa0?06<;WVu80b$jpI=Fiq2Loru89
z!CEW2RI&g7lx2BZ>-#?Ccj*G&`$GxueRA_Gft=c70>&5^W3n0@AzGNWZP)Fus%keg
zj^q06oD(nNOB#&Z9jCB8-<cGWo&d;y>)Qg%8~|Wh77!5tV4mmQ%;N%av{wyc&N=t2
rz?SXJ?~o*5tu2nGkh6e_qWlCOAFW8k1qX^K00000NkvXXu0mjfrEYf|

diff --git a/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/meta.json
index c3942590a6..737fc565b1 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/meta.json
@@ -12,9 +12,6 @@
         {
             "name": "icon"
         },
-        {
-            "name": "icon_empty"
-        },
         {
             "name": "fill-1"
         },
@@ -25,6 +22,9 @@
         {
             "name": "inhand-left",
             "directions": 4
+        },
+		{
+            "name": "icon-vend"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill1.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill1.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill2.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill2.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill3.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill3.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill4.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-4.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill4.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-4.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill5.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-5.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill5.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-5.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill6.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-6.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill6.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-6.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill7.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-7.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill7.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-7.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill8.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-8.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill8.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-8.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill9.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-9.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill9.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-9.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/meta.json
index 16bcd31794..4f1b5d9173 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/meta.json
@@ -14,31 +14,31 @@
             "name": "icon-front"
         },
         {
-            "name": "fill1"
+            "name": "fill-1"
         },
         {
-            "name": "fill2"
+            "name": "fill-2"
         },
         {
-            "name": "fill3"
+            "name": "fill-3"
         },
         {
-            "name": "fill4"
+            "name": "fill-4"
         },
         {
-            "name": "fill5"
+            "name": "fill-5"
         },
         {
-            "name": "fill6"
+            "name": "fill-6"
         },
         {
-            "name": "fill7"
+            "name": "fill-7"
         },
         {
-            "name": "fill8"
+            "name": "fill-8"
         },
         {
-            "name": "fill9"
+            "name": "fill-9"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill1.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill1.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill2.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill2.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill3.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill3.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill4.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-4.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill4.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-4.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill5.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-5.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill5.png
rename to Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-5.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json
index 6b42e9b9f7..ddffe3572d 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json
@@ -14,19 +14,19 @@
             "name": "icon-front"
         },
         {
-            "name": "fill1"
+            "name": "fill-1"
         },
         {
-            "name": "fill2"
+            "name": "fill-2"
         },
         {
-            "name": "fill3"
+            "name": "fill-3"
         },
         {
-            "name": "fill4"
+            "name": "fill-4"
         },
         {
-            "name": "fill5"
+            "name": "fill-5"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill1.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill1.png
rename to Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill2.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill2.png
rename to Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill3.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill3.png
rename to Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill4.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-4.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill4.png
rename to Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-4.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill5.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-5.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill5.png
rename to Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-5.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill6.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-6.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill6.png
rename to Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-6.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/icon_empty.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/icon.png
rename to Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/icon_empty.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/meta.json
index afc42a380e..a60196b83b 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/meta.json
@@ -8,7 +8,7 @@
     "copyright": "Created by discord: brainfood#7460 / github: brainfood1183. Inhands by Tiniest Shark (Github)",
     "states": [
         {
-            "name": "icon"
+            "name": "icon_empty"
         },
         {
             "name": "icon_open"
@@ -17,22 +17,22 @@
             "name": "icon-front"
         },
         {
-            "name": "fill1"
+            "name": "fill-1"
         },
         {
-            "name": "fill2"
+            "name": "fill-2"
         },
         {
-            "name": "fill3"
+            "name": "fill-3"
         },
         {
-            "name": "fill4"
+            "name": "fill-4"
         },
         {
-            "name": "fill5"
+            "name": "fill-5"
         },
         {
-            "name": "fill6"
+            "name": "fill-6"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-0.png
deleted file mode 100644
index d2a5ef967aa5a6572b56ac10e7db2ca8e7afe73c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 318
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;AKx2$B+p3WC_;A2_ijBg8UK-O*|jGTe<Cj
zfSQEH?9hp+d>j+j2&U{@&|twVJ)djF|JRpg+rG=kO?u0rrr|5X5P9zGAJH63>Fqi!
z%r_MbzXT|XO?bi}@L*yYb2JaLf|&;oi$kBnRYeu+2TvC-4iIBHaKzyv!=d+iXH{<r
zs#r6K{O@1C-r=BvVG*MzC%Yx%p+yg`UqAk#MME#0SM2e`4eGaICOI?6Ger7yJymcB
zWuL(8QN*Cp*w`c`8xX`dVJWBW>WSGuHK6WyWRQ?x$ZYd||7+v1>p<@@c)I$ztaD0e
F0s!wKYpehO

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-1.png
deleted file mode 100644
index c97ead8da8530a03451da7a9f4928c5ca14f244b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!pq8hLV@QPi+hZGf85DR}Hm3YvsOYqxLG@7H
pJ1&NO*I!OG-Q?b{!*C#bm08Ds7N(o54!S^H44$rjF6*2UngDw2Dlq^6

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-2.png
deleted file mode 100644
index 18ff175dadad15aa8176531790f36105fe7fa7c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!ps}ZmV@QPi+p~&%3<^BV2j2egZ|h`r6j1Pd
z=QDd28$(U{ly#>wcTb(`|Lw3&EF(jmup#5Oh1|dXJ+rd|YG?3t^>bP0l+XkK7|t%k

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-3.png
deleted file mode 100644
index a60b6edb6dbf9af1e7887fdadd418099f0f307d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!psA;eV@QPi+jELS3<^BV8$SMbKYWBo<3NLl
zPj*>0!-4FzMbZAD>bjw}MWtK%cGU7Qd}!=o6wBdYE=qbV4K#qk)78&qol`;+092VR
AYXATM

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-4.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-4.png
deleted file mode 100644
index 52a03df50852262789b681a9fc36bd6d54defc2b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 164
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!prxmaV@QPi+Y5?(3<ey|7mNNo=ch0lUza@c
z&-jXo01Ly9xGP)MgnaA>xtJ#Y{^{GV9Uu9D+IS|L&FJJ|*=?K=3FI+&y85}Sb4q9e
E0B=w+d;kCd

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/meta.json
deleted file mode 100644
index b22da85aa9..0000000000
--- a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/meta.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"version": 1,
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"license": "CC-BY-SA-3.0",
-	"copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
-	"states": [{
-            "name": "icon-0"
-        },
-        {
-            "name": "icon-1"
-        },
-		{
-            "name": "icon-2"
-        },
-		{
-            "name": "icon-3"
-        },
-		{
-            "name": "icon-4"
-        },
-		{
-            "name": "icon-vend"
-        }
-	]
-}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-0.png
deleted file mode 100644
index d2a5ef967aa5a6572b56ac10e7db2ca8e7afe73c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 318
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;AKx2$B+p3WC_;A2_ijBg8UK-O*|jGTe<Cj
zfSQEH?9hp+d>j+j2&U{@&|twVJ)djF|JRpg+rG=kO?u0rrr|5X5P9zGAJH63>Fqi!
z%r_MbzXT|XO?bi}@L*yYb2JaLf|&;oi$kBnRYeu+2TvC-4iIBHaKzyv!=d+iXH{<r
zs#r6K{O@1C-r=BvVG*MzC%Yx%p+yg`UqAk#MME#0SM2e`4eGaICOI?6Ger7yJymcB
zWuL(8QN*Cp*w`c`8xX`dVJWBW>WSGuHK6WyWRQ?x$ZYd||7+v1>p<@@c)I$ztaD0e
F0s!wKYpehO

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-1.png
deleted file mode 100644
index c97ead8da8530a03451da7a9f4928c5ca14f244b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!pq8hLV@QPi+hZGf85DR}Hm3YvsOYqxLG@7H
pJ1&NO*I!OG-Q?b{!*C#bm08Ds7N(o54!S^H44$rjF6*2UngDw2Dlq^6

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-2.png
deleted file mode 100644
index 18ff175dadad15aa8176531790f36105fe7fa7c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!ps}ZmV@QPi+p~&%3<^BV2j2egZ|h`r6j1Pd
z=QDd28$(U{ly#>wcTb(`|Lw3&EF(jmup#5Oh1|dXJ+rd|YG?3t^>bP0l+XkK7|t%k

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-3.png
deleted file mode 100644
index a60b6edb6dbf9af1e7887fdadd418099f0f307d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!psA;eV@QPi+jELS3<^BV8$SMbKYWBo<3NLl
zPj*>0!-4FzMbZAD>bjw}MWtK%cGU7Qd}!=o6wBdYE=qbV4K#qk)78&qol`;+092VR
AYXATM

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-4.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-4.png
deleted file mode 100644
index 52a03df50852262789b681a9fc36bd6d54defc2b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 164
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!prxmaV@QPi+Y5?(3<ey|7mNNo=ch0lUza@c
z&-jXo01Ly9xGP)MgnaA>xtJ#Y{^{GV9Uu9D+IS|L&FJJ|*=?K=3FI+&y85}Sb4q9e
E0B=w+d;kCd

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-vend.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-vend.png
deleted file mode 100644
index 765112be764715026b84a09ea1947aa20a14b84f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 295
zcmV+?0oeYDP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#;Ymb6R9J=WlsyW<KoCa1sHBNVQpHA_c!o3<-b!%=3&Duq!Nb_*2$EDbrZFLy
zCLn7S(fok3h!)PPc4v2I9?UWT!!XRhqp3U!eNR5`9akvjQ4$D!Pg<r8y*B~?<Y|C7
ziIgQsk3!#*MmxiDx_*hTb_--TLrH=xu$_zAv)RUbtSKTbia@zgIp(-Rb6lZaj(b_T
z)If(SV3~GB!ZK~dNkmPhCIA5Ta17lT008prgggxZ0N3+D0zkJvdAkKl0!>f~7m)wJ
try&VAuF&dw{k1tz@X1NYFbu=|oI4v3LA<DpZo2>g002ovPDHLkV1gcBbJ+j@

diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json
deleted file mode 100644
index b22da85aa9..0000000000
--- a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"version": 1,
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"license": "CC-BY-SA-3.0",
-	"copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
-	"states": [{
-            "name": "icon-0"
-        },
-        {
-            "name": "icon-1"
-        },
-		{
-            "name": "icon-2"
-        },
-		{
-            "name": "icon-3"
-        },
-		{
-            "name": "icon-4"
-        },
-		{
-            "name": "icon-vend"
-        }
-	]
-}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill1.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill1.png
rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill2.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill2.png
rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill3.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill3.png
rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill4.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-4.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill4.png
rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-4.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill5.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-5.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill5.png
rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-5.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill6.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-6.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill6.png
rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-6.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill7.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-7.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill7.png
rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-7.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill8.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-8.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill8.png
rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-8.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill9.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-9.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill9.png
rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-9.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json
index f7db09b523..59e2295761 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json
@@ -14,31 +14,31 @@
             "name": "icon-front"
         },
         {
-            "name": "fill1"
+            "name": "fill-1"
         },
         {
-            "name": "fill2"
+            "name": "fill-2"
         },
         {
-            "name": "fill3"
+            "name": "fill-3"
         },
         {
-            "name": "fill4"
+            "name": "fill-4"
         },
         {
-            "name": "fill5"
+            "name": "fill-5"
         },
         {
-            "name": "fill6"
+            "name": "fill-6"
         },
         {
-            "name": "fill7"
+            "name": "fill-7"
         },
         {
-            "name": "fill8"
+            "name": "fill-8"
         },
         {
-            "name": "fill9"
+            "name": "fill-9"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill1.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill1.png
rename to Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill2.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill2.png
rename to Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill3.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill3.png
rename to Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill4.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-4.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill4.png
rename to Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-4.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill5.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-5.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill5.png
rename to Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-5.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill6.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-6.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill6.png
rename to Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-6.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/icon_empty.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/icon.png
rename to Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/icon_empty.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/meta.json
index afc42a380e..a60196b83b 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/meta.json
@@ -8,7 +8,7 @@
     "copyright": "Created by discord: brainfood#7460 / github: brainfood1183. Inhands by Tiniest Shark (Github)",
     "states": [
         {
-            "name": "icon"
+            "name": "icon_empty"
         },
         {
             "name": "icon_open"
@@ -17,22 +17,22 @@
             "name": "icon-front"
         },
         {
-            "name": "fill1"
+            "name": "fill-1"
         },
         {
-            "name": "fill2"
+            "name": "fill-2"
         },
         {
-            "name": "fill3"
+            "name": "fill-3"
         },
         {
-            "name": "fill4"
+            "name": "fill-4"
         },
         {
-            "name": "fill5"
+            "name": "fill-5"
         },
         {
-            "name": "fill6"
+            "name": "fill-6"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-2.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-3.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-vend.png b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-vend-brown.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-vend.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-vend-brown.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/meta.json
index 052ebf11aa..3e7bc06ad1 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/meta.json
@@ -8,16 +8,16 @@
     "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
         {
-            "name": "icon-2"
+            "name": "fill-2"
         },
         {
-            "name": "icon-3"
+            "name": "fill-3"
         },
         {
             "name": "inhand-left",
@@ -26,6 +26,9 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+		{
+            "name": "icon-vend-brown"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-2.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-3.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/meta.json
index 052ebf11aa..a64a38d5eb 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/meta.json
@@ -8,16 +8,16 @@
     "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
         {
-            "name": "icon-2"
+            "name": "fill-2"
         },
         {
-            "name": "icon-3"
+            "name": "fill-3"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-2.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-3.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/meta.json
index 052ebf11aa..a64a38d5eb 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/meta.json
@@ -8,16 +8,16 @@
     "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
         {
-            "name": "icon-2"
+            "name": "fill-2"
         },
         {
-            "name": "icon-3"
+            "name": "fill-3"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-2.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-3.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/meta.json
index d7e6f34541..8b87125a21 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/meta.json
@@ -8,16 +8,16 @@
     "copyright": "https://github.com/unitystation/unitystation/blob/221bbcc50edf4e63dc71ac6fd5152664a6b6745a/UnityProject/Assets/Textures/items/drinks/mug_gromit.png | Created By https://github.com/ksivte, inhands and modification by TiniestShark (github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
         {
-            "name": "icon-2"
+            "name": "fill-2"
         },
         {
-            "name": "icon-3"
+            "name": "fill-3"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-2.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-3.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/meta.json
index 052ebf11aa..a64a38d5eb 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/meta.json
@@ -8,16 +8,16 @@
     "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
         {
-            "name": "icon-2"
+            "name": "fill-2"
         },
         {
-            "name": "icon-3"
+            "name": "fill-3"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-2.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-3.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/meta.json
index 052ebf11aa..a64a38d5eb 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/meta.json
@@ -8,16 +8,16 @@
     "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
         {
-            "name": "icon-2"
+            "name": "fill-2"
         },
         {
-            "name": "icon-3"
+            "name": "fill-3"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-2.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-3.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/meta.json
index 052ebf11aa..a64a38d5eb 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/meta.json
@@ -8,16 +8,16 @@
     "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
         {
-            "name": "icon-2"
+            "name": "fill-2"
         },
         {
-            "name": "icon-3"
+            "name": "fill-3"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-2.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-3.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/meta.json
index 052ebf11aa..a64a38d5eb 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/meta.json
@@ -8,16 +8,16 @@
     "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
         {
-            "name": "icon-2"
+            "name": "fill-2"
         },
         {
-            "name": "icon-3"
+            "name": "fill-3"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-2.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-3.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/meta.json
index 052ebf11aa..a64a38d5eb 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/meta.json
@@ -8,16 +8,16 @@
     "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
         {
-            "name": "icon-2"
+            "name": "fill-2"
         },
         {
-            "name": "icon-3"
+            "name": "fill-3"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-2.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-3.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/meta.json
index 052ebf11aa..a64a38d5eb 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/meta.json
@@ -8,16 +8,16 @@
     "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
         {
-            "name": "icon-2"
+            "name": "fill-2"
         },
         {
-            "name": "icon-3"
+            "name": "fill-3"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-2.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-3.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/meta.json
index 052ebf11aa..a64a38d5eb 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/meta.json
@@ -8,16 +8,16 @@
     "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
         {
-            "name": "icon-2"
+            "name": "fill-2"
         },
         {
-            "name": "icon-3"
+            "name": "fill-3"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill1.png b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill1.png
rename to Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill2.png b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill2.png
rename to Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/meta.json
index cf438684de..c7d6205b6f 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/meta.json
@@ -14,10 +14,10 @@
             "name": "icon-front"
         },
         {
-            "name": "fill1"
+            "name": "fill-1"
         },
         {
-            "name": "fill2"
+            "name": "fill-2"
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-2.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-2.png
rename to Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-2.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-3.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-3.png
rename to Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-3.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-4.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-4.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-4.png
rename to Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-4.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json
index 8f340a2eab..060a643bef 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json
@@ -8,19 +8,19 @@
     "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
 		{
-            "name": "icon-2"
+            "name": "fill-2"
         },
 		{
-            "name": "icon-3"
+            "name": "fill-3"
         },
 		{
-            "name": "icon-4"
+            "name": "fill-4"
         },
 		{
             "name": "icon-vend-tea"
diff --git a/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/fill-1.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/icon-1.png
rename to Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/fill-1.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/icon-0.png
rename to Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/meta.json
index 6301d09d7d..61406ac3b6 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/meta.json
@@ -8,10 +8,10 @@
     "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)",
     "states": [
         {
-            "name": "icon-0"
+            "name": "icon"
         },
         {
-            "name": "icon-1"
+            "name": "fill-1"
         },
         {
             "name": "inhand-right",