Made musket wieldable. (#29910)

* Made musket wieldable.

* Updated musket rsi meta.json copyright.

* Copyright adjustment again.

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index 252eecbd0614670409799d7b83384a34c2dd5f15..f69cb4fd2da358ca3130b03149aa7fc2d5ba1dde 100644 (file)
--- 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
index 7609e516b3a90cf50e42a114520b16d0fc4d434a..b0f1b27c24c9b3b72fc18a4833261c362afd79d7 100644 (file)
--- 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
new file mode 100644 (file)
index 0000000..bf76836
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/wielded-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/wielded-inhand-right.png
new file mode 100644 (file)
index 0000000..a8a6bbe
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/wielded-inhand-right.png differ