From e6b52cc294a9ecafadda75ff62b91c60152b7d96 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Sun, 24 Dec 2023 06:25:50 +0100 Subject: [PATCH] Fix nettle seeds inhand sprite (#22891) fix --- .../Entities/Objects/Consumable/Food/produce.yml | 2 ++ .../Specific/Hydroponics/death_nettle.rsi/meta.json | 4 ++-- .../{inhand-left.png => produce-inhand-left.png} | Bin .../{inhand-right.png => produce-inhand-right.png} | Bin .../Specific/Hydroponics/nettle.rsi/meta.json | 4 ++-- .../{inhand-left.png => produce-inhand-left.png} | Bin .../{inhand-right.png => produce-inhand-right.png} | Bin 7 files changed, 6 insertions(+), 4 deletions(-) rename Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/{inhand-left.png => produce-inhand-left.png} (100%) rename Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/{inhand-right.png => produce-inhand-right.png} (100%) rename Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/{inhand-left.png => produce-inhand-left.png} (100%) rename Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/{inhand-right.png => produce-inhand-right.png} (100%) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index df03577ff0..ce96ff8a3d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -139,6 +139,7 @@ - type: Item size: Small sprite: Objects/Specific/Hydroponics/nettle.rsi + heldPrefix: produce - type: MeleeWeapon damage: types: @@ -169,6 +170,7 @@ - type: Item size: Small sprite: Objects/Specific/Hydroponics/death_nettle.rsi + heldPrefix: produce - type: MeleeWeapon damage: types: diff --git a/Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/meta.json index 361c777a97..19fb12e231 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/meta.json @@ -17,11 +17,11 @@ "name": "produce" }, { - "name": "inhand-left", + "name": "produce-inhand-left", "directions": 4 }, { - "name": "inhand-right", + "name": "produce-inhand-right", "directions": 4 }, { diff --git a/Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/produce-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/inhand-left.png rename to Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/produce-inhand-left.png diff --git a/Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/produce-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/inhand-right.png rename to Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/produce-inhand-right.png diff --git a/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/meta.json index 361c777a97..19fb12e231 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/meta.json @@ -17,11 +17,11 @@ "name": "produce" }, { - "name": "inhand-left", + "name": "produce-inhand-left", "directions": 4 }, { - "name": "inhand-right", + "name": "produce-inhand-right", "directions": 4 }, { diff --git a/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/produce-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/inhand-left.png rename to Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/produce-inhand-left.png diff --git a/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/produce-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/inhand-right.png rename to Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/produce-inhand-right.png -- 2.51.2