Made musket wieldable. (space-wizards#29910)

* Made musket wieldable. * Updated musket rsi meta.json copyright. * Copyright adjustment again.
themias · Aug 9, 2024 · 621b8e1 · 621b8e1
1 parent 2764a9a
commit 621b8e1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -66,7 +66,7 @@
 
 - type: entity
   name: musket
-  parent: BaseWeaponSniper
+  parent: [BaseWeaponSniper, BaseGunWieldable]
   id: Musket
   description: This should've been in a museum long before you were born. Uses .60 anti-materiel ammo.
   components:

diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by Pato Grone for SS14",
+  "copyright": "Made by Pato Grone for SS14, Wielded states by Jonathan Argo",
   "size": {
     "x": 32,
     "y": 32
@@ -15,6 +15,14 @@
       "name": "inhand-left",
       "directions": 4
     },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+    {
+        "name": "wielded-inhand-right",
+        "directions": 4
+    },
     {
       "name": "base"
     }

diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/wielded-inhand-left.png
diff --git a/...urces/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/wielded-inhand-right.png b/...urces/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/wielded-inhand-right.png