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
zcmV+%0^|LOP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_00003b3#c}2nYz<
z;ZNWI000|MOjJbx001*JJlWgg8yzMyH9SmCQ?RkO+1ujw_V{t8Bjo@900VSVPE!B?
z0Qz>s-T(jro=HSOR7l6|l)Y|)Fc5$*wP`b!H|UTDh-5=LM)J8ZR>G)jCEC!j5(qq2
zX)5#B1=7H|%Gjk+P6+8UpU#|r4&V}h88;e&gfarB3~vWxx@W>)s44T!Cn_fiA96z&
zG+J?A>n&lO5{6uroh$U?iH&^I>5H708xh+^NHg>1;ARG%@lEF>I}HRGd#D=4^dzXG
zfD<!SRchj4sI_fP%I2!6kgmhEZEZujElbM4ZP(EZOjfm^LeQ7_N`+M3D=L_{ZRfH9
zvL{S3!l2ZyQ1ik8N@FBpSZNW_zYdI$xwqdd^r`~>ivjK~m*Nt0EW&Vn56{`KcHh6l
zA#TTk)H(0iV`BA?W{B~ayBg`K<~l16#{|a|X%iWGs(FNQO@*Yuj0()?*#68g&fyB9
z*S@gn7U8Ijb##>{TrrJ_FVtv=uw3=CS~!+5j=27=Z$IV?eJ|Mg!VaJ$jg<k!zEA+H
z-zQ<u*G!aDXvCUrm!uycD)Bfkbs!{SM9Rd-=)NCJ0#`<7=-u{QBAo(Nj@vW+U=f~n
e8~yM9J-z{#UT5NaK?1J;0000<MNUMnLSTZC!|?I|

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!ia0vp^3LwnF3?v&v(vJfv=3*z$5DpHG+YkL80J)+8J|V6^
zT3S}k*wn_yFL=Yo?Kf{f`u6RIPwvdkKncc@AirP+hi5m^fSeXj7sn6@$*Tt)`3@-v
zuwJ;oQjS4q9ruyique(#Y#B7)WFNZopCfO=IZmG%{`zMxF2*bDxu^I+mUrgan~N@1
zOuuUROEBJicfriREnQ7gpH`JPxP}|Wl!ymRR6Xok&d0lSj#7)WUuCPqOiQO1;(GiX
ti5{N*HzI$}dD|gdSz0vVgyo-0>;dsYSKjXl-3W9KgQu&X%Q~loCIAnJT_OMg

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!ia0vp^4j|0J3?w7mbKU|e=3*z$5DpHG+YkL80J#zYJ|V6^
z`sVFN(z0sCrZzr)!5cPi2XeoC`(YLsIT0wwR1)MD%)n4K`K$$yH^<Y(F~sBe+sTex
z%?1Ll!EZf9V%vQ#=4O77TeRSJ)7h`x3bX9b<eXK@|H>iHd@$WdZF0xWDazYtBrUB=
zVhaf0nsSlhe#_dr#Yd;ei|;$v{P4ir<1EKsTsvBH*zreXUcqqzv-3O^yHcwRndL&R
z9&guA?*2R_=ig_emr>ILxu!>jPvD*&b)7BhVbJSa4mvSev5uNHbsRfCR20TPtbdWM
Wy^v*I`9GjL89ZJ6T-G@yGywpa;%{mI

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!ia0vp^4j|0J3?w7mbKU|e=3*z$5DpHG+YkL80J#zYJ|V6^
z`sVFN(z0sCrZzr)!5cPi2XeoC`(YLsIT0wwR1)MD%)n4K`K$$ychu9xF~sBe+bJ9Q
z4k-w<tu)!^5PzUyTlQhWnBF7e25PasvoGvjw)cAZW$r7pd-VQ1E{|tomvMUX<d04B
zgz~;TH;Zqca{~%iwV8==d}W{WRa5L<$UI)ZWA3F+OARd~J6OH$O5EDQ?If$0eW?2s
z_c^<j!cns>+;&me!m#wRs)lYtDz|)w-?{Kjxvj~qzZg&Vt@M6zm7ynK7T@}5f@|^u
z-p>r@+vT`+r{RP|$s2l4I`$-3@7dV=?Dd3yK_*iJ56mxRt>5!PeYc<1)`y$UHUT}v
N;OXk;vd$@?2>_ULfL{Or

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
+    }
+  ]
+}
-- 
2.51.2