From 001c755a9409ad671ebb6f5781ca444fe4d46533 Mon Sep 17 00:00:00 2001
From: Easypoller <117361103+Easypoller@users.noreply.github.com>
Date: Tue, 6 Dec 2022 03:28:00 +0100
Subject: [PATCH] Mop usable as weapon (#12864)

---
 .../Objects/Specific/Janitorial/janitor.yml       |   9 +++++++++
 .../Objects/Specific/Janitorial/mop.rsi/meta.json |  10 +++++++++-
 .../Janitorial/mop.rsi/wielded-inhand-left.png    | Bin 0 -> 549 bytes
 .../Janitorial/mop.rsi/wielded-inhand-right.png   | Bin 0 -> 540 bytes
 4 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/mop.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 659b9b4b7d..6c087ed0c5 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -8,6 +8,15 @@
   - type: Sprite
     sprite: Objects/Specific/Janitorial/mop.rsi
     state: mop
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 10
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 5
   - type: Item
     size: 15
     sprite: Objects/Specific/Janitorial/mop.rsi
diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json
index acea5438bc..5ef52189ca 100644
--- a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Janitorial/mop.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, wielded versions from Easypoll", 
   "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/mop.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fd9168b55a834c9c75b996224c7fa7f8c508253
GIT binary patch
literal 549
zcmV+=0^0qFP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$-bqA3RCr$Pnz2g6KoEv=PavLJiD=~;2;zH)rL~3HSPDk4wDBygEyec`!8fo{
z#7aH!2_h3%yvrq<&HC@^WdCc9BfGQnfAi0!m>pz^e+G%`&j^4HNSpv$AaMimPmnFZ
z7D$``TOe@*@GZa=U<)KpfGv=?0e;>Bd45`ajK|r+aG06zJU^Lo$o|1$G5Nf@UVdMW
zE~fUFxc6T>CF_Ultwz^v?A{f!W^?YQ%%gg~PqEr`MQZ^Ox3;oaYPdaHpE-B?_^}lK
z^zv?n<O9LBCmH||xVk)_J->c70<b+t3peqi0XVvPD@44AJl|WIIk)Y3F93*$I`KxF
zKxkWo1`*8x=)_U+2mnP=YaBX2YvoXR(*Y=wTI0|GS}TXjn+`yc)Eb8l&{{cE-gE$p
zq}DiefY!>P@}>h&B(=t&1GH8Sl{X!LBB?bF9bl`R3>Fas%Kz++RtK1g@Lzy1liljX
z840u%z~o^u5~>py^4v}UOmZO;a;Yxzd@le^NmegI$bEpiy8tdCUDhB#KmnMf&1HzD
zQMik^E^B@RJ_rDF8NxOS?;_B3tq=Gh0A$V|Tf9K>0Urc_YsJv(e8Be#fDcdt@S)bH
nJ#;{ys_CPJ4)CGYr#;^TE4@KThAR000000<MNUMnLSTXbZ&vQ;

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bdd20aa485f1d130b68dfcc1ab5a1b567ef3c9b
GIT binary patch
literal 540
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zuX?&ThE&A8
zjk5J(b`-fc$DwDL(8W{I9FJ_9mTqmm6~VPGAv0NLjqcIvjt9JJL^cK~&r5i!d*;!a
z$!F^}TYG*xJ6%oXXWG5rb@!Idc&R#Zf7Qg#{u&Iz0y~*x8c#4EXjgD=P=;~p8T%OA
z6^d9bm?p9x_$PkjUi}G|33He3PFZ^2|I(K;UMC)2EL6K+-+TP$`*q)6U!1yC&G-Cf
zqjh`MUs==b%xnDH?%$iI-t+Uy*Z%9`KYaQ5oIj^;Kerc%DiQpc^zPZOtb4cq9t}Hq
zTPPtp*Rrzq|2Bqhk7LW#4R0J>FYw^WGiBjVOuK9(R#aQ~JxUi8ov>ncD1*3pso&zq
zj*J0Ew>+H5klVMYW(GruVQz(*!|cTx@@fpBKGO3zFFeyY)z0Z4dbur~X^Umor$i<U
z<qAs{7a6>?;^2)GzH9Blbfz=s=MstBbL{zk8(wqWpT&@oC|?wsUGv&p?7;SdV8&ak
zqBR?2G*8zuR{HKTxj2Pm*FN1x%kq{oJoBiGo356Yc;JelfzqG7p^dwqb<b~Q3}&71
zZ0W?xyOJEa4!VprvN_qY9?VvX4$)4#zAa=>y!!UgJs$`07_OVj!U92e_1^sDuC>|c
W*ulMj6EL<JJYD@<);T3KF#rJdVD1P2

literal 0
HcmV?d00001