From 5d7444767976c65b1076acf36fa2ee8837d17f11 Mon Sep 17 00:00:00 2001
From: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com>
Date: Sat, 16 Sep 2023 06:33:01 +0200
Subject: [PATCH] Make advanced mop wieldable (#20229)

---
 .../Objects/Specific/Janitorial/janitor.yml       |   5 +++++
 .../Specific/Janitorial/advmop.rsi/meta.json      |  10 +++++++++-
 .../Janitorial/advmop.rsi/wielded-inhand-left.png | Bin 0 -> 437 bytes
 .../advmop.rsi/wielded-inhand-right.png           | Bin 0 -> 439 bytes
 4 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-right.png

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index 5d90d9f186..07e04b473b 100644
--- 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 91d21466f4..31192c23bf 100644
--- 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
index 0000000000000000000000000000000000000000..58b7024153e6fbcccbd2c0953b12f51c15068d0c
GIT binary patch
literal 437
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`1E2l#}zdMOsw8E#B7K9k09rl+STS7*+=SRICh$qa5ewY9Y?SFX$gs$^hD
zRX#rzNb!~g`33(+0t~h<l-ht2oCO|{#S9F5he4R}c>anMpx{4G7srqY_qWq-3N<V6
zxJs8z{Qv)+nu0RNK|Q-?CCl8ZEK`0t#l7@*QDAanQBsf-ED&n=W;p5l!|9iPESxnj
zN^|K;*GvXyS0jd}-}`pGzSOwY?{^IAdo$sU9cjgOPquPzZI;UxKFYkqR<3D>^@62B
zI}A9q9G<5$em(G)m)p^((pqq1+C$c-fA-DVAT;NX$`1j-js}574h}&Z%^jwOjk{`M
zF4)8@c)1|vwT@3hM$XEaTMRjJJR5EARe$*8e(OMJLLt`&JBx&MhjTKRo!KpBT_^}#
zHd%5Ze-D#QYa4f1!<NRG3Ed_!IxM*fYCCS;V^3>(>JVtbTzpWxLt&};gD1NMz9hI5
Q07HVo)78&qol`;+0QPFDTmS$7

literal 0
HcmV?d00001

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
index 0000000000000000000000000000000000000000..3cfd219226fdeefb5336c6ea847e87f96b5309f2
GIT binary patch
literal 439
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`1E2l#}z)){W}QY`A}=}BWalV*Ho<;s<{wYBqNbr=#RGq~mC>deUks$^iu
z=6nw_kGCYqFZe$aV6c6m)CQE`EbxddW?<ku48n}Z^H-z*Eobm_aSVxYe>?4_P_qJ$
zYp@vO>HqcllNr2jTHX4ld%Uot$a0ZB+oS0n4lFGkE)IX37>rLYmW-}YoX6!Ly=!5w
z;Viyg54yTmtumByc*t>a)!Cm1%=ec4J}0{Qj^l^CU^C7)ml>s+`oDf+6=C~+WU9^r
z+nE2;9L}dZ9%+nwrqwk~oN>DN$<>$cz2}_qTK~QRlc0c-0Hb2lf6g@fC(X(RVm)=o
z^XD{9WKh3uy@Gje!ru>dM%-mG!O4a{4=-=%yqhByQE;$YCr#Fgv!%?AbA$5&wZrXK
zR(_Fbtf>uRxssxDYjULm_lJP8$5kh6ChT|gdQx>lCxB(jj{_D3TzN`O67ftmyJi;D
RuM-A^pr@;!%Q~loCIIWNt*rn6

literal 0
HcmV?d00001