From: Tiniest Shark Date: Sat, 20 Sep 2025 18:25:01 +0000 (-0400) Subject: Inhand Sprites for Clear Glass (#40427) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=4796c92609faadd38f27f4ad5611441bcd8de4e2;p=space-station-14.git Inhand Sprites for Clear Glass (#40427) --- diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml index 3b7569022b..d4fe5da5b6 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml @@ -31,6 +31,8 @@ metamorphicDefaultSprite: sprite: Objects/Consumable/Drinks/glass_clear.rsi state: icon + inHandsMaxFillLevels: 3 + inHandsFillBaseName: -fill- - type: Tag tags: - DrinkCup # Do these tags diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..aeb5a2ecd4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..567c9b733d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..2e2a6e052c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left.png new file mode 100644 index 0000000000..de53081bf3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..82e8451ebc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..24b51ea750 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..05538dd6a8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right.png new file mode 100644 index 0000000000..ef34c7260e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right.png differ 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 1573c7154e..16bcd31794 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-NC-SA-4.0", - "copyright": "Created by github user moonheart08.", + "copyright": "Created by github user moonheart08. Inhands by TiniestShark (Github)", "states": [ { "name": "icon" @@ -39,6 +39,38 @@ }, { "name": "fill9" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-left-fill-1", + "directions": 4 + }, + { + "name": "inhand-left-fill-2", + "directions": 4 + }, + { + "name": "inhand-left-fill-3", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-fill-1", + "directions": 4 + }, + { + "name": "inhand-right-fill-2", + "directions": 4 + }, + { + "name": "inhand-right-fill-3", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..e3f7580117 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..b7f41fa989 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..64e3e01a3d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left.png new file mode 100644 index 0000000000..6b7e2af913 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..a14469a250 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..61fd77f4eb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..41d64989d0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right.png new file mode 100644 index 0000000000..209d0d2e26 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json index ed109341de..f7db09b523 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi transparencies by IProduceWidgets", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi transparencies by IProduceWidgets. Inhands by TiniestShark (Github)", "states": [ { "name": "icon" @@ -39,6 +39,38 @@ }, { "name": "fill9" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-left-fill-1", + "directions": 4 + }, + { + "name": "inhand-left-fill-2", + "directions": 4 + }, + { + "name": "inhand-left-fill-3", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-fill-1", + "directions": 4 + }, + { + "name": "inhand-right-fill-2", + "directions": 4 + }, + { + "name": "inhand-right-fill-3", + "directions": 4 } ] -} \ No newline at end of file +}