From 00c844a410c70df0c3a7296af22ec2cc5f1cb7e8 Mon Sep 17 00:00:00 2001
From: SweptWasTaken <sweptwastaken@protonmail.com>
Date: Thu, 20 May 2021 09:21:48 -0700
Subject: [PATCH] Fixes holes in Captain's jumpsuit and adds Captain's
 jumpskirt

---
 Resources/Changelog/Parts/changelog1.yml      |   4 +++
 Resources/Changelog/Parts/changelog2.yml      |   4 +++
 .../Entities/Clothing/Uniforms/jumpskirts.yml |  11 ++++++++
 .../Prototypes/Roles/Jobs/Command/captain.yml |   1 +
 .../captain.rsi/equipped-INNERCLOTHING.png    | Bin 0 -> 627 bytes
 .../Uniforms/Jumpskirt/captain.rsi/icon.png   | Bin 0 -> 282 bytes
 .../Jumpskirt/captain.rsi/inhand-left.png     | Bin 0 -> 713 bytes
 .../Jumpskirt/captain.rsi/inhand-right.png    | Bin 0 -> 754 bytes
 .../Uniforms/Jumpskirt/captain.rsi/meta.json  |  26 ++++++++++++++++++
 .../captain.rsi/equipped-INNERCLOTHING.png    | Bin 1317 -> 726 bytes
 10 files changed, 46 insertions(+)
 create mode 100644 Resources/Changelog/Parts/changelog1.yml
 create mode 100644 Resources/Changelog/Parts/changelog2.yml
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json

diff --git a/Resources/Changelog/Parts/changelog1.yml b/Resources/Changelog/Parts/changelog1.yml
new file mode 100644
index 0000000000..9d637179c8
--- /dev/null
+++ b/Resources/Changelog/Parts/changelog1.yml
@@ -0,0 +1,4 @@
+author: Swept
+changes:
+  - type: Add # One of the following: Add, Remove, Tweak, Fix
+    message: Add jumpskirt for Captain
diff --git a/Resources/Changelog/Parts/changelog2.yml b/Resources/Changelog/Parts/changelog2.yml
new file mode 100644
index 0000000000..88789e0176
--- /dev/null
+++ b/Resources/Changelog/Parts/changelog2.yml
@@ -0,0 +1,4 @@
+author: Swept
+changes:
+  - type: Fix # One of the following: Add, Remove, Tweak, Fix
+    message: Fix holes in Captain's jumpsuit
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
index a2b8f84d36..da924a7b3b 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -9,6 +9,17 @@
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/bartender.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtCaptain
+  name: captain's jumpskirt
+  description: It's a blue jumpskirt with some gold markings denoting the rank of "Captain".
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/captain.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/captain.rsi
+
 - type: entity
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtCargo
diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
index 8c0bbb9666..19beb7c082 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -40,5 +40,6 @@
     outerclothing: ClothingOuterHardsuitCap
     idcard: CaptainPDA
     ears: ClothingHeadsetAltCommand
