diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml index 7ccf30b227..029ccd21da 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml @@ -9,10 +9,11 @@ state: icon - type: MeleeWeapon damage: 15 - - type: Item - size: 24 + - type: Clothing + size: 15 sprite: Objects/Weapons/Melee/baseball_bat.rsi - prefix: inhand + Slots: + - back - type: Construction graph: WoodenBat node: bat diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml index 0fe1ac7dc0..643d250a87 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml @@ -12,6 +12,8 @@ state: icon - type: MeleeWeapon damage: 25 - - type: Item + - type: Clothing + size: 20 sprite: Objects/Weapons/Melee/fireaxe.rsi - prefix: inhand + Slots: + - back diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml index 3e151f89e4..42d092684a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml @@ -17,10 +17,11 @@ arc: spear - type: DamageOtherOnHit amount: 15 - - type: Item + - type: Clothing size: 24 sprite: Objects/Weapons/Melee/spear.rsi - prefix: inhand + Slots: + - back - type: Construction graph: spear node: spear diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index c2e58883f2..5c80e445df 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -12,7 +12,6 @@ - type: Item size: 15 sprite: Objects/Weapons/Melee/captain_sabre.rsi - prefix: inhand - type: Tag tags: - CaptainSabre @@ -34,7 +33,6 @@ - type: Item size: 15 sprite: Objects/Weapons/Melee/katana.rsi - prefix: inhand - type: entity name: machete @@ -53,7 +51,6 @@ - type: Item size: 15 sprite: Objects/Weapons/Melee/machete.rsi - prefix: inhand - type: entity name: claymore @@ -66,7 +63,8 @@ state: icon - type: MeleeWeapon damage: 25 - - type: Item - size: 15 + - type: Clothing + size: 20 sprite: Objects/Weapons/Melee/claymore.rsi - prefix: inhand + Slots: + - back diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..ddab849d4f Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json index 2c493b673f..e9f97dc260 100644 --- a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json @@ -1,12 +1,15 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Taken from goonstation at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a", + "copyright": "Taken from goonstation and modified by Swept at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a", "size": { "x": 32, "y": 32 }, "states": [ + { + "name": "icon" + }, { "name": "inhand-left", "directions": 4 @@ -16,7 +19,8 @@ "directions": 4 }, { - "name": "icon" + "name": "equipped-BACKPACK", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..89c21dcf3c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/meta.json index 53bc38346c..e33f5993b2 100644 --- a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/meta.json @@ -1,22 +1,26 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by Taral at https://github.com/tgstation/tgstation/pull/18086/commits/aea72a79fd34990dc7affd5cdf8dc13bd5b6431a", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by Taral and Swept at https://github.com/tgstation/tgstation/pull/18086/commits/aea72a79fd34990dc7affd5cdf8dc13bd5b6431a", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..2d24521008 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json index 200e7edafe..36566042fe 100644 --- a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json @@ -7,6 +7,9 @@ "y": 32 }, "states": [ + { + "name": "icon" + }, { "name": "inhand-left", "directions": 4 @@ -16,7 +19,8 @@ "directions": 4 }, { - "name": "icon" + "name": "equipped-BACKPACK", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..dfc3bd6b6e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json index 2d727ff632..a380e9796e 100644 --- a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json @@ -7,6 +7,9 @@ "y": 32 }, "states": [ + { + "name": "spear" + }, { "name": "inhand-left", "directions": 4 @@ -16,7 +19,8 @@ "directions": 4 }, { - "name": "spear" + "name": "equipped-BACKPACK", + "directions": 4 } ] }