From 4b5009879ab424f364c60bc85b264bc9d527c0f2 Mon Sep 17 00:00:00 2001
From: csqrb <56765288+CaptainSqrBeard@users.noreply.github.com>
Date: Sun, 9 Jul 2023 15:16:13 +0600
Subject: [PATCH] =?UTF-8?q?=D0=92=D0=B0=D0=BD=D1=82=D1=83=D0=B7=20=D0=BC?=
 =?UTF-8?q?=D0=BE=D0=B6=D0=BD=D0=BE=20=D0=BE=D0=B4=D0=B5=D1=82=D1=8C=20?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D1=83=20(#195)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* wearable plunger
---
 .../Objects/Specific/Janitorial/janitor.yml       |   8 ++++++++
 .../Specific/Janitorial/janitorial.rsi/meta.json  |  14 +++++++++-----
 .../janitorial.rsi/plunger-equipped-MASK.png      | Bin 0 -> 465 bytes
 3 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/plunger-equipped-MASK.png

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index 0d0d3822e9a087..5b01c810223884 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -467,6 +467,14 @@
     - type: GuideHelp
       guides:
       - Janitorial
+    - type: Clothing
+      sprite: Objects/Specific/Janitorial/janitorial.rsi
+      slots: [ mask ]
+      equippedPrefix: plunger
+    - type: MeleeWeapon
+      damage:
+        types:
+          Blunt: 0
 
 - type: entity
   parent: BaseItem
diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json
index 177bd8e6197091..f9e79fc874e2b6 100644
--- a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428. plunger-equipped-MASK.png taken from https://github.com/tgstation/tgstation/commit/301175f66f157fda731493c809d5444b0b194efb",
   "size": {
     "x": 32,
     "y": 32
@@ -40,13 +40,17 @@
       "name": "equipped-BELT",
       "directions": 4
     },
-	{
+	  {
       "name": "plunger-inhand-left",
-	  "directions": 4
+	    "directions": 4
     },
-	{
+	  {
       "name": "plunger-inhand-right",
-	  "directions": 4
+	    "directions": 4
+    },
+    {
+      "name": "plunger-equipped-MASK",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/plunger-equipped-MASK.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/plunger-equipped-MASK.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe5edb4eca9e0f2f735f072b7bb72b4971538350
GIT binary patch
literal 465
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|R5T
zr;B4q#hkaZ484yS$Q+&jAg<v0(&pLs5B_vG$p7F`#e)Yre2?BdcvmFvP_X0X`v=bi
z*u}*~`D9vWi9CMV^7-AY`qm%!_`NPqGdrvAsrh8Ba`SIv6YJ*@&IeOCD{9?8rf~k?
zFA+0X@rteBZJkZwQNLzCCa1;U)%g1L4_tU3xS?e#>ycymzdmigzwK{X=!TXx`3H`3
z9NoOBVcYcDeE$7zjt_RMGEAGv)Toj8Y)62Vf8!+Sxr_cYOi*T2aA$JpV`-4#WUv%s
zC{kf~;=yoYBAUc9Cb3r4cYYuC&fBrou=?%G+^Bnd=gha>#FsLIvtwuDe9Oiy7Zn2v
zO@7&il-72r?Ny&@xV}%u$K4@9uRpP~x%T=zZrj-Tdh=DhS$A@qIC^N@zjN*FX88o~
z{QC{AwtIP2?r=1f6`eMN`-Qg7L^fj`Lt%mV4d?GT$d}IOYuL}>8*zOh0k^it9Z=^H
X?NnZ(^Y|1nju<>${an^LB{Ts5P)WK(

literal 0
HcmV?d00001