+  innerclothingskirt: ClothingUniformJumpskirtCaptain
   satchel: ClothingBackpackSatchelCaptainFilled
   duffelbag: ClothingBackpackDuffelCaptainFilled
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..116cce4ad7a6f60764acf2bc08187c10c01886d7
GIT binary patch
literal 627
zcmV-(0*w8MP)<h;3K|Lk000e1NJLTq002M$002M;0{{R3owtGP0000*P)t-s{{R4h
zfB@5}0RT8_085Ym{|x{uQW{r|;l~MTYHB|}KT}gv0ARQaOoR|OTn#Ns9ATgpN_qeP
z01hfdfPjD(M{_JJEYX#>D*ylh0d!JMQvg8b*k%9#0CIX%Sad{Xb7OL8aCB*JZU6vy
zoKseCa&`CgQ*iP1<SI)oD$dN$Q?OMq(KF!UEYD0S$pCVUjkq{7QZv&tN+6u#lEji!
zAX6zhv7jU|GcUe4JF}=niHkEOv#1!PnTs>6C^0t`#5UwoR&e!m0UHkhNsb+QZ7!xY
z0004ANkl<ZScUDD+j7D%3`8Yc3N9C42=M=(TG=UNhFVsqPds=tj318JY(mHyU~1~q
zgsv?PRqlz%4>*%7#L7hF%d)7vxf4)ZyIc(DKw_ZqDwcz~4jZoqeJ%rj5z;=sYtZ;%
zz&*OaUmP6z-xE*H3a<n3N&sC0cqQm?Kz8s-0FK{p^pmr~oAv~K?Fkg^33Sc_4#$%`
zD-KUbm2c9xr}NLzdroW)?6~pZ_+K1}&Q72^6ZNjr;`JU;3rOmpY0O0~1P;Mz*yK}F
zQ&YR}4=)S-ebjaUc!8)7M7W@~JrJdsbB+TC`F<NonnBJb<#=5+gY_D7Dmf1fBt$7{
z_bsK!=?4ZSr`mrv&EQsxF-c6#AeM9=wQsHGdn)=pK*ogQ1lWcY9x+C;5>S*e%^=|8
zVI`;&n!&nprF^0G^L7U1cQ*Uq8nF7`8Zi6c9<ch~-XNI$KQ{;;s&D!r5O~#9tn2^)
N002ovPDHLkV1i*&2W$WU

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..477d8e487349c0b84e2cfa3d28d14b73c740a0d3
GIT binary patch
literal 282
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy_5nU2uKyVrxE=C&gC@4Nw(^Ef
zTeWHxf7V_G@BaV)8MwV#7%Z|Gw1XNN7%s15e0ZGm|9{?wh6XDutKi^Z9@k2SgdI)u
z9sdE1Vk`;r3ubV5b|VeQ>GX7Q46*2a+kcSnumX>>r^b@k1)IeF{f}n1E|}5rjdAs2
z4R-rTKaTDDT+bM~rG5I7yIAD11>XeYV5M`Fyc0^^_Seo)bv(W~dcLj90*AM$U7OgL
z&a%Ako%!HLqFTj)^DUpX45qyP!mw&<QT+PF2WNc=ys@j%!`b|z%QaoD6qb%3x(l;b
eeR#9~n)J16Y+i9~|FeLOV(@hJb6Mw<&;$VKu5Z5p

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..c48c84c07feb53329b5919996e2a9aa14ad7a8ab
GIT binary patch
literal 713
zcmV;)0yh1LP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0007zNkl<Zc%1Fp
zv1{8v6vy#znn2+oCWkHKO+iqDz`<k5651hiH&=f`Cg;z{-Y%Uw$0b9@mJAJ9LdKAS
zAORN-1!Ft7WH1D3)WMZ1Cn@;CQz_(qCR^ZV-AVT>d_Pc1DW#NBN-3q3Qc680OHzfx
zFiZd@lL@_EZz(-CnM^Ro01(IVLf>~^E#LQ(^tGfX5=Fu=O!jtT#<eB@jaEDP_>N?G
zV;g{Rt;ybQoDFQzTE-X}t#(p-86~UFUrC(m9V=3Wb~+IiugbJ<DA_Vcrz@0fnW-_X
zdR2Bh5tg%sYuWx8<60AYeuxF8eW^2@C%y#6wI&s>njIev2iX2>;I2#HcCD`;-iR*&
zu{!`@d1D)UemHlvEVF^6ld!1#;77y3+(bwcod6)~19`Kh;Z~>ORT&Kj+57x!Ng_=!
zm0qc!9%B1v1oiOFKwMP3YIfy|x&uTfAX-0QG#qd}zQS%rT#v694F^Q)2hO!hwwz5|
zQG*A;CJ3|UWw#=_7jf3bgL=sLcz@vrnDTu;xd}FbKg*&2W&i(ff&kwx-x96=;Kl2o
z9Gza$xm;rn&$*5<2D&HQ1e=8o9)#}z;NFKF*Q<ZK)<Zw9lu}A5rIb=iDW#NB>K5^T
zTYcY8T=M{~B(n&jJ420DJ2A#M<pEqtW)VPm0;cDO*-r3ICz32ZC(R-lGoM8;#!&g4
zMOc*BE!t?c6L?r2z?EbcL2PR*-5IWURYthy0bEIC5k&U}^Sil4MOyMCvIwF*Aitkq
zG^s3t*aYO`EG1i(D*IPbS%gBC!1qt@DI(LCnl-pE3ARGI7jgFM6VyXKA3t+yzM@SK
v;A!_Hdl)I2L>8fte89ij&zH<1JX*g1>upcOJzHUJ00000NkvXXu0mjf77#iJ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b5de1dfa51a68a2c0047155b65a23eb7867302f
GIT binary patch
literal 754
zcmV<O0uB9%P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0008HNkl<Zc%1Fp
zJ!{)Q7{Kwrn?T_p#=<YSlY=3Kg9MMEOGt;z-4cC-Ov%T{-Y%Uw*Cj*81}`B?lF_&z
zXduNysgV>EG8hUm>fp#PsVv*A9J%!QErvtBd+yQQVSEn=A%qY@2qA<JLI@%LC#kST
zt+fx(>2zqdTB)F|)9Ij;0>HAY(C;R#R4VyF%%xJvpA_%2#|>I*|LD-dD^>wm-#zd@
zy~AJH*a5&RRyjJf`bk<eE1Rz=zB2vw-2-1KH8I}hu*UtGNiJWY+g7BFET@;tq>U_H
zrC7-q*sqxwH0C>#Kh$m3F@SEn_p*$3BQoB|E#MWa<no1nyX)8(?OsQVx&_vE5BhI<
zns`H30Kn454o0(1w>@Yx7-V&kxsFXPUm%w+;1V70*aQImb6{9+Yy5qX^Wr-8$mgVZ
ze>((+JIdt?lq(ve-Jo32y^KC|yr_aL8?1my#wNgAJ;rrx?z|g}Et5O%2G_AMSC8Y1
zc20tcyN*rT$VNUJx&?X%hW5)_n(MC?-DVxHSfyOioSdyK>;VXal^d+o@1NgCK0kIM
zT5JFIg~MLymhH`ZPA`|KwK8OW<QF;t0L53P5Agi@9Hmrbypa<L`|+^olMe*3|10qd
zA%qY@2qA<JLI@$mlbHG+(<EyK!p4rv*qfop0VGv3Fg&(WYUK7e4pSun1~mgpjn)h(
zrN}+h49v@Z&BSOo@QPKs&3deT&%6bas2K<w`^(2Sv5XaYJ^omdH3P$wkMo9lrUV3m
zJoXed1M|9?pZW}d<ZA||z4M>NObJM`W*}{3N2)&JGIath%SxSGtWmCLT*t;c`+)1%
zy_$iG`PK|rmX!+b`Qu(~GoJz9uHIs<-m<-S&*|kAwW|yn^05XLMkxi?=lm?cj5P@}
kzqKT52DH|`-1o=q7ZxU11gY>$ga7~l07*qoM6N<$f*<l{HUIzs

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json
new file mode 100644
index 0000000000..a0e86f87fd
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png
index f64c76e54c3706d6d904001c12d2012881554fdf..d5d1d5c979ed2344563c1ff14bd6b2c7a6f1ebe2 100644
GIT binary patch
delta 713
zcmV;)0yh1n3f2XX8Gi!+005o0f$RVP0Ao;0R7L*)0Dyo1)2RUxJXsxNrT_m83rd6w
zM1%k<QUEw>085V<QilKk02)`0;l~MpfPgwWI#W|q6jF*PZm$4fxC=~#5I0;6ElM0=
zpcP7a4k|<!M{_JJEHYbxE>m_5Dn$=1NXO?KQ2+n{0d!JMQ-1(J=GbNc003-yR9JLG
zWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TB
zGg33tGfE(w;*!LYR3K9+IkBK5F*8qzi!&v&s2HS;i!-e#F*g;&Hsn%PaP@Nm8w>z=
zl^X7HbXk%B0Dl3gNkl<ZScUDDTXTXi5QVeRAW13pg1Ml8|NmEZ2~}q*XL;#^o#Bj`
zJbatO3GA3CwQAM7iFBScLB82;w;O?*f~UfO3g)}AEO&@o=bSB6k>^>ijdLH)84dWT
zs;Kh(S}}3==>X>fTQbSR&KhL?DR4`=HeaUJWM3=p+<yQ*7N|!8HEW<A31+w=Q>#Y;
zRh!>0`pymDS<eLXdL{sRCcxYXT<s6sE1C{_#7PtJKwR0o5I-J|c|Zf+Ujh1Xdcf&4
z{se=jDVhcwxSS92(ZDJz7>p<vy|DqmA7PJ6Tv5&a$^$mi0$;Ui)!*soh9C<6tLGa4
zot4K0UVohlT@P5n#~8if!0U5KKn5|U5Pj7mgSPT9q!<MQ4v`W(`^uE~@q$5$A)k-P
zARnB8V<H2e!bLiL$K&}D5`G6{D3F|hauML3ymw0poaZuRP}B9glwhnt2JOVPK?dAI
z`3dMdx50bQpBXn2Hwu>o+$bSP>nDeR*RzAXenN5()+^pXhrUr(=y(&NLD$O$eYarH
v4>!r+HuOsg2J!HwK~6x6hd+T^?tj)dl-D3^0k3TT00000NkvXXu0mjf`L8oo

delta 1309
zcmV+&1>*YF1*Hm*8Gi-<0063Kaozv`1nfyfK~#90?V8U|8%Gq!zYDnhu#J!%NI@~A
z5>;bjH&UcFs7h}>w1yK_D@BTW>WxcjPm!WBL|iE+{(&kvKm`|4lt$c;5?T-uHDDt}
z0z(BM1eD+(H9ubuX4kv6!8^OQk(&8P7CWBZ_kHs``}VOjfPX+B5C{YUfk2QK#z4Vg
ziE{M?hb3YRIr|E&@3?)3T;D%ZK91XWsOb8#IFX&K{(i#sF6CqO_Y;x5s7`3~eHr>b
z<NA`Wv)a1}&en8$=OwI;M#Lj?u(sSpe0LL>{g@uoXPZMm_}!22d~1W$`2YaWSotqD
z_p1Q_^!R5ijDN)7{q+|v{ro3o4*nE++yh%jKVrY%htxTkeO;k~aE3krG}#Cnu`?ue
z>X+$uWalNYI;AwF&OyW@bK1eLPNmK(1{wM}F`$2bgyiU-8f9M%A>fu!+gyd__6qd%
z{e<4$0jy0QVQ(#o(GY<>=}uiMUuR|(<k6QgqhE1er+<d&A&Eu1h+X|M{oU#m*vtb>
z8;e5{+Pe#%2y^IX-2#QyXADGSr^xealH0*yi6YOdiO5cjF{NLffz$owo(TE$<&PPC
zzUg_ri;yt`vf7Jdh0FeV^mEUEBI@g%0j1JEYX<P3KL-GK`t%C~gN^WdM-f<)(AztJ
zg^?IWLw|%|Fo4a?O#sh$ec;juo*{rF`u<3dHQ<&o8X~2i2fpc|C%F`|0Lr0%si{S2
zzS)Q%v(2l|H3I->Dn2X45tpp#zGBq?D&A~FaP4!Sa(wB^#{huvUz3LH@dp3^>fNco
zuV>T8+aW`yxN){>2CE#a>IEM3SAv;@#}S{nFMlCCZrFq&>fPyCC{K51Yx;-a#CQPy
zC%pFoFqQ){r+s)FXZ^=kaJEC)_j(DEFMw1bA{QZYd8%%gq7b@BeSttA5C{YUfj}U5
zzd3K8z(r7sSMmz#b$Z4?*3NzcfVx|EOBN7W%i7sb^6HV%AaK1xwtM|lUgLnR&8K`9
zTYs9wVf{74SLRS>tHIkp9~SSmI8uXu8%x0Y(M?#k!&$x@Cw37HPU!Z5`<0k1xWBcG
zce5j~wfSJ#4uclPa1wpRYmS?f=qu2|m@@cxvm@BwTGsf+gW-3A$@O`Z*Ej$G7N-jh
z9rv&&)fzRYn?0!(4ITGjak>Bi<uwi@*MH{?+v9#GxWBcG%FCYs0Dk!TAp-74n*9Q7
zam=tYdSKsts@;>&LKqnJE57k!C<j=aE+p6IQPbqcR>hU{3B_KW1+rF%FCYDb#6}2J
zt{XVqS?A6HT-d#SCF?Q<lH2Ol;-UzvP_Ia<eNg+vV~^_=kned(ik?Pz0<3wE*niCF
z3HkQ$6ae<y-`ZU%!5)bP0mh<W3?%zl6mmW5FM0;(@v&gkw)wJ*dpsUe7e_@CKSf>i
zcs!mgy<9$?2UoJFZSxV8f1o6px?6Y2;&drbh1k+$NeUr#EpoWCu4vl5ev*z4u(vd+
z+XrrE<sbk+mFq@H2QQNu1i2329e+GvAOJur2$feqyO6=lWCme>b%uNJfWb<z%>JQr
z+;9-Vabnkq8B-i5cF}MU$>|dhrk2MW4k9>8#?6>8#ZfY@34#$!1>h(d$4cl0%5Y-J
z2_ux@1S_Ezrhfoa0jQ`-ZIJ2-JTc{j5oAr-hmxY+!g`Tw^4cOy><thI3>NSoTAM|#
TlTFrr00000NkvXXu0mjf&_8%h