]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Standardize state names in drinks yml (#40316)
authorāda <ss.adasts@gmail.com>
Tue, 7 Oct 2025 16:05:30 +0000 (11:05 -0500)
committerGitHub <noreply@github.com>
Tue, 7 Oct 2025 16:05:30 +0000 (16:05 +0000)
commitceedfb6d39ebb8331473550fb2d4a8f0202da082
tree288b7d230b846a29da164ef9439429b2c63cad5d
parent70543885e75598c2aad64113cc824a33acf9efcb
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>
135 files changed:
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon-vend.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon.png
Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon_empty.png [deleted file]
Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-1.png [moved from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill1.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-2.png [moved from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill2.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-3.png [moved from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill3.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-4.png [moved from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill4.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-5.png [moved from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill5.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-6.png [moved from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill6.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-7.png [moved from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill7.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-8.png [moved from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill8.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-9.png [moved from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill9.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-1.png [moved from Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill1.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-2.png [moved from Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill2.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-3.png [moved from Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill3.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-4.png [moved from Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill4.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-5.png [moved from Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill5.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-1.png [moved from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill1.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-2.png [moved from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill2.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-3.png [moved from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill3.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-4.png [moved from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill4.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-5.png [moved from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill5.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-6.png [moved from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill6.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/icon_empty.png [moved from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/icon.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-0.png [deleted file]
Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-1.png [deleted file]
Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-2.png [deleted file]
Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-3.png [deleted file]
Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-4.png [deleted file]
Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/meta.json [deleted file]
Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-0.png [deleted file]
Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-1.png [deleted file]
Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-2.png [deleted file]
Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-3.png [deleted file]
Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-4.png [deleted file]
Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-vend.png [deleted file]
Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json [deleted file]
Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-1.png [moved from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill1.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-2.png [moved from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill2.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-3.png [moved from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill3.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-4.png [moved from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill4.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-5.png [moved from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill5.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-6.png [moved from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill6.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-7.png [moved from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill7.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-8.png [moved from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill8.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-9.png [moved from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill9.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-1.png [moved from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill1.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-2.png [moved from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill2.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-3.png [moved from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill3.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-4.png [moved from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill4.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-5.png [moved from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill5.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-6.png [moved from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill6.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/icon_empty.png [moved from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/icon.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/mug.rsi/fill-1.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-1.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug.rsi/fill-2.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-2.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug.rsi/fill-3.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-3.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-vend-brown.png [moved from Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-vend.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-0.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/fill-1.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-1.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/fill-2.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-2.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/fill-3.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-3.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-0.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/fill-1.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-1.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/fill-2.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-2.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/fill-3.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-3.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-0.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/fill-1.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-1.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/fill-2.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-2.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/fill-3.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-3.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-0.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/fill-1.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-1.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/fill-2.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-2.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/fill-3.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-3.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-0.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/fill-1.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-1.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/fill-2.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-2.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/fill-3.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-3.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-0.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/fill-1.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-1.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/fill-2.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-2.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/fill-3.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-3.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-0.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/fill-1.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-1.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/fill-2.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-2.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/fill-3.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-3.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-0.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/fill-1.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-1.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/fill-2.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-2.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/fill-3.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-3.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-0.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/fill-1.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-1.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/fill-2.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-2.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/fill-3.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-3.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-0.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/fill-1.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-1.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/fill-2.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-2.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/fill-3.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-3.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon.png [moved from Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-0.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill-1.png [moved from Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill1.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill-2.png [moved from Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill2.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-1.png [moved from Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-1.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-2.png [moved from Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-2.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-3.png [moved from Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-3.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-4.png [moved from Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-4.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon.png [moved from Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-0.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/fill-1.png [moved from Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/icon-1.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/icon.png [moved from Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/icon-0.png with 100% similarity]
Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/meta.json