Give proto-kinetic crushers, glaives, and daggers better inhands. Update the crusher...

* inhands

* better inhands

* indent

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index 337c7f07f7b955bc1ba1130c83a246e4ea557adf..5b565127a2d971ccc63348e9faa1d30c8bfe4b97 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -149,6 +149,7 @@
   - type: GunRequiresWield
   - type: Item
     size: Ginormous
+    sprite: Objects/Weapons/Melee/crusher-inhands.rsi
   - type: DisarmMalus
   - type: Prying
 
@@ -191,3 +192,6 @@
   - type: Tag
     tags:
       - Pickaxe
+  - type: Item
+    size: Ginormous
+    sprite: Objects/Weapons/Melee/crusher_glaive-inhands.rsi

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..1c1093a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..7593455
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/meta.json
new file mode 100644 (file)
index 0000000..c634ba8
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "by alzore_ (discord) based on the proto-kinetic crusher",
+  "size": {
+    "x": 64,
+    "y": 64
+  },
+  "states": [
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-right",
+      "directions": 4
+    }
+  ]
+}

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-left.png
new file mode 100644 (file)
index 0000000..e8e9a26
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-right.png
new file mode 100644 (file)
index 0000000..4ef9c38
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/icon.png
index d9b6ca8157b74b5484b09fb1baecec7238373cd2..1df2bf438850dfc03a279ea0ce8dc98c3f672207 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-left.png
deleted file mode 100644 (file)
index 28eab44..0000000
Binary files a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-left.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-right.png
deleted file mode 100644 (file)
index dcf6065..0000000
Binary files a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-right.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json
index 2d91fb460be44069b24de2de2f0e709a93526237..8a70dbd998c861238630693edb5ebf27a17aa699 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi",
+  "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi and modified by alzore_ (discord)",
   "size": {
     "x": 32,
     "y": 32
@@ -21,22 +21,6 @@
           0.3
         ]
       ]
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "wielded-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "wielded-inhand-right",
-      "directions": 4
     }
   ]
-}
\ No newline at end of file
+}

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-left.png
deleted file mode 100644 (file)
index 6b55e43..0000000
Binary files a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-left.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-right.png
deleted file mode 100644 (file)
index b3d449f..0000000
Binary files a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-right.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/inhand-left.png
index 5d64ccba6ed7b307dd5e0ba9d025100ad6a65724..ccb1aa83d83b290e98a236f5a7fc61cbbc21436d 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/inhand-right.png
index cce061bab2933eef43d0399aa85e5c6a4a3fe57d..ae6e01f4a50fd3ab86113959a90076dd0f11a240 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/meta.json
index f076030635fb0920be03a943cd93afa949dd646a..f64277be797d068b68666da45836980c413e4695 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi",
+  "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi inhands by alzore_ (discord)",
   "size": {
     "x": 32,
     "y": 32
@@ -22,4 +22,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..f245aea
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..6949718
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/meta.json
new file mode 100644 (file)
index 0000000..c6fb3d1
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "by alzore_ (discord) based on the proto-kinetic crusher glaive",
+  "size": {
+    "x": 64,
+    "y": 64
+  },
+  "states": [
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-right",
+      "directions": 4
+    }
+  ]
+}

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-left.png
new file mode 100644 (file)
index 0000000..330b936
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-right.png
new file mode 100644 (file)
index 0000000..2d1a481
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/icon.png
index 980af14aa86c025fc1be958d55d6902884cca2ab..e22b636f3da9e25706672b73b822daca1573690b 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-left.png
deleted file mode 100644 (file)
index 6d9aab7..0000000
Binary files a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-left.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-right.png
deleted file mode 100644 (file)
index e2d24c9..0000000
Binary files a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-right.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json
index 2d91fb460be44069b24de2de2f0e709a93526237..8a70dbd998c861238630693edb5ebf27a17aa699 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi",
+  "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi and modified by alzore_ (discord)",
   "size": {
     "x": 32,
     "y": 32
@@ -21,22 +21,6 @@
           0.3
         ]
       ]
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "wielded-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "wielded-inhand-right",
-      "directions": 4
     }
   ]
-}
\ No newline at end of file
+}

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-left.png
deleted file mode 100644 (file)
index ce6c530..0000000
Binary files a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-left.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-right.png
deleted file mode 100644 (file)
index 84abf80..0000000
Binary files a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-right.png and /dev/null differ