Make advanced mop wieldable (#20229)

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index 5d90d9f1866fd2625b6de400ef1265f5a3527302..07e04b473b5c0e12ee5072500d387f51011107da 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -52,6 +52,11 @@
           Blunt: 10
     - type: Spillable
       solution: absorbed
+    - type: Wieldable
+    - type: IncreaseDamageOnWield
+      damage:
+        types:
+          Blunt: 5
     - type: Item
       size: 15
       sprite: Objects/Specific/Janitorial/advmop.rsi

diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/meta.json
index 91d21466f4b1a27b265054bffd67ba2604e137ba..31192c23bf2eedef3e222510f125c90f6b3fa45b 100644 (file)
--- a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b136cf653c4926e475f8d39b34cd1b713331865a",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b136cf653c4926e475f8d39b34cd1b713331865a, wielded versions by Psychpsyo",
   "size": {
     "x": 32,
     "y": 32
@@ -17,6 +17,14 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+       {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+         {
+      "name": "wielded-inhand-right",
+      "directions": 4
     }
   ]
 }

diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-left.png
new file mode 100644 (file)
index 0000000..58b7024
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-right.png
new file mode 100644 (file)
index 0000000..3cfd219
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-right.png differ