From 360acd1d8295d26dc48f11a431108e50f17f9e47 Mon Sep 17 00:00:00 2001
From: flyingkarii <123355664+flyingkarii@users.noreply.github.com>
Date: Tue, 5 Nov 2024 02:43:11 -0400
Subject: [PATCH 1/9] Merge pull request #8 from KyuPolaris/prescriptionfix

Prescription Medhud/Sechud Fix
---
 Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/hud.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/hud.yml
index 1e8a64b0df4..f11cb930f04 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/hud.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/hud.yml
@@ -11,6 +11,7 @@
   - type: Construction
     graph: PrescriptionMedHud
     node: prescmedhud
+  - type: VisionCorrection
   - type: ShowHealthBars
     damageContainers:
     - Biological
@@ -31,6 +32,7 @@
     sprite: DeltaV/Clothing/Eyes/Hud/prescsechud.rsi
   - type: Clothing
     sprite: DeltaV/Clothing/Eyes/Hud/prescsechud.rsi
+  - type: VisionCorrection
   - type: Construction
     graph: PrescriptionSecHud
     node: prescsechud

From 02f53bcdebdae855cbc9b3a111d45851aee52567 Mon Sep 17 00:00:00 2001
From: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Date: Tue, 31 Dec 2024 16:48:35 -0400
Subject: [PATCH 2/9] Added Cap Trenchcoat (#108)

<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Added a fashionable Captain's Armored Trenchcoat.

---

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl: Rosycup
- add: Added an armored trenchcoat for the Captain. Enjoy your swag!
---
 .../Catalog/Fills/Lockers/heads.yml           |   3 +-
 .../Entities/Clothing/OuterClothing/coats.yml |  10 +++++++
 .../TheDen/Loadouts/Jobs/Command/captain.yml  |  14 ++++++++++
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 1318 bytes
 .../Coats/cap_trenchcoat.rsi/icon.png         | Bin 0 -> 535 bytes
 .../Coats/cap_trenchcoat.rsi/inhand-left.png  | Bin 0 -> 759 bytes
 .../Coats/cap_trenchcoat.rsi/inhand-right.png | Bin 0 -> 709 bytes
 .../Coats/cap_trenchcoat.rsi/meta.json        |  26 ++++++++++++++++++
 8 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Prototypes/TheDen/Entities/Clothing/OuterClothing/coats.yml
 create mode 100644 Resources/Prototypes/TheDen/Loadouts/Jobs/Command/captain.yml
 create mode 100644 Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/equipped-OUTERCLOTHING.png
 create mode 100644 Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/icon.png
 create mode 100644 Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/inhand-left.png
 create mode 100644 Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/inhand-right.png
 create mode 100644 Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/meta.json

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index fec4f3ffcf0..b364e7e8388 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -54,6 +54,7 @@
   components:
   - type: StorageFill
     contents:
+      - id: ClothingOuterCoatCapTrench # TheDen
       - id: NukeDisk
       - id: PinpointerNuclear
       - id: CaptainIDCard
@@ -331,4 +332,4 @@
     - id: JetpackBlue
     - id: SpaceCash1000
     - id: BeachBall
-    - id: BikeHorn
\ No newline at end of file
+    - id: BikeHorn
diff --git a/Resources/Prototypes/TheDen/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/TheDen/Entities/Clothing/OuterClothing/coats.yml
new file mode 100644
index 00000000000..42de89a2a0c
--- /dev/null
+++ b/Resources/Prototypes/TheDen/Entities/Clothing/OuterClothing/coats.yml
@@ -0,0 +1,10 @@
+- type: entity
+  parent: [ClothingOuterArmorCaptainCarapace, ClothingOuterStorageBase]
+  id: ClothingOuterCoatCapTrench
+  name: captain's armored trenchcoat
+  description: A greatcoat enhanced with a special alloy for some extra protection and style for those with a commanding presence, outfitted with emblems and decor befitting its wearer. Issued only to the station's finest.
+  components:
+  - type: Sprite
+    sprite: TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi
+  - type: Clothing
+    sprite: TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi
diff --git a/Resources/Prototypes/TheDen/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/TheDen/Loadouts/Jobs/Command/captain.yml
new file mode 100644
index 00000000000..424fb7d4bf8
--- /dev/null
+++ b/Resources/Prototypes/TheDen/Loadouts/Jobs/Command/captain.yml
@@ -0,0 +1,14 @@
+- type: loadout
+  id: LoadoutCaptainOuterTrench
+  category: JobsCommandCaptain
+  cost: 0
+  exclusive: true
+  canBeHeirloom: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutCaptainOuter
+    - !type:CharacterJobRequirement
+      jobs:
+        - Captain
+  items:
+    - ClothingOuterCoatCapTrench
diff --git a/Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..497ea69bfaaa6a8b902094bd5d5971374b17f8a6
GIT binary patch
literal 1318
zcmV+>1=;$EP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000E-Nkl<ZcmeI2
zKWJ4+6viheg(Lw3k6<AtsH8K3B5t#VwT(@%a90qltSoF&h=o|#Y_XM<u&`<&+iYWP
zvCV=g7#k5?UY0Eu2`D7N!tlJm_xP?S^X9&HXWo5*;0#=5=FH6b&iUrgy?17u%ONw6
z8ORJ|1~LPgfy}^n%D_a5--k|}?|gdotZeJ&Q*_pC16EaCYg1JnUw*(BROKJ9E_OOE
ze(J0}IM-QNSa33gm^^aIsaK_A6ghgqXti1nJpVyXc`Sa}i^Gh=xw)(Vb%D3Gw%o?X
zhJ$ek0DNX<#;vcfyN|yeaT8}A)z&)<SLNWJx;@#&kj#%E<<*^?DEwL@04Jwb-Z&h^
z$xuK}IrTI;LiJK)=sR)qvx9g7j)J9!Jb`lR#o!Mm0A&CT3h#b7=>EE~T~?ufj1gtS
zKtlM8I3C&Z=g<E-Jv2jZ>(s>`N<hG-KGEx!Z{6D4|NG=k3N|-4cc}yK<msh8T)*C~
zMuE&g0xbKqZMWMc(^l7yzfQYbf1mA^BUew=?FFmLrhR;zL${^^#1ph8$@v)kfdt4H
z6z{x$-d)(FTxG->ex#`<L&!G~EI#_M0m3gnJlc)PE5zbYsbMJY&Fk%An0;`U?|rLr
z_lM{1`qN{jz|a4F>4RHd>T$b#t*jQE2;qxt>okgyi})D)sMpox@w1)T+1awk?Q0N&
z{GN*Tct`{Asj|4Z*jJP3Nzh2`t56}RH3j^(^tcUv-j+3;rUP&mOx^;-<dLU@fm5JL
zA@i@8iDj{$FAK($z}f3h<?yk>`E;P#Bft)SzsJcl2Qf^;G~J|dOW}u0d(ssA+5`Zh
z1&AKkf<sK6HGuN{7NQ8SD=#Z8K{07tPJTaxq&0v~->H@PVz|$Dt~_z>%O3~b+|~Wy
zZoiGSM*uy|dzrsI{tETFAtsNUayugW;nF3-M*~yMe~_o(*ZvN$pS9X}U||vwp>m9B
zDrgae=&C?R#D0s^CLjcA2?&*sLuQHg^{ZoidCq4BG6R``%s^%!Gmsg`3}gl}1DS!$
zfX6`e-(c0>*k1pMHDyQAj*#8^<5--q?si|A@Q7|Si}UtGSjtnj<f2D_E+8x~9d?`v
z5+FqP1I9fP<h;%U!Do|12eg;(wWEBB8UZ+u<DAN}`=XJM!aRnj201VM-j>`_SKZ@P
z*NGt^ihwIm=8L`m>EeRIWOwU{?WfQ&RjOlk+p#J8`sH?UINB;tq<gnVrVG2~3pMS!
zs$A_&QL9nM)2YW%R#!?|!=1LWK{mzeiy8q{${C7#ISp8QS}l&}Mh{6Nz{1LL%|}}{
zuC%a(Jqk|L2w-o%ckbW2GoS-X47q>dpIvtbMlotwTh1cw{e*9JxxTv$!*oTxGD6$n
z`XJFX*o)VouyD@D3)wh`gpsF!l=~;fl8+;9600!+?1}L>oR&_VMk_yR98Ca2OrUo7
zH`y!FUloI;Phr_WU29uaTVEc%23Q5WgEb$CxvHYGLR+uNG*0sI#li~-+)!my*brkw
z^aub5$MpeXUq$0O8Me+@3|-r`_Sm|0(n$n_6mwz8zM4XHnvj9Pr*KmtY6|FQ2ylLg
zY~Y8)e<j)SCezG&|Cn62M!7;8^D`7hfL&xX1?1RXIWIiB_#w0FK+GB-eL2nyWCk(=
c-z5WI0bv7zQ2xVC>i_@%07*qoM6N<$f&ie4<p2Nx

literal 0
HcmV?d00001

diff --git a/Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/icon.png b/Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..7509dcb3db6d94b1bba85ee40f853c3b6ad2a5f6
GIT binary patch
literal 535
zcmV+y0_gpTP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005rNkl<ZSPAV_
zJxc>Y5S_#nfdmYMR6-7fbSfx8TYp5b@B{J>Y%MG;Z2Sp=AX<ox|G>gV2nxnVf<jJG
zgb+|jtd!GtGRN+6w>wE=;Z1Y<cHg|6otfPuN-fR6f6qW>ngq-)tp}#x`@{8AT3J&l
z37_wIL2$Pfw2xPVYPG7-fH9AC@U%q-5JwI1QnN?cY&;&*a5$vVXhg+gk;>&V6$%CN
zeV^V=<|wmrCe{^Y04dKkp2Cf=Nt|IGfq)lRqBtMSIRk(ggl+bGl&72BkB9=kGzez^
zk*a0zc;BIRr*B~-FIj8Fr{{V@#`C<e{upx)V2o3DyIl;UzJQ<Wc8D^7jlN!5VXzQ2
zO9G5}7<k}I%^CpedbRyZryB!J?_jNE#o)tF?F-F80oD>Iyl^-(Uk~`&aal~vnKFHo
zur&ioPOc0j`Nhpo6~O*&UDGnLw&(!j0MzuyWdMzca)9U9Q(G1X059%#oR~WuU*Ndg
zq3x6aCJKPB8npOk@E3FHI<UlY5|YWm)0=Bl!s(rh3VmMYsnj%CGAs@NCta*%X<@nc
zvsq752gYCU_embm=ApK11>$!={kd@cRb@0Fo9p>y9=_rLK$dj)qz@5vQ%f_DX5ddV
Z@C~9M#>PmSi5UO@002ovPDHLkV1hgP?g;<@

literal 0
HcmV?d00001

diff --git a/Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/inhand-left.png b/Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..3079c4ca6d0b79dcd49b3aaa125469a2a1176d46
GIT binary patch
literal 759
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVA|*D;uuoF_;%Jt@7s<d$Ms(Y
zcpOmdNM51fVX#zeVfJpX=}IL6Zy!CWU$7;aTkqUE-Ca|I1g_uO=$dg+h|BeKzn`lS
zN9Szc&wpQ9pHu$(RIk$B^@p5F`S*8scbCuK{rm5O@8=}cgcKNYq8F17d^nPG`#o2r
z`Ofvvum67e_%_E%{#K3F7dh+0ZrzXLnR#pSb1^2hz_nq#Pcry7GRtl>{aA7D+evN@
z#VadyY%Ri9hOF`07-90Y>TbfPwPB}EO;#~{e*E{$<X_uzp8Gxg@p$){ee3cvB6Haj
z9DD>abAL@fE8W{Rb@`zK_BWjF@44LZjiKPz)8{w)Zay)R&k?G04!FsfKY#8F{_g#{
zr^ETbU*7a&#RA!?y_2$6-^`g+v@@rE@2_u{*HtYmsPkSL^vYnH!94B=N1r9vZ+@RE
z9=-0*mjwT-@i)S5GOnAfar%_^yY1~)Qn%k(CEIX4Jh$l1o%+A#v4v}t;u_oS|IcXs
zs*?3}$@?#7mOKru*dUsExa^F^3aOUM5~uIJyPG2UFD7%+zI|u4z1B=%;KYOO7%<kH
zE#3d(-UjQLho1{cIJ#(<smy!%v|ehrV_)lfDe;2GKOYr)c*K+>7jYia*)!j$-8%nL
zWx^+pllk_41!a0pvNjxH-YEQup`r88wk3}5lvl_$UaaoFHKXF*!<?BWMF(7^p4c@>
zF_?FBW*7uzc-Vx#`^<kp|DCeL?Bg?nm=#v{%P1Btx%FwfQ%-=%k;?CUj9*l_bS+aB
zez-c1@g1{(fZ6jpSNE2O6+VYHCtUc=krkfOXZ9}Q{{DK~*DWWGTYc>|&XO+DN_aYb
z(#8_?HE-_qO1T2#%k<8~y8=74uj`y%9q`z$X<7XBH0}$vAMU1He<r}btCi&+V}zmp
V-f3(%p8^v!gQu&X%Q~loCIBihV{ZTe

literal 0
HcmV?d00001

diff --git a/Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/inhand-right.png b/Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..d74e6a4eff7b242b36a14109db4e8e5a1c12b4ae
GIT binary patch
literal 709
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVCwO7aSW+od^>BuH?yJ0@#MD(
zTOI@)*{HEYM4OK_{O(;A_Ih1Ezja-GTzdaRo0=ayc%;?Tt)!(9>$1?IvqT`ud~F@G
z{*v@}?Mv^?{lP1<vwG)~eea9)Eq917jqqq-!G-?WHr{*a#oaF6a{Ad`_1x=;vy9^o
z{?0yn?W~*IR4>)kay@_jOzT^FYcG}LX3Nc+#d-Bka<}{Qq>ULqJ7fGpSBLU0zL_Ic
zy*4cPegE{_THoYD>IJt{5Bh)J&f$=LCuaTitG`~Xl=IHI@js}MKXKM(M?PISo)^!~
ze(quuD#?$!_27%YS2W9;v-?&oZdJc5e_bP5c>1xnvW?QoU4C4xO_LU1%*aS}oHh5e
zM7E>d{BR?NYpfHFmPS3_x2O5v#*^Dj6?}@LSxzVfou0i-+2PiusMELIdzI{dyexHN
zuq%B!(b06@--Y)rl$hopyZt-ebbD~|w~y5hcfMV_x~H>Y_v`A%&GY$|8-LQ>diZYY
zXK9nn-5ITXx7(MLe*CH8z=Q_{ay-yq|982$*ZdXVS=8L#IR0_@GtHoK+mhFB*KFNV
zy10+U!R5%_bcTY7GtP?XZCUS8`+Mnr>(+-pJvW*iTYT-$*)o61S+Zl|>M14HAD>KI
zk$1a&!DkP_2F6Pp(iu3TWbUzKOlVHbZT!s~GxzZw<Ax(?l`5a7-Ve4i&UJsZ+B=4Q
z+Xaq>jwRoC6a=H=_FZ_`r>P*=uq#^iQ_P_npRDr?Vh^W2R@}^X;Ah@i=7oX}RCRxT
zv-r-FaBJ?`eJk7V+7(xnmR8AHGEKT?+`zGAZjbF-UdA{<z1g~xo~ul#W19alNpDiR
Tn8kNs@?`LI^>bP0l+XkK6NWx*

literal 0
HcmV?d00001

diff --git a/Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/meta.json b/Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/meta.json
new file mode 100644
index 00000000000..7941023219b
--- /dev/null
+++ b/Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.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/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by Rosycup.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

From d137d1ec00d9cb990c95e5cd95ed59e9f607ecaf Mon Sep 17 00:00:00 2001
From: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Date: Wed, 1 Jan 2025 12:15:19 -0400
Subject: [PATCH 3/9] Summer Security Uniform Sprite Fix (#116)

<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Fixed sec's summer uniform sprite having uneven pants.

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- fix: Fixed uneven pants leg on summer security uniforms.
---
 .../equipped-INNERCLOTHING.png                 | Bin 422 -> 1125 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Resources/Textures/Nyanotrasen/Clothing/Uniforms/Jumpsuit/summer_security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Nyanotrasen/Clothing/Uniforms/Jumpsuit/summer_security.rsi/equipped-INNERCLOTHING.png
index 29212f6ca00c4fdef46023911d41d3ea45b16589..71aaaaafebe5c60b60fc461f27b378d1b0117818 100644
GIT binary patch
delta 1116
zcmV-i1f%<=1LX*i7=H)`00020X>r~F00b;aL_t(|0qvU4N*qBD##>oXL{`Z`i0I8r
z2$BboJVEYxwmd`bc>>83h~(l?i0mOm5m8*+^sn7-=rrR_SGzMB(gnNyXL{<Z{<^AW
zm~Q8)R0b*om4V7YWuP)p8K?~WpA4*6rhVkxY<o0v#~T~&>VN90xpzDs&pzJVxZl&M
z`|e!RZ_%AI_S0xI1LI^o4#Pbzc7*z&FR|_0bZWxS9t`-~^>z2ggZ}bhUsqS14EX%;
z(DeVjy)_$=J9+RC*#K5-6W6TxtK8Hjto-|(on{yYFzF8$7onsrVI1StUPc+?3yV^d
z2Sfc<{85*ItbaU8S#{VI5T)wU!FA+lch_xCCNrx$N>5xqg&&Vmy#&A01Bmx8*Vh4q
z_=AWxp`Ysr<GF7cvIsw3fKvSI96+K|qKRFPNy<BvpyC9%3=+^0<HzAB{il;jSO5~F
z1-~-{1b|YXWt&8(e#&Mgd<a;;V;x;};WG}x8_ao|et(_<R{YKoK(RzFu69~>T~Ehb
z+vwMmAibCV5_}T@Dd<bJ<JHH8v~95~I|QUunKlMh4$zoBOW~&&PxYtc(sp(d<VF$^
zrII0a1lQBsnKcF<HRSyZf6-_wzS#qI{5!!(iv{#gd?xNwJOOUq$NJjZT7bE{ymVVz
zTcLh;cYo(@ACs`j1Tz6>-{0R4AUFQ~e`Ef<$AF>5uXaN~DYl6KRsi-j+57wZrcOWC
zF{)1ihn1J8jwj#&Rw;f80Cs+UzET2eH8LGf7$AywwbOAq?P3CQl>ZB3Od$}vx9TcO
z5|EW3VR4`8Du=+g+FQq01}X!UfyzK-pfXSysDBJp1}X!UfyzK-;FU69`YNnB=$wGs
z>3IS5_gV6Vm@^3yzD$>#O)wL{<lk*>{<Rswz5wS15dVR~tW%T7DVaFqbS6RfV8ai;
zDQhLcWNds$0^oR$uG9ccAh%2xAhm%F63e!{>6;*KrX3hfScbDxglF_EsrRw!*n(i2
zb$@@*^i5E^KgXOG@GgJoLE{w&Rt)&3iHGpRCY?zze3~~A&=TJ>c?2GydY>GC0Tz=N
zUW;AXCYT6FwXz={AC?GP*Q`X3qV4f!bJi2$d}x-6DF?KHG={WY?743l*d_wV!10{O
zwu-~Jf2caxX~s`&?6T!qA%JqlVOsA3E`PngY&??(=qV5z&s!iy@v}aHVm-NaJ&M6=
zJBik2<09Rr7a`ul*a2o!6r~3T2O%Wla{<rE$cqfsHN6Sa=1c-|c6Ju*+1uNjd3@8`
zsEGi;L_)kHt1W90!?-?$iLxE8ZF;b@H)ve|a}JmTgq7E64fg1Vnmm)8V>Kj{PE{UV
zrX0Wx5=~z1mn!kT*c+{O6cIokkl=>I-OvJN90IXT7F*0AAmzB7Tu*&Nmn7fPi4SdS
i#j6Zd1}X!ul7T<a;X(}t5|kYP0000<MNUMnLSTZqT@UO4

delta 408
zcmV;J0cZZ@2&My&7=Hu<00013M{Ml?0016POjJbx000gS4jddDAt50oBqS><D?0!H
zO9TXD3=DP}8tXyXZ2$lO0d!JMQvg8b*k%9#0X9iQK~zY`?UX%k!!Qg+DWkC0$OxQ{
zj*;G@4&npUO?GEW#(441*u}CgP?NXq%1=PkrAyIpd%^=D3V-@Y^r+vgxFypmPR^;l
zXkp;=nQw}{^RwcZ#d-eJ%%Ye^CnAf#DQ3-NCoeL6tiEHSY!L1=k0P2W@gh$1Al$>4
zUS!fd3r}~2fGHk?JK%ZNOeX6)tJzv>K`5;)6-QNl+JjKNpHO&1Av*34wdQ(T)F|Y;
z`VRjrm|~S~?|<;4{@a4+TRhnG4e(VMzPa@noWwI8T*d2!Lh(2WYr)HPX&_0NM}g0F
zg|{3QjiYOVF_N&uEfm5#pb!&<9f%qf1_z7Np<swMurMwyk)FcjPbI$O`Za<v(?gYG
znh%&wgJC9m+2cEzDin?=L{*8x`j}&f!v5v&`~{QzW)TUCF}{=l0000<MNUMnLSTZ&
CgtNf_


From ecd480fdee2443a00bd7e9d4dc9cc6d85208ae16 Mon Sep 17 00:00:00 2001
From: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Date: Fri, 3 Jan 2025 23:54:45 -0400
Subject: [PATCH 4/9] Update humanoid-character-profile.ftl (#123)

Fixes the pronouns in the character preview to not show they/them
pronouns for characters that use it/its

<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

This just adds another condition in the fluent file that controls the
character preview text.

Essentially, characters that use it/its pronouns will go from:

"This is [character]. They are X years old."

to

"This is [character]. It is X years old."

---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [x] Probably test it, maybe.

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl: Azzy
- fix: Fixed they/them pronouns being displayed for it/its characters in
the character preview.
---
 .../Locale/en-US/preferences/humanoid-character-profile.ftl    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Resources/Locale/en-US/preferences/humanoid-character-profile.ftl b/Resources/Locale/en-US/preferences/humanoid-character-profile.ftl
index 800da35ba52..9058f8d2b63 100644
--- a/Resources/Locale/en-US/preferences/humanoid-character-profile.ftl
+++ b/Resources/Locale/en-US/preferences/humanoid-character-profile.ftl
@@ -5,5 +5,6 @@ humanoid-character-profile-summary =
     This is {$name}. {$gender ->
     [male] He is
     [female] She is
+    [neuter] It is
     *[other] They are
-} {$age} years old.
\ No newline at end of file
+} {$age} years old.

From 84aa94e3bdd96d39330a6db0c48bbb9b786e7cf6 Mon Sep 17 00:00:00 2001
From: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Date: Sat, 4 Jan 2025 20:24:49 -0400
Subject: [PATCH 5/9] CMO Turtlenecks Loadout (Again) (#124)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

Re-adds CMO Turtleneck to the loadout (I swear to fucking god if I have
to re-add it again I am going to commit many war crimes)

---

# TODO

- [x] turtle neck 👍

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: CMO Turtleneck back to loadout
---
 .../Jobs/Medical/chiefMedicalOfficer.yml      |  4 +++
 .../Jobs/Medical/chiefMedicalOfficer.yml      | 26 +++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml
index 6e9bd02b4f6..d1a88dc09ca 100644
--- a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml
+++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml
@@ -91,3 +91,7 @@
       id: LoadoutChiefMedicalOfficerJumpsuit
     - type: loadout
       id: LoadoutChiefMedicalOfficerJumpskirt
+    - type: loadout
+      id: LoadoutChiefMedicalOfficerTurtleskirt # The Den
+    - type: loadout
+      id: LoadoutChiefMedicalOfficerTurtlesuit # The Den
diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml
index b5e82749cec..f99f2ec5aa6 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml
@@ -212,3 +212,29 @@
         - ChiefMedicalOfficer
   items:
     - ClothingUniformJumpskirtCMO
+
+- type: loadout 
+  id: LoadoutChiefMedicalOfficerTurtleskirt # The Den // LETS HOPE IT STICKS THIS TIME
+  category: JobsMedicalChiefMedicalOfficer
+  cost: 0
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutChiefMedicalOfficerUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - ChiefMedicalOfficer
+  items:
+    - ClothingUniformJumpskirtCMOTurtle
+
+- type: loadout
+  id: LoadoutChiefMedicalOfficerTurtlesuit # The Den
+  category: JobsMedicalChiefMedicalOfficer
+  cost: 0
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutChiefMedicalOfficerUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - ChiefMedicalOfficer
+  items:
+    - ClothingUniformJumpsuitCMOTurtle

From dcd258b9e7844600aae1db1eac6f59703248bf35 Mon Sep 17 00:00:00 2001
From: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Date: Sun, 10 Nov 2024 19:47:53 -0400
Subject: [PATCH 6/9] Merge pull request #31 from TheDenSS14/cmo-drip-dlc

CMO Drip DLC
---
 .../Catalog/Fills/Lockers/dressers.yml        |   3 ++
 .../Catalog/Fills/Lockers/medical.yml         |   2 ++
 .../Entities/Clothing/Head/misc.yml           |  11 +++++++
 .../Entities/Clothing/Uniforms/jumpskirts.yml |  11 +++++++
 .../Entities/Clothing/Uniforms/jumpsuits.yml  |  11 +++++++
 .../Entities/Structures/Machines/lathe.yml    |   2 ++
 .../Prototypes/Loadouts/loadout_groups.yml    |   0
 .../Prototypes/Recipes/Lathes/clothing.yml    |  16 ++++++++++
 .../Misc/head_mirror.rsi/equipped-HELMET.png  | Bin 0 -> 631 bytes
 .../Head/Misc/head_mirror.rsi/icon.png        | Bin 0 -> 714 bytes
 .../Head/Misc/head_mirror.rsi/inhand-left.png | Bin 0 -> 678 bytes
 .../Misc/head_mirror.rsi/inhand-right.png     | Bin 0 -> 680 bytes
 .../Head/Misc/head_mirror.rsi/meta.json       |  26 +++++++++++++++
 .../equipped-INNERCLOTHING-monkey.png         | Bin 0 -> 1183 bytes
 .../cmo_turtle.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1338 bytes
 .../Jumpskirt/cmo_turtle.rsi/icon.png         | Bin 0 -> 842 bytes
 .../Jumpskirt/cmo_turtle.rsi/inhand-left.png  | Bin 0 -> 893 bytes
 .../Jumpskirt/cmo_turtle.rsi/inhand-right.png | Bin 0 -> 921 bytes
 .../Jumpskirt/cmo_turtle.rsi/meta.json        |  30 ++++++++++++++++++
 .../equipped-INNERCLOTHING-monkey.png         | Bin 0 -> 1277 bytes
 .../cmo_turtle.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1449 bytes
 .../Uniforms/Jumpsuit/cmo_turtle.rsi/icon.png | Bin 0 -> 837 bytes
 .../Jumpsuit/cmo_turtle.rsi/inhand-left.png   | Bin 0 -> 892 bytes
 .../Jumpsuit/cmo_turtle.rsi/inhand-right.png  | Bin 0 -> 917 bytes
 .../Jumpsuit/cmo_turtle.rsi/meta.json         |  30 ++++++++++++++++++
 25 files changed, 142 insertions(+)
 create mode 100644 Resources/Prototypes/Loadouts/loadout_groups.yml
 create mode 100644 Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/equipped-HELMET.png
 create mode 100644 Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/meta.json

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
index 94e10d76eea..b1a92711584 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
@@ -39,7 +39,10 @@
       - id: ClothingNeckMantleCMO
       - id: ClothingCloakCmo
       - id: ClothingOuterCoatLabCmo
+      - id: ClothingUniformJumpsuitCMOTurtle
+      - id: ClothingUniformJumpskirtCMOTurtle
       - id: ClothingHeadHatBeretCmo
+      - id: ClothingHeadMirror
       - id: ClothingEyesGlasses
       - id: ClothingOuterWinterCMO
 
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
index f2177916830..e7a367c454c 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -45,6 +45,8 @@
     contents:
       - id: HandheldHealthAnalyzer
         prob: 0.6
+      - id: ClothingHeadMirror
+        prob: 0.1
       - id: ClothingHandsGlovesLatex
       - id: ClothingHeadsetMedical
       - id: ClothingEyesHudMedical
diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
index bd7899d75f8..0138d8aee47 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -86,6 +86,17 @@
   - type: Clothing
     sprite: Clothing/Head/Misc/pwig.rsi
 
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadMirror
+  name: head mirror
+  description: I doubt even the CMO knows how to use this thing.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Misc/head_mirror.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Misc/head_mirror.rsi
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatRichard
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
index 18266dc4988..7f6d59c9a49 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -132,6 +132,17 @@
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/cmo.rsi
 
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtCMOTurtle
+  name: chief medical officer's turtleneck jumpskirt
+  description: It's a turtleneck worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi
+
 - type: entity
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtDetective
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index d2339764f88..3ada362ce0b 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -350,6 +350,17 @@
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/cmo.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitCMOTurtle
+  name: chief medical officer's turtleneck jumpsuit
+  description: It's a turtleneck worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitDetective
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 75b593fbcc0..adf6bd94aa8 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -1106,6 +1106,8 @@
       - ClothingHeadHatBeretCmo
       - ClothingUniformJumpsuitCMO
       - ClothingUniformJumpskirtCMO
+      - ClothingUniformJumpsuitCMOTurtle
+      - ClothingUniformJumpskirtCMOTurtle
       - ClothingUniformJumpsuitDetective
       - ClothingUniformJumpskirtDetective
       - ClothingUniformJumpsuitEngineering
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml
index 729f20e9795..98cb1a3d51c 100644
--- a/Resources/Prototypes/Recipes/Lathes/clothing.yml
+++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml
@@ -217,6 +217,22 @@
     Cloth: 300
     Durathread: 100
 
+- type: latheRecipe
+  id: ClothingUniformJumpsuitCMOTurtle
+  result: ClothingUniformJumpsuitCMOTurtle
+  completetime: 4
+  materials:
+    Cloth: 300
+    Durathread: 100
+
+- type: latheRecipe
+  id: ClothingUniformJumpskirtCMOTurtle
+  result: ClothingUniformJumpskirtCMOTurtle
+  completetime: 4
+  materials:
+    Cloth: 300
+    Durathread: 100
+
 - type: latheRecipe
   id: ClothingUniformJumpsuitDetective
   result: ClothingUniformJumpsuitDetective
diff --git a/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0422f7aba6be89ab93f2588445541b243868bc3
GIT binary patch
literal 631
zcmV--0*L*IP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7x64t5ZA2vVIah>AE$6^me@v=v%)FuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La)
z#baVNw<-o+;YSDphA<*AQ%|H9Gw>W=_we!cF3PjK&;2?2l)T9RpGZ8%bi*RvAfDN@
zbk6(4VOEk9;&bA0gDyz?$aUG}H_k<e1)do;GO2muFtJ$dV7Y@?$xw->i6e@tQNECM
zS>e3JS*_Gq>z@3D!MwJT<~q$`#Ib|~k`N)IhB7L!5T#Wk#YBqsV;=rN$DbsZOs+B*
zITlcb3d!+<|H1EW&BD~An-q)z-7mKNF$x5Bfo9#dzmILZc>?&Kfh(=;uQq_$Ptxmc
zEph~ewt<W5wkGcZmpj0~lP(#OBl&3xg#z$?M&FbJ`fq{WHMh6cK29Hi40W}90~{Oz
zV@1kd_jq?tXK(+WY4!I5UWsy_q!iI$00024Nkl<Zc%1FpI}XAy5QO0YvA$0_SH4ot
zl3S(AeLRIJ5JHha2rCIf{9nJ1V!Is)_-m)$!fBdXM98+raqRB%ZRg&?h|n+$iij=u
zIo##bf}C?pDap2$Wsz-_Qd+H5^E~f<2|4E`Nhu}WFR<1sNr%h_0000000000002n0
z+`upO?#>6ivS(gkkKSGR0O|3cm$drP+um}&729v;lMw&_000000002Mb5~3GKhoz8
R53m3L002ovPDHLkV1iw{AdLV3

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f382faa4209b1ee713e4570f5d7058c6fe01eaf6
GIT binary patch
literal 714
zcmV;*0yX`KP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7x64t5ZA2vVIah>AE$6^me@v=v%)FuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La)
z#baVNw<-o+;YSDphA<*AQ%|H9Gw>W=_we!cF3PjK&;2?2l)T9RpGZ8%bi*RvAfDN@
zbk6(4VOEk9;&bA0gDyz?$aUG}H_k<e1)do;GO2muFtJ$dV7Y@?$xw->i6e@tQNECM
zS>e3JS*_Gq>z@3D!MwJT<~q$`#Ib|~k`N)IhB7L!5T#Wk#YBqsV;=rN$DbsZOs+B*
zITlcb3d!+<|H1EW&BD~An-q)z-7mKNF$x5Bfo9#dzmILZc>?&Kfh(=;uQq_$Ptxmc
zEph~ewt<W5wkGcZmpj0~lP(#OBl&3xg#z$?M&FbJ`fq{WHMh6cK29Hi40W}90~{Oz
zV@1kd_jq?tXK(+WY4!I5UWsy_q!iI$00032Nkl<ZScUDBK?=e!5JkTtWEH5;Zsr0O
zdX^lZ7Z7yQvvi~21$uy<rJxtcrV9mES=CiT(P$<GabX@5+VV61Gsy&qL?V$Nvj|<F
zlp1`Rwr$yU*+Qk%(Dyx8jx5VqL0AE%=C|wJt54RF9l{&n+5CLzyle7JF>pgHeZ@k}
z0pNV;7GtM;+vW`rYVHd0iB(9^XX?7P6H!%F@I(R34!kobB8<;8%+~{q=2A+eX$mRj
z>=3g%002S=5D|nBvum)<K(dz38_*a7tu>4>_TN;;xwwL6dP-TAAR_y%wMNr4FFM}@
wu}*HjDV%$|+i&gr@o;jk4ISS|Bog^Q9)Oy1lIb3Z+5i9m07*qoM6N<$f>6OnhX4Qo

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4cd0d9464abff095ed8837340d05223668c72dd
GIT binary patch
literal 678
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~J8Fb`J1#c2+1T%1_J8No8Qr
zm{>c}*5j~)%+dJZrAoSdWdemA0dsXax;XTLjw(fH<hF*%`sn>_QsedP>R$XHs^CNN
z##av>ty$f?T7jdk!NS@?bC*Zwe{U|`BpZu&$9Grv?=Ek+u)^T#8!7gXvqnK5XUsUe
zwyQCmL&AY$v&6I+E7dP`OIGx)um16)O8jZ$z32aA6jk$$4yX&AH@v%{!@Og;x$fN0
zc7-#hs<i%?Q*mYiw~&2NY}wD=;){um>219}S@SG>bi}M9-X(+?g*?)H)UhaQihfFL
zm_>eJn6~M)UF!9T2J6=@+38ozQK+NXsN!;B#ljvg9hc0j9)=Sa{hiTXf8nG0N!7`#
zdEEL~Ll!y}{drLTVR!Uq1IveMtjP}FyL0P%7#d?2L~eikKKXXuJcfVi54^H}ujWm7
zHu+0cbhiv+?d=0cOQR=$Z#XTR@W69A&&i2@Oj?~7E9@8NpJM#G-QoSL+tJzb%lRGJ
zc17)D<l}3+sFb?Cde83Vo441W-}37><L%y}i{~y(+zgBtwj^(N7l!{JxM1({$v_d#
z0*}aI1_o|n5N2eUHAey{$X?><>&pIuNrK;!adqKSKcLVePZ!6Kid%1QZR9;{z~d5V
zb)ZtEaVpy-v#dS6;upMhW=Jw=`{n!(U!}0HIifQSr~?Qprlpo0%)M=-<TGjOwQ2SI
z4@`F_xI}0kReB_(pOD3{_1ct_WS+?>Td&oe(b-vDS5&t|4Wbc5{)u^SyZ%b{ueydM
zmk-Umn4QJ&ZeF^co6C`h`d^;%B|m?+bKPpsO||#)3)O+DYi>(VzO1cs^55;%AkChx
KelF{r5}E*&nI7E$

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab53a413c699989a91782ca0b44add74e7d053d8
GIT binary patch
literal 680
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~J8Fb`J1#c2+1T%1_J8No8Qr
zm{>c}*5j~)%+dJZrAoSdWdemA0dsXax;XTLjw(fH<hF*%`sn>_QsedP>R$XHs^CNN
z##av>ty$f?T7jdk!NS@?bC*Zwe{U|`BpZu&$9Grv?=Ek+u)^T#8!7gXvqnK5XUsUe
zwyQCmL&AY$v&6I+E7dP`OIGx)um16)O8jZ$z32aA6jk$$4yX&AH@v%{!@Og;x$fN0
zc7-#hs<i%?Q*mYiw~&2NY}wD=;){um>219}S@SG>bi}M9-X(+?g*?)H)UhaQihfFL
zm_>eJn6~M)UF!9T2J6=@+38ozQK+NXsN!;B#ljvg9hc0j9)=Sa{hiTXf8nG0N!7`#
zdEEL~Ll!y}{drLTVR!Uq1IveMtjP}FyL0P%7#d?2L~eikKKXXuJcfVi54^H}ujWm7
zHu+0cbhiv+?d=0cOQR=$Z#XTR@W69A&&i2@Oj?~7E9@8NpJM#G-QoSL+tJzb%lRGJ
zc17)D<l}3+sFb?Cde83Vo441W-}37><L%y}i{~y(+zgBtwj^(N7l!{JxM1({$v_d#
z0*}aI1_o|n5N2eUHAey{$X?><>&pIuNrK;!=jwr(pMgS4JY5_^DsH{KWysf}Akg~o
zV#>Od6&X8vw=ewY)1v&d>!$RYMDtlI{)Y>lXc1qKcm}8i2tMdtzSxp`+iB9y-D_W4
z+3Gg@%xF@Ho_18l_7h7DuflVgcX@lui_1@29?yQ~=B4R&?EMyYh)xhG5tQA#`}(Z^
zk#F8jZ><emJD=G@^XODx;Yof!-^pcFYA$V2x&8faRJL$GNcFqd%uG&(DqlCaZvk;V
MUHx3vIVCg!04kv&+5i9m

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/meta.json
new file mode 100644
index 00000000000..5a9100512cb
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by Hanzdegloker",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2581dab5e38f16c496645e7608883d94ff376db
GIT binary patch
literal 1183
zcmV;Q1YrA#P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ$>+#1v`j1WN4i%h>AE$6^me@v=v%)FuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La)
z#baVNw<`9$!jB*Z5y61OOg)ia%)oPe-NVP%yC~1{KKJM7SMnwUd?N82(+!JwgLr1s
z(mC%FhgeBch|h_~4Z0xlBiCh@-#8Z?7I<dJ$fV|pL&RdSgXIopB|{~iCJrmAM)^Y4
zWrgz=XSGset$Xqp2J+fUn(H)25yuh|NJ4~+8p^1^LX=jG6cZ`hk9qh<9DkBrGP%lN
z<XAuzDkR4b{s+IiH49UdZc-oybidg4M+E5E1)6o+{yw(t<_X|`2ClTWzuEw1KS{5*
zweS%T+y*YL+nT%wT<!qFPr77Cj^w8)6bium8GTa@7`g@e*4*A&`#607GSt=b4RCM>
zj1?(+-Q(T8oxS~grq$mMXvuP;>U)db0008kNkl<Zc%1E;O-mb56o#KjS2m&+T8K?r
zvypBF!i3~sv@pbNH!ZbLyHMz^_zw!nqS**`QMZ*q|3fwj3;`FGZel*FML~spU|n>&
zD0i4>qjSfMw)Q*_E^}|@yq9x77<dl|f*=TjAPD}*7m7~4P;@Tp`&abGbj1O3mPNi$
zbefGFCtoN!Im;Rt4~sDLBRb;AhYtX#H=5)ui&nc%BA#TURKh#9ytL>$u8w{-lLDYp
zt&z>7&a`SwNB@@2Buq2S)N~YpwGZp$EQ^g&iRaIr0&sNLrQT@jgw!GtPck(f#V`zj
zGwsn~mrAv!71LLyRQC7x4!C>o&d~p<aott$tM3;becyM0VHlWZno6}sBA&!B4EL9a
zC#h6xm}c5tjZx#(8K$rLb?|irY}>}RZ2;Cku0?=>6;T<tZ99}pFid^zZTk6j%oUlN
z9pmfvPj~Fe``wXWe&^|*CWyY)B?$2H`(q-pS;lWq&~J1Yk516<b#QjKfmPjb+6?IT
zI&K?OU+X*ICZd&q*!+TXGC2c4zt`bM|Ac<81Hj4T46*rzP(Osi(APdQ=ZWloS`GaU
zxNdzx5ClOG1VIo4K@bE%_#e4SJKPUfW{-QxW>Pd8J5IS=c5UjQv2;<^xYE|~4Nns|
z0m>FvZ5WpLFqW4VBVO%9JQ+Ba_N2Xa0)XolkJ=HwXbx)C_xBFm{vfppfp&mtrl~iY
zt{WVdBYYl8*E^RWXnBJw^R0FrfL6Oss~t%9(rj*S4m`Kob+VZh`9jeNtwIETXI@oe
zsEQ4MOeO=MB_4!)q3A5WdcpDWF~FI*=vIhmCBW;`o2EIi1ESHWmhffR+S;Pq?GE(4
zU0DefEAVRl$)}&29pllPZ=vphFYoR<-kJnO(AtDRFU95;oM9e)*aqdOwWU5l_l4`M
x5%??W1Jp!@ja|hNxGrr$5ClOG1VOk#`~tg>%2;x}(FFhi002ovPDHLkV1h)pFNXjC

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4d2825f0dad12ee6ba528a6faf710415bc5ee47
GIT binary patch
literal 1338
zcmV-A1;zS_P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ$>+#1v`j1WN4i%h>AE$6^me@v=v%)FuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La)
z#baVNw<`9$!jB*Z5y61OOg)ia%)oPe-NVP%yC~1{KKJM7SMnwUd?N82(+!JwgLr1s
z(mC%FhgeBch|h_~4Z0xlBiCh@-#8Z?7I<dJ$fV|pL&RdSgXIopB|{~iCJrmAM)^Y4
zWrgz=XSGset$Xqp2J+fUn(H)25yuh|NJ4~+8p^1^LX=jG6cZ`hk9qh<9DkBrGP%lN
z<XAuzDkR4b{s+IiH49UdZc-oybidg4M+E5E1)6o+{yw(t<_X|`2ClTWzuEw1KS{5*
zweS%T+y*YL+nT%wT<!qFPr77Cj^w8)6bium8GTa@7`g@e*4*A&`#607GSt=b4RCM>
zj1?(+-Q(T8oxS~grq$mMXvuP;>U)db000AVNkl<Zc%1E;zi-n(6vw}*PzlANw4#+-
z`a>Bz1R+N-vA~X0D_vPY>e8j<Z|I(Y6d@s%fv!Z3)P;psNS#{c6p^6|Qsg8QsjZq|
zg%UFO7{Xc3FXMB4Nn7r-oSn1%eSY`O&iOq+B9TZW5{cwLCB%C|BAKE9u(rAqa{Emb
zOe?NwNb9=Y`qdxuE1pQEXwf*NiDZh#HLayz6i$6YvMsG}edi5l^etL64qIAhzes(i
z(XI8P?<r&w$rOF~;69FzP5}S~qln1-Tt^E46O-fE+s_3$9oqFLCdUB)ilU%as{ueu
zU!eMlWQv-mNlnwVz0CF-jYiMDpdvxE{xvTL<@0$QAD!AG-D?DlQW^8JGj@Mah}3s=
zKq8r<FP=X`wNk_0ehvVjsxjOiQvd+ra2WM^9RN_R)L@j#FiK^pY7Eh66aeUXLa`tE
z|BQg`PoGgRidb7+3B7v#h7ywPIRchtVQqCKWLXwv&xG?LTHn<Hgb)xy?0w6!Tt}c_
z6uX}1mwxEGI$-ntMo0L#jey&Ee&~n3r-z^uFC!q5p!K;NFh<sq`??MQxH}2l92vsT
zGYj92{`Q;P`do<6_Z%uyOUv{|^d9ObCc<}a^=yCTzu^0aw}Gz-MCo&_1+F5V95A)C
zOdF%qsGqpUSpCFAV{{r*OUr?-2Sn;~O#uLCj85bF$S{7NH9FeiABO-SYzm0b=Qh;M
zyCQD<qUlQ{5{X12kw_#Gi9~V*@U?zsc{gWbbWwZS*R^;?-=fasEa0y`fcvvJBQie+
zRgD2?eyU~$i7t{zBvZ6q8-VXm^4uRqSwTd>D1wkIR5b=dvgpUn1I<zHrp<~rc(2E0
zFw4_-Ls1lL@9g#^0-ij6WM_oh;jIneo&vKo5j!*EBpeQ7duNyTa=uttSg<ofPMld}
zuW&oSnVZ|&&w)jRqI5b%6bA<fb_6(WaOMZS;yX9E@op1wO>4>14I%<&XCg@JI#?Y6
z@5At15zwBg?HA4nV582eNO<9PKw8h(+ZQ1Ms+Ahjdd98?P*s)dTHFqZYm4@Fsa!y*
z+}s{i1hm^Ed<w8X9_?>}LB9p6m8L_4I>4Eq@7gc8K7iTq@nvu}T$=g-Q8vi>051m(
wx;{Xp4VR`qK$H!au0G(R*dUQeB$BJZALC<)6~JI8k^lez07*qoM6N<$f{?Cpwg3PC

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5702f2d315a65145e95303190213ad15d400f79
GIT binary patch
literal 842
zcmV-Q1GW5#P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ$>+#1v`j1WN4i%h>AE$6^me@v=v%)FuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La)
z#baVNw<`9$!jB*Z5y61OOg)ia%)oPe-NVP%yC~1{KKJM7SMnwUd?N82(+!JwgLr1s
z(mC%FhgeBch|h_~4Z0xlBiCh@-#8Z?7I<dJ$fV|pL&RdSgXIopB|{~iCJrmAM)^Y4
zWrgz=XSGset$Xqp2J+fUn(H)25yuh|NJ4~+8p^1^LX=jG6cZ`hk9qh<9DkBrGP%lN
z<XAuzDkR4b{s+IiH49UdZc-oybidg4M+E5E1)6o+{yw(t<_X|`2ClTWzuEw1KS{5*
zweS%T+y*YL+nT%wT<!qFPr77Cj^w8)6bium8GTa@7`g@e*4*A&`#607GSt=b4RCM>
zj1?(+-Q(T8oxS~grq$mMXvuP;>U)db0004jNkl<ZScUDC%}N4M6vux`lv(se3Y8^3
zKoO$7$6(LUrcJ$rd)>GR+SInF=g=Ak+Xmuj6Ik>ylufhnwkTtyChskzg86L@bI+ag
z|DOZ*UI+*X2>5RliX~AfmPEfbS;DH~069&gP%H_vZizy%ByyV8lOKoyuTY~|Bd2LS
z(Q8b_KuA`6ExXE9>jr>Y-DEAhO1WaZ$5e6&fLMHna>ZbKYg4MWl(=o%!nSQ;)-7Sy
zt@m%&b$xTPlNjo^LDzM<-FG{0G(X>aa#|(1m>?FPLDzMu2KyS=-`foV0wA4EvzSOR
zH9ZbMBoe`K902ZaA2>O!a(Hy?{qN@nyu~t^jA%4#z7yzlI?}>Q2D}1aO`u#cRLZFv
zfY&4FH-Yb<Y~WWXFs<h?&hr2)#9=HN=CR%3qV<-ymG$K=B7nK|4KcdBf^%&XnVs;B
zPiIvw4|b&MD!m1RK<UWLt#1f-a-NasFwbrGLma-hl)6_o&^6(gQxy*g2>27c0ME?q
Uy&tYp<p2Nx07*qoM6N<$f*UA?#{d8T

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..921ca6fbe4882156e67e0872e441d282a3954ec2
GIT binary patch
literal 893
zcmV-@1A_dCP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ$>+#1v`j1WN4i%h>AE$6^me@v=v%)FuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La)
z#baVNw<`9$!jB*Z5y61OOg)ia%)oPe-NVP%yC~1{KKJM7SMnwUd?N82(+!JwgLr1s
z(mC%FhgeBch|h_~4Z0xlBiCh@-#8Z?7I<dJ$fV|pL&RdSgXIopB|{~iCJrmAM)^Y4
zWrgz=XSGset$Xqp2J+fUn(H)25yuh|NJ4~+8p^1^LX=jG6cZ`hk9qh<9DkBrGP%lN
z<XAuzDkR4b{s+IiH49UdZc-oybidg4M+E5E1)6o+{yw(t<_X|`2ClTWzuEw1KS{5*
zweS%T+y*YL+nT%wT<!qFPr77Cj^w8)6bium8GTa@7`g@e*4*A&`#607GSt=b4RCM>
zj1?(+-Q(T8oxS~grq$mMXvuP;>U)db0005BNkl<Zc%1FpziPrz7zOZS=};;Z6ch^n
zsSgk+k@hV*h+XZV(4|W|cJH1nS%fa_+9zr0rEg%9K|w)EK*y#-QK%-yCLijB^8*oX
z;N0+e&5{EU5fKp)5fKp)Q4*Hz1eWatVe3ir*4-nGJ&6#@c7kT3vGV$V^P;Xb8;!(6
z4I?sunZ=un8_cG%R>`CduxuwdKRd-}I0gU|ig~=geE<Mz)yki>yW5-C{TB0jt_J`J
z+hd))IH^y7QVQi#4L#R`Y1UyF20HB)I_(xrvyPtYp<Jp#DU~R1mSq@5qP#e%CkOzo
zt4?5=CTi6R3dQ_<eKZ`S=Xy{|;rZ!t?Y*S)Ho~%<z;pY7@B8zQ=k^mnwWaf->`R6z
z^}h6r?NVMCu>s`N19Ai4APZy<_b{1$BR2uQ2D_0LMQi}~(+gy#C&0)DvPZz=_dA$=
z0_bi%FN)}c<oNP>>Hj%+=_cMoI**8mh=_=Yh=_=YbSBXu5PdzqNm3mGZ3h6zbO^M3
z$spMw(DDRGb_ldQ0f43*0%;N*0?~fJHl*zkXgvUl4uRGKkmwL-|BzsZfYSK^!<=3?
Th#FN(00000NkvXXu0mjfVq%#8

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed69a4573879784833399193fc173927945eaf4f
GIT binary patch
literal 921
zcmV;K17`e*P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ$>+#1v`j1WN4i%h>AE$6^me@v=v%)FuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La)
z#baVNw<`9$!jB*Z5y61OOg)ia%)oPe-NVP%yC~1{KKJM7SMnwUd?N82(+!JwgLr1s
z(mC%FhgeBch|h_~4Z0xlBiCh@-#8Z?7I<dJ$fV|pL&RdSgXIopB|{~iCJrmAM)^Y4
zWrgz=XSGset$Xqp2J+fUn(H)25yuh|NJ4~+8p^1^LX=jG6cZ`hk9qh<9DkBrGP%lN
z<XAuzDkR4b{s+IiH49UdZc-oybidg4M+E5E1)6o+{yw(t<_X|`2ClTWzuEw1KS{5*
zweS%T+y*YL+nT%wT<!qFPr77Cj^w8)6bium8GTa@7`g@e*4*A&`#607GSt=b4RCM>
zj1?(+-Q(T8oxS~grq$mMXvuP;>U)db0005dNkl<Zc%1FpPfNmZ7zgmL(IFB71%<#r
z`2q$psdv#q>}m&vE?w%_z590AMd(u3UP;l9-oe@q3JMYfJ+=;^nbY~(+;WTW2W0S*
zx$mCM?eIJR5fKp)5fKp)5dnav8?L4s?z*+42%C3j)sHnB4c~)>N*R+)@-8jFRI|~T
z?L6K39cbIa<jpKDXu9E^o*ZL17y$qZ#XO#0-T(l#YUS73&GnUM|G&0rUe6sMgh07e
zgK61N)jAYKL8sk9r`>|8)?r#U%B32F5V4+^tWEPSy@IWaj;pFFYSjt~#r$l2I2ggS
zYzQIn_;A1Vt3MS>UQIV#+v>TF<IFy`)l2kSAWYs}zb}P&^;9&;!sK09fSkBPt`F>G
zf$aVc#*<Iv#=u8Eny^s|n|EaaZYO8ROpbt|17r_?@%Pr9yaVV)8a@hP^ZGs*4$m(=
z|DXO-H!%;tMQO`RL_|bHL_|bHM3ii4n;DSd+a90icarmM>9mn90PxdmpYOpZd0s$<
zRMTLw2X9(70AN{PJ_$1eK}g*Ji#_;h|6Ng(M9vHZA$_&dHZu^5w9O32@SP7>CT%kV
v>jWx5+GYl11S&w<W(H&gerT}=PyfpoWqo5&-alFE00000NkvXXu0mjf%{!=7

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/meta.json
new file mode 100644
index 00000000000..a81e5b94776
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi and modified by Hanzdegloekr (github) for space station 14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 0000000000000000000000000000000000000000..2cc39c88940baeb9832fac9a58e4f04b2092128c
GIT binary patch
literal 1277
zcmV<Z1OoesP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>9X>4i*$~$WWauh>AE$6^me@v=v%)FuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La)
z#baVNw<-o+;YS|^5ky#Grk+SIX5cx#?&0I>U6f~epZjz4DtVIuK9P8i>4rtTK|Hf*
z>74h8!>lAJ#OK8023?T&k?XR{Z=8z`3p_JyWK#3QVPdh^!Ey()lA#h$6Gs$PqkJLj
zvch?bvs$UK);;+PLwRi_&2^e1h+_!}Bq2gZ4P{hdAxf)8iis5M$2|PQjz38*nOtQs
zax9<<6_Voz|AXJ%nuV!JHz^bYx?gPjV-yJN0?oQ@e;?a+^91le16NwxUu^)hpQP8@
zTI2}m-v%zO+nT%wT<!ovPr77Cj^w8)6bium8GTa@7`O$3Yi@6?eVjf38R}~J1~@nb
z#)_1^?(y!P&ffk#)9UXBLsoK>gn$H40009tNkl<Zc%1E;%WE1@6vjV8F%YDA(SoVA
zx(VG3$cX+IT@1QyDGhbeP)MMgwgj^3s-RHZ1X4<}P4KVCMqv=LNa@CB6%v|95lLM1
zb`kC{zLGgt#}ayeAlJF0=ewT!Q27qPFbu;m48u4hoym%HCM$01yDR!rRB-@E7zWar
ztf*ERBAv;Kgkf~ucMCW4Jrwcqlg9vnQl*N7VW3toAs7f_KbM33-ul|A<G2+4cq{?{
z$QO!;$0B{LyhqW$M;U~!M=>|=0|0D)-9^GMu%F9e<<)Zl!1-AVrAn0&l0+~N#@xIQ
znx+9jUweMmLcUNW#dMS@nf;UFQ#^RMF!XiuK6MtH>N|y^@AwSRG!42QMZQo(Fc5~O
zY1Shc2qRx8Lf50#Y>XSb&M<x1Pr=a^FijJtX#xOtceXtMx@JUX+%!#B4na5d$;<TH
z3%^*nfBk$pG=(4KKLCK!-@wbA=GYIvoAm9d>XQyZ0C?Yi2G4Bh`l13Wg`!;sutg0=
z#;$+W?qGVxJCZ)>cYvL%cBiYotB{tAKbaC9e+XCY4!jo)tG_e5gy|VCM6-<M-j-|I
zpjY3nwe<FrP|+uE0RVmC{$xsECZrNdi9z~}FCUZ=ue=5R6~ngN;>xD*CsPyoKf*8!
z!!QiPFbu;m48#0)OwtZ_!o=)xJMmZq)k;Gg92{6SwQ4LX(i)fA6yLBH<pfAuT()jl
z;=@>9TlLtrgMqMeEb^f3bpik^w|Lx+@NHv|vwm`XYW1tsCMc}{U5}zvsakHZTaNHe
zNL~9_R3I56GV`^12>?*5mr$!K>5k0d;bGTxtzJSr7C}0b6|Pl?0N0t9l^C*O0{~*N
z7yyvORY+&DV)e~yTwY!RK;KxX6(Xbr*nN6k*Sl7L&*vivkHXQ>5n8QQSKr5t4W(Gh
zvo*-4Uk**->ARn<u7K~K9|>8LFb-X%H!ZGg3hB#B206BF;7_K6bfbIqe{FA)waMQC
zgAB+?eRu$9?rnLz7ma}?sfsx|vO7G<4==eX2~@}l7^nES7-bTaSAh4T0nsd5l_Hb$
n=A~Be7#N0O7=~dO#yNihi6rQ}i`JN@00000NkvXXu0mjf3Vuw^

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e1557db217275f2cb2dad3dec9bb4152a28e528
GIT binary patch
literal 1449
zcmV;a1y=frP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>9X>4i*$~$WWauh>AE$6^me@v=v%)FuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La)
z#baVNw<-o+;YS|^5ky#Grk+SIX5cx#?&0I>U6f~epZjz4DtVIuK9P8i>4rtTK|Hf*
z>74h8!>lAJ#OK8023?T&k?XR{Z=8z`3p_JyWK#3QVPdh^!Ey()lA#h$6Gs$PqkJLj
zvch?bvs$UK);;+PLwRi_&2^e1h+_!}Bq2gZ4P{hdAxf)8iis5M$2|PQjz38*nOtQs
zax9<<6_Voz|AXJ%nuV!JHz^bYx?gPjV-yJN0?oQ@e;?a+^91le16NwxUu^)hpQP8@
zTI2}m-v%zO+nT%wT<!ovPr77Cj^w8)6bium8GTa@7`O$3Yi@6?eVjf38R}~J1~@nb
z#)_1^?(y!P&ffk#)9UXBLsoK>gn$H4000BvNkl<Zc%1E;KTH!*9LK*US`WOa5FtVN
z6XL{xF-LTA(Vc_~tS*|cuz;I8d#g!fLV|;=kZZ!?BE*CV(n~`J7L#&qEd~sQrk2v-
zo<n($*HUWV_3mo$eU@wQ_3rz--}~M5?!G@jB9TZW5{cwLB_O&%C>$XGFh4gNXtd5N
zsMeIOW7RO&(y4xjQ}IwZLQ+<igu)RrrR!DWUcu{|W~^%IxjuiuQDcpytZdbiANNw9
zYSddg(Qm3`Lg5H`_Vfu34~_r;Nh^hs;h{@Q0O;-O!Pa)%)zhI?zqhXk0HCTW3WWjy
zRE@c+9|}iEKA$J~e4b^QelM5HSB|+=30~{pXy!+WL;{BgM{K6AngJ`F!SLV!8+QvY
z^&2K26poNLuV3LfSHRYG8~~tc<G9zY0ss_6L8(*%037EEu+kY==?pY&9Ajf+06<zP
zML+caS^?`{zaeR*Fh4gNc>m!eG0oVOGho{`=I3Suwrvx7O=uOb^&2L@G)<VM$-djR
z-EanyR;uoHPVqy(VFH#vFI_61Ml;Z8J16*|-_%8rr<ob>61Vk*63}ffApU&;0PwI6
zxZTx(-$ffg4$jB(!umpZp)Ztxcf|>GK6(rQC>>s?DZO_90H;5904$0}(MEltX8}s-
zS4I4+Sg!i+7jEhcCx90Zo@9Mbg4_CzDu9abuPg@mApF8jeMbqnPRIm^Zg5q(`E?q&
ztuK5d6g<f`wazQrtuK*CBoc{4B9Tb02aaA}Q{Rm@Mkn<N&wB%SqQ)BG%~`-%e}M4Q
zAZ28D2%0typz^Ak2IO^<L?|2~wb}q2zmgYzA3z%-l2!_)8H1*c!!%>?<KThHEZ5Vf
zO&g;76AGC6^z~3x73&+DzEr@=7tfg^REubDfbc0WI55JT86HJZu)eV=x;saVj*c=%
zh=+HPn?*PQyf?SC9S5xlRlS@Puh`w)Wfj23!25&E;@BHp`m~HGU9a-#+ED?610z^9
z4A4FT(TibA6;SKc`UPJBbk=DXi73JeST&;T^S@95$GHMljVS8}&@@eGU&0BP(kI#H
zbS8;(rt-O66;K<K=cfR@@u>YLX!pOsajudOPZPlV^L594@JGAN1$=qyUJSzh0p*(y
z006hTf^5BV-=F>f8UyPQ;2dG<3<Zl>p%{ek+WMzwNcrwX64=2fcCf#)=*t69|MU#$
z9J@#YJNR?QSY%(q&jQqv=JE63X$+@{ovL+C4jyp99rn9B#BFV9kGDI3cGFS<&WdG_
z{XKUgaRAxhYq>AMaRP!TS?0_8c>$zQO+F5ZL?X-|Ar5#r8(2bL00000NkvXXu0mjf
D#(A9n

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..334ef02242d3f65f165dee34405bb3a1b6b146d8
GIT binary patch
literal 837
zcmV-L1G@Z)P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>9X>4i*$~$WWauh>AE$6^me@v=v%)FuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La)
z#baVNw<-o+;YS|^5ky#Grk+SIX5cx#?&0I>U6f~epZjz4DtVIuK9P8i>4rtTK|Hf*
z>74h8!>lAJ#OK8023?T&k?XR{Z=8z`3p_JyWK#3QVPdh^!Ey()lA#h$6Gs$PqkJLj
zvch?bvs$UK);;+PLwRi_&2^e1h+_!}Bq2gZ4P{hdAxf)8iis5M$2|PQjz38*nOtQs
zax9<<6_Voz|AXJ%nuV!JHz^bYx?gPjV-yJN0?oQ@e;?a+^91le16NwxUu^)hpQP8@
zTI2}m-v%zO+nT%wT<!ovPr77Cj^w8)6bium8GTa@7`O$3Yi@6?eVjf38R}~J1~@nb
z#)_1^?(y!P&ffk#)9UXBLsoK>gn$H40004eNkl<ZScUDBO-lk%6o#LPD6@!^6e3Ne
zeTb<4qQzjpp-r1wws${n+z4%ITh#CHV-VMY_>qN1#ZYE0ye-UOjLf-)L^RLla?iQ<
zyze=1FE}_j{57<6Mri4bm=v?ioUAxNQdQB?8Bwb?g_h2Uq^geOXJWuARBu#Bs_MvU
zH6~*~u`8a4M`*Vm0H{=JB;pZr`I5PYLt6m&{9bbT5=VyzwrblFHw;4<h9PRzrl?h$
z=DyeKjm_De#QdZKx~?<qe%N`v@%7n4u}ml!z~}d(>$<H5CmJ|AJy8Gw5RFC&2Ewd)
zRse9hTy(o#0G=M7DHO|GTwYo4{oH`HSS%J3^+sjv1p58HZDA<`R)Oy(kjs~3%E=pm
z!4n)efoYI7@T(K>=qXCqDF8P8u<V}WrPJr8^^rHE_2mp4cXnCY-l2PMK--c~z_q^0
z>s=Yh&dvZZ5C`5mJu|lGUNGabNPm|bd;8`OcYB^yKJTY;;o#ul@UM9XpmX24nfP$6
P00000NkvXXu0mjf!<UC=

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad7541ea1d42d0ec6a5895024f4163316ae16b0b
GIT binary patch
literal 892
zcmV-?1B3jDP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>9X>4i*$~$WWauh>AE$6^me@v=v%)FuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La)
z#baVNw<-o+;YS|^5ky#Grk+SIX5cx#?&0I>U6f~epZjz4DtVIuK9P8i>4rtTK|Hf*
z>74h8!>lAJ#OK8023?T&k?XR{Z=8z`3p_JyWK#3QVPdh^!Ey()lA#h$6Gs$PqkJLj
zvch?bvs$UK);;+PLwRi_&2^e1h+_!}Bq2gZ4P{hdAxf)8iis5M$2|PQjz38*nOtQs
zax9<<6_Voz|AXJ%nuV!JHz^bYx?gPjV-yJN0?oQ@e;?a+^91le16NwxUu^)hpQP8@
zTI2}m-v%zO+nT%wT<!ovPr77Cj^w8)6bium8GTa@7`O$3Yi@6?eVjf38R}~J1~@nb
z#)_1^?(y!P&ffk#)9UXBLsoK>gn$H40005ANkl<Zc%1Fpy-F)V7{>9xVj%_&L{Jd?
zIJtlYS<$<&2-?QNfX!*NJiYyHvyEV*tyiKrcn5K}FrXk3$d;~^f|{7P`w|^^evoDs
zo(XRz)9eExA|fIpA|fIpQbrUfMHDB+p!KqO<L*(#v_(i1C&f;)`Q`KP<_&wc(`=R=
z>L4Zqc=hqijT+3Pvc57^H6V(UVrz4qhx<nW78d8Zyt)CPv9|hd?db5|$o)R%b<zxg
zL3@moH%jFb;GAP+xj`q*2*VA6AfUb9qP^cD3^(Yc87s>ToO7k}UbBKAD3v!#<p~0`
z_S!`lhBVezSy-HZTYtEJq?2Yi=Quw*9eXe9yore7q{z~{qSx!aeX{hf^sQ~3H_VJ>
zm~+>kezD(_H;CB)>h73&7iMcvo13PeKU43+Q}=h|4P!Qd|M@mk`CrI^eh+GY04VZX
z;N-{ihB3WJmUa(5{Xe@GC#CnW&Jz(45fKp)5fKp)pILMWOka;rl2wPm+W~-0hrr91
z43-@NFHeAFhrr7d0G@UTtXXsjO#1;pp=yV~>j7AF2)rJEMTfxqOF|t2spbVqa$7hK
S+K!e00000<MNUMnLSTYN)0f}?

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0133d22a2059b63537cb966960ad724c7307921
GIT binary patch
literal 917
zcmV;G18V$<P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>9X>4i*$~$WWauh>AE$6^me@v=v%)FuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La)
z#baVNw<-o+;YS|^5ky#Grk+SIX5cx#?&0I>U6f~epZjz4DtVIuK9P8i>4rtTK|Hf*
z>74h8!>lAJ#OK8023?T&k?XR{Z=8z`3p_JyWK#3QVPdh^!Ey()lA#h$6Gs$PqkJLj
zvch?bvs$UK);;+PLwRi_&2^e1h+_!}Bq2gZ4P{hdAxf)8iis5M$2|PQjz38*nOtQs
zax9<<6_Voz|AXJ%nuV!JHz^bYx?gPjV-yJN0?oQ@e;?a+^91le16NwxUu^)hpQP8@
zTI2}m-v%zO+nT%wT<!ovPr77Cj^w8)6bium8GTa@7`O$3Yi@6?eVjf38R}~J1~@nb
z#)_1^?(y!P&ffk#)9UXBLsoK>gn$H40005ZNkl<Zc%1Fpy-Fid7{>9xVj&w4A}B2Q
zvAKW&8FBAoi=b_`FtCk{TiV+vO&Y;QTdzd%uy>H1DGVsc63CQ0TN&2*$ebAxog>c=
z(wxIgo_WvYq&P2#h=_=Yh=_=Y2tcnth_lAB#_J$2TT$NSyqo1+aM*4a-t?{Y`h)ne
z-JUt0H<wueNIz)Nm()R(%uC6EUVjjOJ=o*v@fm<&5CZW3*v95Mw|Bqzd3ut%{;ehR
zzGMSv?e4r9%gUR21B@|jZ?zZ(A-=y)_qap%xP#|;`2Ie_AY^;1g)wHK4`wTw*Ymt-
zW}Cd3E7<wojeXyzwY$T{=K6H}>G7Fi5Mqqs`s(uCSO3LA^7i_JI1C=*@pwG_guz3t
z{{^b#U70m$%zdh&byg*BZULI+oaP8t8_@W)%q03ta{_-x^9eg|RrBT+;4J#aQuGBP
zU^0fr8US(h8@QNT@Oi14cjm_M`RGUL_cOY=sLke=<XT=45fKp)5fKp)k$Q8jXTV18
z@pzJJJp;C^3jl8R3>2|CG;pnFpbV=wz_p%%GOSn2wVr{6aII&+#?1bJEUxto6e(2z
r*LntQlq!I0Jp(pMZ(2HomyhKiZ2wz0|4;#A00000NkvXXu0mjfjnuaa

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/meta.json
new file mode 100644
index 00000000000..58b759095d7
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi and modified by Hanzdegloker (github) for space station 14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

From 21a811a1b0426e8488e2fc4da28ddcc6d9c7113b Mon Sep 17 00:00:00 2001
From: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Date: Wed, 1 Jan 2025 12:16:45 -0400
Subject: [PATCH 7/9] Added Captain's Combat Gas Mask (#117)

<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Adds a gas mask variant for the captain intended for combat encounters.

---

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: Added the Captain's Combat Gas Mask, for those more fond of close
encounters.
- tweak: Added the Captain's Trenchcoat to the other captain locker
variants.
---
 .../Catalog/Fills/Lockers/heads.yml           |   2 +
 .../Catalog/Fills/Lockers/suit_storage.yml    |   1 +
 .../TheDen/Entities/Clothing/Masks/masks.yml  |  10 +++++
 .../TheDen/Loadouts/Jobs/Command/captain.yml  |  14 +++++++
 .../equipped-MASK-reptilian.png               | Bin 0 -> 749 bytes
 .../equipped-MASK-vox.png                     | Bin 0 -> 811 bytes
 .../equipped-MASK-vulpkanin.png               | Bin 0 -> 819 bytes
 .../gascaptaincombat.rsi/equipped-MASK.png    | Bin 0 -> 772 bytes
 .../Mask/gascaptaincombat.rsi/icon.png        | Bin 0 -> 570 bytes
 .../Mask/gascaptaincombat.rsi/inhand-left.png | Bin 0 -> 336 bytes
 .../gascaptaincombat.rsi/inhand-right.png     | Bin 0 -> 343 bytes
 .../Mask/gascaptaincombat.rsi/meta.json       |  38 ++++++++++++++++++
 12 files changed, 65 insertions(+)
 create mode 100644 Resources/Prototypes/TheDen/Entities/Clothing/Masks/masks.yml
 create mode 100644 Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-reptilian.png
 create mode 100644 Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-vox.png
 create mode 100644 Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-vulpkanin.png
 create mode 100644 Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK.png
 create mode 100644 Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/icon.png
 create mode 100644 Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/inhand-left.png
 create mode 100644 Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/inhand-right.png
 create mode 100644 Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/meta.json

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index b364e7e8388..3aab88f813f 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -33,6 +33,7 @@
   components:
   - type: StorageFill
     contents:
+      - id: ClothingOuterCoatCapTrench # TheDen
       - id: NukeDisk
       - id: PinpointerNuclear
       - id: CaptainIDCard
@@ -75,6 +76,7 @@
   components:
   - type: StorageFill
     contents:
+      - id: ClothingOuterCoatCapTrench # TheDen
       - id: NukeDisk
       - id: PinpointerNuclear
       - id: CaptainIDCard
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
index 734bd485a2e..ab11eb1ed9e 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -228,6 +228,7 @@
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitCap
         - id: ClothingMaskGasCaptain
+        - id: ClothingMaskGasCaptainCombat #TheDen
   - type: AccessReader
     access: [["Captain"]]
 
diff --git a/Resources/Prototypes/TheDen/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/TheDen/Entities/Clothing/Masks/masks.yml
new file mode 100644
index 00000000000..0c842236e9e
--- /dev/null
+++ b/Resources/Prototypes/TheDen/Entities/Clothing/Masks/masks.yml
@@ -0,0 +1,10 @@
+- type: entity
+  parent: ClothingMaskGasExplorer
+  id: ClothingMaskGasCaptainCombat
+  name: captain's combat gas mask
+  description: A military-grade gas mask that can be connected to an air supply, painted and outfitted with an emblem befitting its wearer. Issued only to the station's finest.
+  components:
+  - type: Sprite
+    sprite: TheDen/Clothing/Mask/gascaptaincombat.rsi
+  - type: Clothing
+    sprite: TheDen/Clothing/Mask/gascaptaincombat.rsi
diff --git a/Resources/Prototypes/TheDen/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/TheDen/Loadouts/Jobs/Command/captain.yml
index 424fb7d4bf8..1ca47ead315 100644
--- a/Resources/Prototypes/TheDen/Loadouts/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/TheDen/Loadouts/Jobs/Command/captain.yml
@@ -12,3 +12,17 @@
         - Captain
   items:
     - ClothingOuterCoatCapTrench
+
+# Mask
+- type: loadout
+  id: LoadoutCommandCapMaskGasCombat
+  category: JobsCommandCaptain
+  cost: 0
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutCaptainMask
+    - !type:CharacterJobRequirement
+      jobs:
+        - Captain
+  items:
+    - ClothingMaskGasCaptainCombat
diff --git a/Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-reptilian.png b/Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-reptilian.png
new file mode 100644
index 0000000000000000000000000000000000000000..08e85f993a7ba0079843763fe8cb3bd809297bad
GIT binary patch
literal 749
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVA|s8;uuoF_;%L*Zed4}<MZz|
zx-x~c=<ZQ&6bWZJ=j4(j(yFbyDeBkb_zj!HyuaoLu)LjY|9~ryo7?i@WnDc14-4HX
z4UH}Ww%305?MaL@n|<cZyTTXc3TMvjJM(+r_n9|y?{#dLc%a_*!HoQG+Ua`kyUPAN
zY~3#Z_2Dgj)ANyk|Ne{4|ND5|p&#~>>T933*VOOQdhytx=FiV{E5lar^L}fU&frm2
zvrCu1-u7ip&2?kjXYIU<yX|KBsGNV-+$7B4`!B3|^XIhhvtxdLIq+qMJX_0;jqV@T
zhH=l$_1tZm!ZXb{$Jp0H?(OSqe;-_VX3L!TY(BTigA>=+#hAaZTN-3I&wSmzzGatJ
zO7^=cOIp9OWIQl2`(KUf-hig5`mrmoX0b7q$)9Iu|7Ilp<>Do~T^4h*$~zMuu2=69
zFJn;Zb#vapeE4C&tFOBf*x8yJSJ=L<o;j7_k;iBI*Ok-sZ-}u4?7z}y_x|lo71Nt3
z`*&?qJ3Rev>)&(SA3Sa{I@+7OxctmrD}l|KNyPy#3gBRzvS^EvjJ)`xn!d?9;%aQt
zBQ4WdF4$;9ytA>BcfD=?W@&5D6_*8!x*1N^>-&N$Z8X~$0u<iP-;wd2TjhW7mzeh|
z4#Kx86)UcPcy#i0Eu+fq_xE@&EEhHScxQX2=enD9R~q}dU#mZjEZ24jy*1^i?fRD%
z^BH7p|2*n^QQH{z!_ML9jx}ueFErF&4OzQo$CYVUtLHPk>6mu1yl(!~rFWk%%ZYQF
zDH9dd+NNgm?Rx&HW1qI^p8Y+~BA;P_RC`0EMBBESxRjYTk+ZI^HmuS=XkK|_4mX3$
zi`|`uOb7Rzc=Ax(S8>I$`^%5kXJ65;7E)luiGHYa{$YHc?EXTuF;5Pdj2S##{an^L
HB{Ts5ZTe8o

literal 0
HcmV?d00001

diff --git a/Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-vox.png b/Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-vox.png
new file mode 100644
index 0000000000000000000000000000000000000000..4923a4d9d5628b68cabb0974718ce162ca918cae
GIT binary patch
literal 811
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVEW|g;uuoF_;!|ews4@xasRCf
zGaSSj#lH!1?BERBup?BfB+}sG(*E@q`W5tU^9RPf*j4&|(F$(yrH``3*qAQ9a^jTm
z;95F0^Pl*+0#4(}JIj}CUHYH<<X+?Sca?wM&Ad5B`H&;i^H~R4^1lR|i#gxD{d>#P
zweF=m&WUGlSNi?`*6n-W^mj-d`^@q0?x}fyYVCAq<Vx86s`)<Ubn5-J7wys+IJT8<
zRm^68Egf&S<xJ1($!!h6@4x?^^!$tCLCyxY|2sBr`S|a){LcTSSI_LQ<K!s2b@*r1
z-abvK#h*MTY?|RSQMF6J=Ggn|=Vygan<vH5$uF+qa4P(rox%IMl_5s6o=>0O(tPm1
zn%#HTeUW)<$>?zE>bLt|+7q5#S?{|tM2n5dPyV~L^Up%Q8^=3-zfiIcefP-u*?RR$
z-0BR<SF=LDuq5!PUwB#K^0e~)=_L#goM*i&{A96rCgYjAnJxC^<%<=3t@w-?GTAkx
z{(L#pQ&YcrW@P@H;N{=s6kfEm8DBcLukFtjtN1O+T#sW|V@+IMDKiQw;6@hNECJF7
z`0H-Je%x{RTK@XaH?-C?F}DY3AF25IqCIARrLUS;oY*4!JCzcPMC#ukU2`$NYXPfi
zs>Rgfy<cb8^U8fa^lj<w!1oPdy-C|r_OZ&|YG=5+f$_qInUS8Sns+kZI9P8NBe1)i
z;p?G2%vNvgSZ-(tHJLZu+ThoJKcnH6^#v|Fvp|!xlUZ+Y%U)o$UUhrh%qQ)CeQxcV
zP%hG!wVll`BQM`Oz|&1qmU-#tEt|^bG+)SkZyx&mbhnZH&SW|MrUQ}bbLQS*c(7vH
zG0`R|r~3`l&et+H=-(^fEzY=0aL=uhtE>0Dd~-!{(d;*p>Wgcc3(m+%F}&NkZQYAF
z1{b!Q&duhL7w>Iz{hz*e>8HTgC-`bq4Es+Vi(US<_05?nPiyD;Hd*n>JXLXE!i83{
a^f9o6$I6K%oR|m91Pq?8elF{r5}E+LU2ypT

literal 0
HcmV?d00001

diff --git a/Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-vulpkanin.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad830675ce756c231e6f5add940d99cb17c5b36b
GIT binary patch
literal 819
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVEX0h;uuoF_;%L*Zed4}<MZ<l
zC^gEk=<ZQ&6bWbX3((0CY1P)<l>V}RzrzQA0q?bIT`$=EWL_t*b;AT}zrDJ81sjfM
zE@a_RX{u0sX8mEB<EHAFH+`k{GoOC*Zg!=;-RH8|-(4&`9_&{uIA;Fq)zaC*cddVX
zITqdjs$g#Ov#Uq`{rIqW``^v$+BV7^++Y92yKY~M=ovE}`PzNeT2s5;UrU*9%)ny3
z<Hoe~`nZyPZ@!)Bd7kQgU?qRM^U3003m&jIH1EHE?@f)x55?%;{%3)b4jV4Zo!cIz
z>vQr)_&g4yJTJ*jA%acEf9(6KvS-838x9_^F$)+p<9C-HulfD7=w`;f9e)#yq<YWP
z?!Q01aj~sBgU8Ni@5?WBtE{Pe?X@><`eIF%Id=Ds2me%Jf0KOX*Gnbq(07jx->LUs
zBJRiFCe_;pbVJ;8i$2$<mHSVxVR&#{=Wpiw%_WXz-|Z7hbI-E$D+uba1@Rr`lY1>@
zna0Xro%!DXbLu;uhDE=6zdd>VapT3zeaEBDI$XHo{J}kcx1W`Nalyr+{Pef>>-7J+
zvb+CPabUuSHZU-0c<XMqidnLEr?zwEod-U-Q3{Up52QTLyR>D(HoN!LHyU(r=rC33
zF-ZM+xbwB=eg{FnrH)N`Z#^5%Dk)Tix4n6=HJ+ibzkGgsl<}O<qrTjFulG8+9ys{4
zU3SghZFO;RrQ4lDmik8C+3b7Vl6ltUUp9KT6W@xzaIIFn7aksVCUyGxH(&L>Us(8S
zgMaP{->asl^{1wuy(h_Ve2dS&pHI42*w;_)<DGKW|5&o4qG|qJfwF)SUDig;qslWh
zx>EMk`I~uJFLUXCwPn3*K10Egwgr8e{S5PJ=N^iyKEO9Gbo;hr3?=g(EWEtZnML|d
zBSZ4UC&dBmg-KCv+pj<089sMIBhQ6Ek(8^`vyXW$Y*&~*spss4wKpeh>`@X@V8n?$
bR6mGEw+0643cSw*W(EdNS3j3^P6<r_vg&nf

literal 0
HcmV?d00001

diff --git a/Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK.png b/Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK.png
new file mode 100644
index 0000000000000000000000000000000000000000..7880a3189f3be8fe6cfc32463935011d67c6a355
GIT binary patch
literal 772
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU^?yT;uuoF_;%L$Y+*-{<MX#Y
zP;8WIlFRW_xFE;$RUv4PhFH~?30IP%|Fa&fcd)tD{J&A@#^$r~0RdN<+k-B?l9S?C
zv&D7`3y(_Eik#1~6{nZv9Xj_WimQ(O)a;w)pX+MM%xw3lA97^+Z`#Pc@1}q3ZsC_V
z-#s_KS9Yas^_&&=I{yC8%&-2v|HUhb-xL4*X19OxyF0USOX80kpKXJ6#A^GGJ)gs<
zaP!^OU2FbV?fdyO`LxHH^HNOrs@7khtdlP<GKV4KQ})-TXZfp-Z~F7Kb7I7NR+itl
zlz&96WfSbb{42sR&B)TtJgD`FVc#}6^L0A5Mgnem=K>qG<D>SZ@B8btFhS@1{k`&E
zf7cqnFR{8*`sFzbL-@L1pXY92%Jh*nTN<Jz$x-pULXPjt|Dpr-ZkPJ?@|M4fP4f85
z`Jl@8{2334Hnp2YJ9QNJGAGH~wBLI!wTw4n|L-M#_w8q2`M-8b{`JMpe`_bJsH{_-
zv&!Yus{h}%&AgQtWc2)-q{0j7HlL{Zw;xDKa86*riyF)sr!3l{lyiPBua(S}zc-87
zg@5L{GF){$SoHm-lgQgOM|`<|R!VGRk^jIt|AXzC()gw8c-3aQF=$NKrhm8VH|wNt
zPk;JU3q26tx7q2#x`#JUX76VZ%C(J+IcNOv^0qYjeRZwr=Fjy`pMDm`+!`4y_C4ov
z;XcM4RX;W}U#@Em`>=B1R_EyX*JZXnWd3$#`7OUL@6yLhzVkX5O!acTuwujS-@AO?
z<Z@ion4g{-Eh)O;mx<l8u++LD_X{!;k1jW7U|GqSx!p~GrSPXsKF5cpODl4FPtLL_
zDtIMukg;0fWPr*)nYJpHTerVmJ5#)smxE!ga{h&^>)wxa7p5P0UC`xRX7AMX_Kp*i
giUUqmFKEH|)6A)&`f{Z+Fm*F{y85}Sb4q9e0Jx@NWdHyG

literal 0
HcmV?d00001

diff --git a/Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/icon.png b/Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2d75aa86cbf067af0fbc6c95bf2089c0ff6fb8a
GIT binary patch
literal 570
zcmV-A0>%A_P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800063Nkl<ZSPAWw
z%}N_#6oy}&K*0negyKR;il9Phi-Lj+OM4Mr)@$hAoty6U7If()xUjT~Lc6F65e<k5
z$wEtLB1u7TtUezc8I#O75nVY4GH1T;{JrOIA|;emAgRD}ufWhl3gAu7|L?Z*kAFSL
zSE}1l)Y$@$PfRG~dAF*UzOTCEKn)5cHUNSb3I(OpX;rILegFJV`{h%;nHtm5+K7t9
zqB@<9DmOp|0Wo}=MvNCSZJnPx&DV2NcR2UR2c=kjv+R#wywmdgSK9b}CGY1KU2e@N
z_3=>t!itt>hqdwbM3WcaRH;-Hw+gWV_|u<U@E?D&p-C>jY&j6#(PnG__qKrS=`R!&
zJSa!s2G$uyJVF8BAp7=1&$^kfa{aH)wpRrYBkavb7@!^irkKfO)Y{u|En>PM3sx@e
zDtoZ5TrTH0=b+s5vFC@+u$kyP1KkFkSwV&nqQ|y&tYxWG5;Fol*$`5Z?C7Wq!bhml
zXt;MCRKixU)oiNWZa>}-(nGQ(2+kpb=ks|72yS4Iqldor-WfzZ`nJIIaY8m^58<30
zryT^PA{I1wkFMF-9C6o=dWJBlgcE|nAuBWQc4s^&@3uo0Mv(xRTr%U&Cm4wAxvSS|
zj#~=|f*vyL!X`fmCb9*lXsgNDoW{K~9|=z?kW?V4Kv)H?0nnopr4R1E;Q#;t07*qo
IM6N<$g7nY?xBvhE

literal 0
HcmV?d00001

diff --git a/Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/inhand-left.png b/Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe2901acd1f3fbfeb86d3b0ce614560665cdd9c5
GIT binary patch
literal 336
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU=;UsaSW-r_4d}<JSInxwukvA
z{OWx&4WeDNcdeA<S*hTgWw@7}r9A9zHG{vv2~pJ<rVW`=Op!vfazZt$%00>^eV?ej
z?~UbV_p=j$hJwI?rn2?%bCf^J?3{Gv!{3Dyx5mxB`0i`BMPZll^556Z-}@Tab@vM|
zU%&eK<H&6L%T*JzEM;eE&3x^ubz9P7(x&eVKi+IOk$xj>s^;#xU;O8d^=ED~4*2+U
z;rzo3_bG3f)917A_Nv=+UK`4<zCB0#ey;cZf0=37_LKMSxbm{%Y97nKJG-Voo>RA6
zIQY5`#6dt(!60=01L=k0@ul(yTVnR~*S2Upu|II!u8Fgj<<XJM&8JF=zXxPVtNz$t
fR>sc2@boX!G5hQ-Zx$r41R3G!>gTe~DWM4fdm53a

literal 0
HcmV?d00001

diff --git a/Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/inhand-right.png b/Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..5615899ced3a6b6cbf8db2633243ea187bfb9bef
GIT binary patch
literal 343
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV3hN8aSW-r_4d|6KW0af)`!Mt
zd03n|(;ONSn3J+rad3(q7Ebt8QOh8=pdu*n`mDB=HJOGjIk$2qcew`g<V<JX=={$=
zU+ww5nXA8f0Zj#g53P?+&sJKtCiL^RRbshwyBBe)U*F#9-&7-{^>l0M(cda3N~>l&
z|H)GEJep%+;G5g9bI0Y?OTO;VpWm{!GWTZUO`FhN<^O&b&NKV>bN%t!$mdV2Y*WvF
z|LUG#CNraEXTWybtC9Z}<W;W%vM1;NPY$_zZXI9vVz0{WV#NaM%#=TvRhszLGj4p!
z3ULq6$0A9$B!Bq5Hg`R~$vEKHzb!u`%Gv&{VGNpM&7A5pSMY;pfSLc+`jS=Cmv<)Z
k{TszQ;RicE!w>y?jAw(>t~$(pZ2>aL)78&qol`;+0Nr4bq5uE@

literal 0
HcmV?d00001

diff --git a/Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/meta.json b/Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/meta.json
new file mode 100644
index 00000000000..2467db2bdea
--- /dev/null
+++ b/Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)  | vulpkanin version edited by Floofers. Vox state by Flareguy for SS14, Modified by Rosycup for TheDen",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-MASK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-MASK-vox",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-MASK-vulpkanin",
+            "directions": 4
+        },
+        {
+            "name": "equipped-MASK-reptilian",
+            "directions": 4
+        }
+    ]
+}

From 8961f61f3e72cd91b2fb31a6a27f23fb6de397d0 Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Mon, 6 Jan 2025 03:34:56 +0800
Subject: [PATCH 8/9] Move The Den files to upstream namespace

---
 .../Catalog/Fills/Lockers/heads.yml           |   6 ++--
 .../Catalog/Fills/Lockers/suit_storage.yml    |   2 +-
 .../Jobs/Medical/chiefMedicalOfficer.yml      |   4 +--
 .../Entities/Clothing/Masks/masks.yml         |  11 +++++++
 .../Entities/Clothing/OuterClothing/coats.yml |  11 +++++++
 .../Loadouts/Jobs/Command/captain.yml         |  28 ++++++++++++++++++
 .../Jobs/Medical/chiefMedicalOfficer.yml      |   6 ++--
 .../TheDen/Entities/Clothing/Masks/masks.yml  |  10 -------
 .../Entities/Clothing/OuterClothing/coats.yml |  10 -------
 .../TheDen/Loadouts/Jobs/Command/captain.yml  |  28 ------------------
 .../equipped-MASK-reptilian.png               | Bin
 .../equipped-MASK-vox.png                     | Bin
 .../equipped-MASK-vulpkanin.png               | Bin
 .../gascaptaincombat.rsi/equipped-MASK.png    | Bin
 .../Mask/gascaptaincombat.rsi/icon.png        | Bin
 .../Mask/gascaptaincombat.rsi/inhand-left.png | Bin
 .../gascaptaincombat.rsi/inhand-right.png     | Bin
 .../Mask/gascaptaincombat.rsi/meta.json       |   0
 .../equipped-OUTERCLOTHING.png                | Bin
 .../Coats/cap_trenchcoat.rsi/icon.png         | Bin
 .../Coats/cap_trenchcoat.rsi/inhand-left.png  | Bin
 .../Coats/cap_trenchcoat.rsi/inhand-right.png | Bin
 .../Coats/cap_trenchcoat.rsi/meta.json        |   0
 23 files changed, 59 insertions(+), 57 deletions(-)
 delete mode 100644 Resources/Prototypes/TheDen/Entities/Clothing/Masks/masks.yml
 delete mode 100644 Resources/Prototypes/TheDen/Entities/Clothing/OuterClothing/coats.yml
 delete mode 100644 Resources/Prototypes/TheDen/Loadouts/Jobs/Command/captain.yml
 rename Resources/Textures/{TheDen => }/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-reptilian.png (100%)
 rename Resources/Textures/{TheDen => }/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-vox.png (100%)
 rename Resources/Textures/{TheDen => }/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-vulpkanin.png (100%)
 rename Resources/Textures/{TheDen => }/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK.png (100%)
 rename Resources/Textures/{TheDen => }/Clothing/Mask/gascaptaincombat.rsi/icon.png (100%)
 rename Resources/Textures/{TheDen => }/Clothing/Mask/gascaptaincombat.rsi/inhand-left.png (100%)
 rename Resources/Textures/{TheDen => }/Clothing/Mask/gascaptaincombat.rsi/inhand-right.png (100%)
 rename Resources/Textures/{TheDen => }/Clothing/Mask/gascaptaincombat.rsi/meta.json (100%)
 rename Resources/Textures/{TheDen => }/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/equipped-OUTERCLOTHING.png (100%)
 rename Resources/Textures/{TheDen => }/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/icon.png (100%)
 rename Resources/Textures/{TheDen => }/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/inhand-left.png (100%)
 rename Resources/Textures/{TheDen => }/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/inhand-right.png (100%)
 rename Resources/Textures/{TheDen => }/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/meta.json (100%)

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 3aab88f813f..664da15f653 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -33,7 +33,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingOuterCoatCapTrench # TheDen
+      - id: ClothingOuterCoatCapTrench
       - id: NukeDisk
       - id: PinpointerNuclear
       - id: CaptainIDCard
@@ -55,7 +55,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingOuterCoatCapTrench # TheDen
+      - id: ClothingOuterCoatCapTrench
       - id: NukeDisk
       - id: PinpointerNuclear
       - id: CaptainIDCard
@@ -76,7 +76,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingOuterCoatCapTrench # TheDen
+      - id: ClothingOuterCoatCapTrench
       - id: NukeDisk
       - id: PinpointerNuclear
       - id: CaptainIDCard
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
index ab11eb1ed9e..94ef753c789 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -228,7 +228,7 @@
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitCap
         - id: ClothingMaskGasCaptain
-        - id: ClothingMaskGasCaptainCombat #TheDen
+        - id: ClothingMaskGasCaptainCombat
   - type: AccessReader
     access: [["Captain"]]
 
diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml
index d1a88dc09ca..2936d311548 100644
--- a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml
+++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml
@@ -92,6 +92,6 @@
     - type: loadout
       id: LoadoutChiefMedicalOfficerJumpskirt
     - type: loadout
-      id: LoadoutChiefMedicalOfficerTurtleskirt # The Den
+      id: LoadoutChiefMedicalOfficerTurtleskirt
     - type: loadout
-      id: LoadoutChiefMedicalOfficerTurtlesuit # The Den
+      id: LoadoutChiefMedicalOfficerTurtlesuit
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index 383e32e99d6..c5b34a7a67f 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -88,6 +88,17 @@
   - type: BreathMask
   - type: IngestionBlocker
 
+- type: entity
+  parent: ClothingMaskGasExplorer
+  id: ClothingMaskGasCaptainCombat
+  name: captain's combat gas mask
+  description: A military-grade gas mask that can be connected to an air supply, painted and outfitted with an emblem befitting its wearer. Issued only to the station's finest.
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/gascaptaincombat.rsi
+  - type: Clothing
+    sprite: Clothing/Mask/gascaptaincombat.rsi
+
 - type: entity
   parent: ClothingMaskGasAtmos
   id: ClothingMaskGasCentcom
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
index dc5454d597b..07fe385478a 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -51,6 +51,17 @@
   - type: Clothing
     sprite: Clothing/OuterClothing/Coats/gentlecoat.rsi
 
+- type: entity
+  parent: [ClothingOuterArmorCaptainCarapace, ClothingOuterStorageBase]
+  id: ClothingOuterCoatCapTrench
+  name: captain's armored trenchcoat
+  description: A greatcoat enhanced with a special alloy for some extra protection and style for those with a commanding presence, outfitted with emblems and decor befitting its wearer. Issued only to the station's finest.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Coats/cap_trenchcoat.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Coats/cap_trenchcoat.rsi
+
 - type: entity
   abstract: true
   parent: AllowSuitStorageClothing
diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
index b64ad384ef4..02ed0324e3b 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
@@ -355,6 +355,19 @@
   items:
     - ClothingMaskGasCaptain
 
+- type: loadout
+  id: LoadoutCommandCapMaskGasCombat
+  category: JobsCommandCaptain
+  cost: 0
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutCaptainMask
+    - !type:CharacterJobRequirement
+      jobs:
+        - Captain
+  items:
+    - ClothingMaskGasCaptainCombat
+
 # Outer
 - type: loadout
   id: LoadoutCommandCapOuterWinter
@@ -382,6 +395,21 @@
   items:
     - ClothingOuterArmorCaptainCarapace
 
+- type: loadout
+  id: LoadoutCaptainOuterTrench
+  category: JobsCommandCaptain
+  cost: 0
+  exclusive: true
+  canBeHeirloom: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutCaptainOuter
+    - !type:CharacterJobRequirement
+      jobs:
+        - Captain
+  items:
+    - ClothingOuterCoatCapTrench
+
 # Shoes
 - type: loadout
   id: LoadoutCaptainShoesLaceup
diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml
index f99f2ec5aa6..ed3d05b2403 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml
@@ -213,8 +213,8 @@
   items:
     - ClothingUniformJumpskirtCMO
 
-- type: loadout 
-  id: LoadoutChiefMedicalOfficerTurtleskirt # The Den // LETS HOPE IT STICKS THIS TIME
+- type: loadout
+  id: LoadoutChiefMedicalOfficerTurtleskirt
   category: JobsMedicalChiefMedicalOfficer
   cost: 0
   requirements:
@@ -227,7 +227,7 @@
     - ClothingUniformJumpskirtCMOTurtle
 
 - type: loadout
-  id: LoadoutChiefMedicalOfficerTurtlesuit # The Den
+  id: LoadoutChiefMedicalOfficerTurtlesuit
   category: JobsMedicalChiefMedicalOfficer
   cost: 0
   requirements:
diff --git a/Resources/Prototypes/TheDen/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/TheDen/Entities/Clothing/Masks/masks.yml
deleted file mode 100644
index 0c842236e9e..00000000000
--- a/Resources/Prototypes/TheDen/Entities/Clothing/Masks/masks.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- type: entity
-  parent: ClothingMaskGasExplorer
-  id: ClothingMaskGasCaptainCombat
-  name: captain's combat gas mask
-  description: A military-grade gas mask that can be connected to an air supply, painted and outfitted with an emblem befitting its wearer. Issued only to the station's finest.
-  components:
-  - type: Sprite
-    sprite: TheDen/Clothing/Mask/gascaptaincombat.rsi
-  - type: Clothing
-    sprite: TheDen/Clothing/Mask/gascaptaincombat.rsi
diff --git a/Resources/Prototypes/TheDen/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/TheDen/Entities/Clothing/OuterClothing/coats.yml
deleted file mode 100644
index 42de89a2a0c..00000000000
--- a/Resources/Prototypes/TheDen/Entities/Clothing/OuterClothing/coats.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- type: entity
-  parent: [ClothingOuterArmorCaptainCarapace, ClothingOuterStorageBase]
-  id: ClothingOuterCoatCapTrench
-  name: captain's armored trenchcoat
-  description: A greatcoat enhanced with a special alloy for some extra protection and style for those with a commanding presence, outfitted with emblems and decor befitting its wearer. Issued only to the station's finest.
-  components:
-  - type: Sprite
-    sprite: TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi
-  - type: Clothing
-    sprite: TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi
diff --git a/Resources/Prototypes/TheDen/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/TheDen/Loadouts/Jobs/Command/captain.yml
deleted file mode 100644
index 1ca47ead315..00000000000
--- a/Resources/Prototypes/TheDen/Loadouts/Jobs/Command/captain.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-- type: loadout
-  id: LoadoutCaptainOuterTrench
-  category: JobsCommandCaptain
-  cost: 0
-  exclusive: true
-  canBeHeirloom: true
-  requirements:
-    - !type:CharacterItemGroupRequirement
-      group: LoadoutCaptainOuter
-    - !type:CharacterJobRequirement
-      jobs:
-        - Captain
-  items:
-    - ClothingOuterCoatCapTrench
-
-# Mask
-- type: loadout
-  id: LoadoutCommandCapMaskGasCombat
-  category: JobsCommandCaptain
-  cost: 0
-  requirements:
-    - !type:CharacterItemGroupRequirement
-      group: LoadoutCaptainMask
-    - !type:CharacterJobRequirement
-      jobs:
-        - Captain
-  items:
-    - ClothingMaskGasCaptainCombat
diff --git a/Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-reptilian.png
similarity index 100%
rename from Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-reptilian.png
rename to Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-reptilian.png
diff --git a/Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-vox.png
similarity index 100%
rename from Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-vox.png
rename to Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-vox.png
diff --git a/Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-vulpkanin.png
similarity index 100%
rename from Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-vulpkanin.png
rename to Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-vulpkanin.png
diff --git a/Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK.png
similarity index 100%
rename from Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK.png
rename to Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK.png
diff --git a/Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/icon.png b/Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/icon.png
similarity index 100%
rename from Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/icon.png
rename to Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/icon.png
diff --git a/Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/inhand-left.png
diff --git a/Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/inhand-right.png
diff --git a/Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/meta.json b/Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/meta.json
similarity index 100%
rename from Resources/Textures/TheDen/Clothing/Mask/gascaptaincombat.rsi/meta.json
rename to Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/meta.json
diff --git a/Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/icon.png
similarity index 100%
rename from Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/icon.png
diff --git a/Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/inhand-left.png
diff --git a/Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/inhand-right.png
diff --git a/Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/meta.json
similarity index 100%
rename from Resources/Textures/TheDen/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/meta.json

From 3922f1183eec574ab9a67d16781d1f2a0a09feda Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Mon, 6 Jan 2025 03:45:35 +0800
Subject: [PATCH 9/9] Re-add head mirror to loadouts, add new items to loadout
 groups

---
 .../CharacterItemGroups/Jobs/Command/captain.yml    |  4 ++++
 .../Jobs/Medical/chiefMedicalOfficer.yml            |  2 ++
 .../Loadouts/Jobs/Medical/chiefMedicalOfficer.yml   | 13 +++++++++++++
 3 files changed, 19 insertions(+)

diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml
index 57df945ec91..842c285909b 100644
--- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml
@@ -107,6 +107,8 @@
   items:
     - type: loadout
       id: LoadoutCommandCapMaskGas
+    - type: loadout
+      id: LoadoutCommandCapMaskGasCombat
 
 - type: characterItemGroup
   id: LoadoutCaptainOuter
@@ -116,6 +118,8 @@
       id: LoadoutCommandCapOuterWinter
     - type: loadout
       id: LoadoutCaptainOuterCarapace
+    - type: loadout
+      id: LoadoutCaptainOuterTrench
 
 - type: characterItemGroup
   id: LoadoutCaptainShoes
diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml
index 2936d311548..77f6b3f26e9 100644
--- a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml
+++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml
@@ -46,6 +46,8 @@
   items:
     - type: loadout
       id: LoadoutChiefMedicalOfficerNTPDA
+    - type: loadout
+      id: LoadoutClothingHeadMirror
 
 - type: characterItemGroup
   id: LoadoutChiefMedicalOfficerNeck
diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml
index ed3d05b2403..3910e7b9bbf 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml
@@ -53,6 +53,19 @@
   items:
     - ClothingHeadHatBeretCmo
 
+- type: loadout
+  id: LoadoutClothingHeadMirror
+  category: JobsMedicalChiefMedicalOfficer
+  cost: 0
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutChiefMedicalOfficerHead
+    - !type:CharacterJobRequirement
+      jobs:
+        - ChiefMedicalOfficer
+  items:
+    - ClothingHeadMirror
+
 # Id
 - type: loadout
   id: LoadoutChiefMedicalOfficerNTPDA