From 687ceee4ed42b5e9ccfaa6f33f2cffe6a467bd90 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Mon, 16 Oct 2023 05:09:06 +0100 Subject: [PATCH] Rolling pin can be worn in belt slot (#21019) * sprite swap * rolling pin can be put in belt * test pls --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Prototypes/Entities/Objects/Tools/tools.yml | 5 +++++ .../Clothing/Belt/belt_overlay.rsi/meta.json | 4 ---- .../Tools/rolling_pin.rsi/equipped-BELT.png} | Bin .../Objects/Tools/rolling_pin.rsi/meta.json | 6 +++++- 4 files changed, 10 insertions(+), 5 deletions(-) rename Resources/Textures/{Clothing/Belt/belt_overlay.rsi/rolling_pin-equipped-BELT.png => Objects/Tools/rolling_pin.rsi/equipped-BELT.png} (100%) diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index c8cca769c7..9b13373535 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -512,6 +512,11 @@ - type: Item sprite: Objects/Tools/rolling_pin.rsi size: 10 + - type: Clothing + sprite: Objects/Tools/rolling_pin.rsi + quickEquip: false + slots: + - Belt - type: ItemCooldown - type: MeleeWeapon damage: diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json index f46241eab5..b8464e4243 100644 --- a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json +++ b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json @@ -142,10 +142,6 @@ "name": "plasmatank-equipped-BELT", "directions": 4 }, - { - "name": "rolling_pin-equipped-BELT", - "directions": 4 - }, { "name": "rpd-equipped-BELT", "directions": 4 diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/rolling_pin-equipped-BELT.png b/Resources/Textures/Objects/Tools/rolling_pin.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_overlay.rsi/rolling_pin-equipped-BELT.png rename to Resources/Textures/Objects/Tools/rolling_pin.rsi/equipped-BELT.png diff --git a/Resources/Textures/Objects/Tools/rolling_pin.rsi/meta.json b/Resources/Textures/Objects/Tools/rolling_pin.rsi/meta.json index 407ebc30c0..bc2ff1de9d 100644 --- a/Resources/Textures/Objects/Tools/rolling_pin.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/rolling_pin.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "icon.png taken from https://github.com/DesertRose2/desertrose/blob/0348c98f8343b5cb82d87df12411ba647b2b1b4f/icons/obj/kitchen.dmi. Inhand sprites created by deltanedas (github) for SS14.", + "copyright": "icon.png taken from https://github.com/DesertRose2/desertrose/blob/0348c98f8343b5cb82d87df12411ba647b2b1b4f/icons/obj/kitchen.dmi. Inhand sprites created by deltanedas (github) for SS14. Belt sprite taken from unknown file in tgstation at commit https://github.com/tgstation/tgstation/commit/dc89ef0239830774bd3d9d7d6c8da2856da2b869", "size": { "x": 32, "y": 32 @@ -17,6 +17,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 } ] }