From 8cff034f524395b7ddd84795eaa476f48d86183b Mon Sep 17 00:00:00 2001
From: ssdaniel24 <107036969+ssdaniel24@users.noreply.github.com>
Date: Thu, 23 Mar 2023 06:39:12 +0300
Subject: [PATCH] Added janitoral uniform with miniskirt (#14050)

---
 .../VendingMachines/Inventories/janidrobe.yml |   1 +
 .../Entities/Clothing/Uniforms/jumpskirts.yml |  11 ++++++++
 .../equipped-INNERCLOTHING.png                | Bin 0 -> 540 bytes
 .../Jumpskirt/janimaidmini.rsi/icon.png       | Bin 0 -> 250 bytes
 .../janimaidmini.rsi/inhand-left.png          | Bin 0 -> 278 bytes
 .../janimaidmini.rsi/inhand-right.png         | Bin 0 -> 319 bytes
 .../Jumpskirt/janimaidmini.rsi/meta.json      |  26 ++++++++++++++++++
 7 files changed, 38 insertions(+)
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/equipped-INNERCLOTHING.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/meta.json

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
index db4085773a..38056a2282 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
@@ -11,3 +11,4 @@
 
   emaggedInventory:
     ClothingUniformJumpskirtJanimaid: 2
+    ClothingUniformJumpskirtJanimaidmini: 1
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
index 601734f56e..511cd8cff4 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -553,6 +553,17 @@
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/janimaid.rsi
 
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtJanimaidmini
+  name: janitorial maid uniform with miniskirt
+  description: Elite service, not some candy wrappers.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/janimaidmini.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/janimaidmini.rsi
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpskirtLawyerRed
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5a12593874bedf992124bcba3c5bcca8923ddb9
GIT binary patch
literal 540
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o7G?$ph6wkZw+svn%*9TgAsieWw;%dHU|?X7
z4)6(aWnf@1Hnq8V`;oM)nz5;kk6-YHjoWYDe)R3zkHTfjPeHm$g8YIR7#Mz)9l6KA
zz&Ov-#WBR=_}eLa^O_9=8uYhj8c#ESF@e1!#o5a3(@ul1Lo2dXZ(Z0Z#9<SbsrC5=
z>!kxbPu*A=<j3*Sc>cLL^?VP6>Ltyknp%vQmh<GZC+|u>6u(0A^I3H*bx!#rX9<(2
z!uZ#^iF1Y8Vy4d3{_?o9x90N8?m0801#i1~7=M2DAdPL_N8jfv*1Rl|)hncqeo<Mm
zxIx%BG&Ji`;)<=gzNen8S~+3e;jOv3&O3FzPaVj;ev!u~Z0iE23)6pkwT9f&)|#;+
z_xUEqP3k^IhZbB}7x4KIqgS#@Vnn9k#r=Fe6LxODul;2e)4y)UcY4zw2^H%cDyZQ<
ze{)0G{r!g(^Nu%Ov3!3cIqB<!w2qH6c1yin`OHe2|2WHWkxXI9s#TROg}$vz4)k!H
zd2!?48G~~VxfWmFx8bGO!xcTHB~#U740}8EuVi#=i21rX%3_*f-;RIl^6j7T)au{(
zd5CX;O7B$0Bl`jv*4$T5Jb&G1N=U|$S-I1f$SY`lw9qeAP)Tw*b>zg0eeym`;cn?K
w?tY6=n#&a0ciZ@Hg5bO|>A&y)+wNnW9+&>8+L38J0|Nttr>mdKI;Vst0FlG+@&Et;

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..9add6c81b8b4efd7264f177503fa73bc3ac0c439
GIT binary patch
literal 250
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT8%*9TgAsieWw;%dHU|?Vn
z4e$wZWnf^CmQ^!0wej%_-mr1|&D)Q@ef!~)J99Gw0|R48kY6x^!?PP{3=9k{o-U3d
z5|URBI`SP-5MaG<f2ACQ&N}WRwMV&cWY{ujzR5mx=RZf@gmaueHT?C@UR;b<*mF<u
zgDmgNvo{xAteAe)@|R$|`R;<5e_Ohmq&}@Gac~VciYXBfn5cT#wVaQ4=^UjNXTQo;
zhnbd6FU0luITAfQ{clA6p7XXtwz9Nn!U@Yim)Ha1g|58c6S|Rsfq}u()z4*}Q$iB}
D4~ShN

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..05a43b4307e012fa5944170445020c381b1555bc
GIT binary patch
literal 278
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o7G?$ph6wkZw+svn%*9TgAsieWw;%dHU|?X7
z2=EDUWnf^qdHa#HteUZ@jgMdOhK<{A-hTA$+YhtA$cYRL3``|Ke!&b3Ws}cZFfcI8
z@pN$v@i_i=vLjcsfq-l9TThYLcAty6nIGg9E%@DZ_G`DoEc-J#XVvn*a>z3uO!rZn
z+;MY?^7a`?OY4%@0>ZbZTx7W4vbJvV(JAuc`_45#Jn;57%dr>Njustu{1KT~a9qIb
zJWs{0)G9+}xsa>J+x3&XKTpZ|_u1%W)bv2E=~3YmxTi;5XN!6m^!k>APE1y;qoz$A
h$IcHGh4ByTUu0`9WSLj~kAZ=K!PC{xWt~$(69AdwZ)yMl

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..6bd8bbd220dfa2dee1f9e8b6d563b26848e06b7c
GIT binary patch
literal 319
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o7G?$ph6wkZw+svn%*9TgAsieWw;%dHU|?X7
z2=EDUWnf^qdHa#HteUZ@jgMdOhK<{A-hTA$+YhtA$cYRL3``|Ke!&b3Ws}cZFfcG2
z^>lFz@i_i=%0|9J3Ic5_P4+p&A86Q?eONH2_lUTGTCDHv3wxLCy<UEq`^xMdy+4o3
z<C)lHoSr=SW79mLyf4qq;+yB(fPz(RW?~#)+2?%K6uTEPkJs;*d#Te>Lkr0cR<FAf
zx3+LQ$?9bv>ORGN&Tge})T|4)T@<!3EWNC%p_`D(EuZ0cE__pNYjW!^#?yT(y<c2q
z=n0s`w|<)7n!JGbGsF3IIj-GlI3ZE;hTfBoJqgx(Ha0(dJ>g%F$<)9D^GjLl_q<Tw
Y?WeW%;ij`q3=9kmp00i_>zopr0GM-tUjP6A

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/meta.json
new file mode 100644
index 0000000000..571eff1081
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "By discord:Van#1931 based on janimaid.rsi taken from tg at commit https://github.com/tgstation/tgstation/commit/beaea876ea426c0e215cee64619862dc19bd9cd8",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}