From 2c2213e060d59ed1b93e907ff0b2614075896197 Mon Sep 17 00:00:00 2001
From: toasterpm87 <121322002+toasterpm87@users.noreply.github.com>
Date: Wed, 14 Feb 2024 14:26:34 -0600
Subject: [PATCH 1/2] Hanbok This reverts commit
 6449fe9f20e18ea7eb3c10891e29e123d084b692.

# Description

Description.

---

# TODO

- [ ] Task
- [x] Completed Task

---

<details><summary><h1>Media</h1></summary>
<p>

<!-- ![Example Media Embed](https://example.com/thisimageisntreal.png) -->

</p>
</details>

---

# Changelog

<!-- You can add an author after the `:cl:` to change the name that appears in the changelog, ex: `:cl: Death`, it will default to your GitHub display name -->

:cl:
- add: Added fun!
- tweak: Tweaked fun!
- fix: Fixed fun!
- remove: Removed fun!
---
 Resources/Prototypes/Caldera/Clothing/Outfits |   9 +++++++++
 .../Inventories/clothesmate.yml               |   1 +
 .../Hanbok.rsi/Equipped-INNERCLOTHING.png     | Bin 0 -> 553 bytes
 .../Caldera/Clothing/Hanbok.rsi/icon.png      | Bin 0 -> 822 bytes
 .../Caldera/Clothing/Hanbok.rsi/meta.json     |  18 ++++++++++++++++++
 5 files changed, 28 insertions(+)
 create mode 100644 Resources/Prototypes/Caldera/Clothing/Outfits
 create mode 100644 Resources/Textures/Caldera/Clothing/Hanbok.rsi/Equipped-INNERCLOTHING.png
 create mode 100644 Resources/Textures/Caldera/Clothing/Hanbok.rsi/icon.png
 create mode 100644 Resources/Textures/Caldera/Clothing/Hanbok.rsi/meta.json

diff --git a/Resources/Prototypes/Caldera/Clothing/Outfits b/Resources/Prototypes/Caldera/Clothing/Outfits
new file mode 100644
index 0000000000..2573a89923
--- /dev/null
+++ b/Resources/Prototypes/Caldera/Clothing/Outfits
@@ -0,0 +1,9 @@
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingHanbok
+  description: A traditional Korean dress
+  components:
+  - type: Sprite
+    sprite: Caldera\Clothing\Hanbok.rsi
+  - type: Clothing
+    sprite: Caldera\Clothing\Hanbok.rsi
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
index 31d0507135..8dfcfaa01c 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -100,6 +100,7 @@
     ClothingHandsGlovesColorGreen: 2
     ClothingHandsGlovesColorOrange: 2
     ClothingHandsGlovesColorPurple: 2
+    ClothingHanbok: 2
   contrabandInventory:
     ClothingMaskNeckGaiter: 2
     ClothingUniformJumpsuitTacticool: 1
diff --git a/Resources/Textures/Caldera/Clothing/Hanbok.rsi/Equipped-INNERCLOTHING.png b/Resources/Textures/Caldera/Clothing/Hanbok.rsi/Equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9efdb0128603a38eb5496b20341dd8693c084aa
GIT binary patch
literal 553
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#XuSa7#UhB#ep2ggPtyq
zAr*7p&brv!Y#`v0*{AoSN$bb1svo<gUNr63ZoIrGXUp^GWC3foR>{m%#?Jc{Nvd4l
zmjgsx1A!<cu=c)w?rpuxCc5AD$ega++4rP8_WQHts?VQV@#u92Gn=uru4bIlIpw`*
z&w63+mwFcjf_6ytK6yRI{g^=oUxN62W1*wli{&i)9+=-da_^C?vc|uAk1rSGC*|MH
zm+XxAGxK8z!%LS<Ki0pW|NT+%0S)HN3Dso{`}9)8Z{$bVUSlYFx>tWv{3?%s_Gdru
zVN*z6=hVozKg7e1Ie~%a!9hli1tJWmj?6pi?3}<LF1=&Q`u{t>ANaa;{*nL5N&c;e
z^AE(E_B{^LlK8_`)3rzgj8>$tKE->2dDW}qWwER7O*Hk|xxp_$>*ZG7!yCRmPVu=N
zWa{+cR^m0`FPeh6Zd@MTvnT)ZJn-OHb8c5vTtdO_irG8#<hbfJ-?~NXhn6+4o?5Z}
z)M0twn;$laGF@rj&b%d+?|$8}=C}XD?=tS3x2HCZfla?+#V79xyT$W&yBbs+biVpe
z0qpup#vI1W(=3lT9Avg(VJlGmlg00TV1<C*_YW^*3yv_b)EM)Ne0BWATImygIP{MM
kGXnzyUuuMBny)W|7Ld&W#2|1fcru9cboFyt=akR{04Y`KCIA2c

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Caldera/Clothing/Hanbok.rsi/icon.png b/Resources/Textures/Caldera/Clothing/Hanbok.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fc9be3dd95be0979a4bf37664d51aa342db11cd
GIT binary patch
literal 822
zcmV-61Ihe}P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7|Z2Q!E`M5s;{L`58>ibb$c+6t{Ym|Xe=O&XFE
z7e~Rh;NZt%)xpJCR|i)?5c~jfc5qU3krMxx6k5c3aNLh~_a1le0HIc5n$<A@Xu54C
zq7f;bS(O5>5YPt^-58OXWyF$;DYPA5_we!cF3hvqpZjz4s#%KxK8bja8KzCVK|Hf*
z8=UuvMOKhi;&bA0lP*a7$aTfzH_myN1)eFIsl+_7NG#=BSZQHaFg4<7;*hH8lrN+`
zRyl8R)=CxDxF>&MFsrX5xlVH!Q7j>bI3y^jpokJ|glW}Dv5=tsNE`o<>yML5Ay*NM
z91AEzgY5dj|KNAGR&Hw2OA1DS&KJk|7zF~mK)vcX-^Y$qKLPyDz?I(gmutZ6C+XFu
z7CHj@w}Ff6rl#xxmpj1VlOdb3EBR>(xg79*M&FbH25y0#HLthEK29Hi6m_+H0~{Oz
zV|mJ6Z}aZ1*53X-)9CL9S159v^nUxo00006VoOIv0RI600RN!9r;`8x010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru=mHKD3IRGB#H;`S0W(QNK~z}7?Uk`@#UK!df1V;`
zgmaZX4W0s7$_9~;mjE}J!QKKXQZ{gt9dMHsph=&KR9M(jo^hUEVTrFnaQOb;hdBd<
zLZMLDfl?|6A%e9wr0dq&AcP1?sjxTaWskV`9sr=VMl@lq4O(jefcG9!%3UT{&Zaae
z5n-Ap06^dOh~h*vkKTJ2W7r`TkWz+qa?bfeoO8a26H#_0HVwq2vBX4#wrv;U>v){s
zY(PpmpL?uADxQkPcskFi!e#62<2Vch>$(n~-%s<}`e=v<#u%2)w|KY~j2~P2^}oD*
z%xh`s({cUW&9@-poD1(?k9d9l`EyTIRqQT(;9e91=P}@%3rFrd?-5+Pg8w1w&c<JF
zPG^hFr><*un1R$p4!PpHJK;Evn<kp3VJMu5UoifqN4f;vz5oCK07*qoM6N<$f=z{Q
Aod5s;

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Caldera/Clothing/Hanbok.rsi/meta.json b/Resources/Textures/Caldera/Clothing/Hanbok.rsi/meta.json
new file mode 100644
index 0000000000..f566c94015
--- /dev/null
+++ b/Resources/Textures/Caldera/Clothing/Hanbok.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Plyush/katayusha",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon"
+      },
+      {
+        "name": "equipped-INNERCLOTHING",
+        "directions": 4
+      }
+    ]
+  }

From eb360d9f5af7a60a86c4ecf77c446e7c7cdd3754 Mon Sep 17 00:00:00 2001
From: toasterpm87 <121322002+toasterpm87@users.noreply.github.com>
Date: Sun, 25 Feb 2024 16:25:19 -0600
Subject: [PATCH 2/2] beep

---
 Resources/Prototypes/Caldera/Clothing/Outfits   |   5 +++--
 .../Caldera/Clothing/Hanbok.rsi/icon.png        | Bin 822 -> 304 bytes
 .../Caldera/Clothing/Hanbok.rsi/meta.json       |   2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/Caldera/Clothing/Outfits b/Resources/Prototypes/Caldera/Clothing/Outfits
index 2573a89923..2048282aad 100644
--- a/Resources/Prototypes/Caldera/Clothing/Outfits
+++ b/Resources/Prototypes/Caldera/Clothing/Outfits
@@ -1,9 +1,10 @@
 - type: entity
   parent: ClothingUniformSkirtBase
+  name: hambok
   id: ClothingHanbok
   description: A traditional Korean dress
   components:
   - type: Sprite
-    sprite: Caldera\Clothing\Hanbok.rsi
+    sprite: Caldera\Clothing\hanbok.rsi
   - type: Clothing
-    sprite: Caldera\Clothing\Hanbok.rsi
+    sprite: Caldera\Clothing\hanbok.rsi
diff --git a/Resources/Textures/Caldera/Clothing/Hanbok.rsi/icon.png b/Resources/Textures/Caldera/Clothing/Hanbok.rsi/icon.png
index 3fc9be3dd95be0979a4bf37664d51aa342db11cd..07bafaa772c8d4e73df1b48d21162879de2c1b21 100644
GIT binary patch
delta 278
zcmV+x0qOp>2CxE<BYyz*Nkl<ZSPAWwu?@m75Je4Q0-AL6G|3J~8G<HLWQ=SSi5;>6
zT^f2S;92^TQBs^yESj^FoPGYj|NR{+A$W5K+yQsM9msH?ZQB>mG)=E`8Dq_*c}st9
z0fB*_s;UU@`#wknkui;VaB*OKnFXj`UDvTI5h=MaIWbEBJAa(#IUr&fh9Gi@l0(G=
zKn_XQbzkJ<X^O=JP&g%*BjkVCJ?qRzFplGn9o`-%)<r^*N(l4dBEa}M7;y_2WU^dw
z0Wu`A)N<u;;Cg<pmPSa^G+8yxN3hDcLDB{M-GS^|a5>&TU;hS&?<Gn)pkH-K4zKMF
cZ05ilrlDh4un&eh7XSbN07*qoM6N<$g5armT>t<8

delta 800
zcmV+*1K<3x0=5Q_BYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ>7|Z2Q!E`
zM5s;{L`58>ibb$c+6t{Ym|Xe=O&XFE7e~Rh;NZt%)xpJCR|i)?5c~jfc5qU3krMxx
z6k5c3aNLh~_a1le0HIc5n$<A@Xu54Cq7f;bS(O5>5YPt^-G3O7nPtS1iz&1nU-$6w
z^)Ae_+MoM#^r~5l0X~U%jv1y+yg@v(X&apPiA7eBRpN8vag#1c{K$31<2TNEmj#|F
znyJJ*u}CcCTUcpfRxmZ<Y2uKo>69;|Jytnyan?!|*0?8sVKA$&B)Lv=7*Q-ChBzcB
zsGx`vY=mjmNq@1Bp#4Z2|B&mClS?625sVxQC_{tn`oaI;cehq<YSK#zMu5&2$N3lq
z0=q!H>NwxWj#EDY{LjFZ-t?Di!0adK)ut9Y0{XXsi|eMQ>;acMz~GZ1o3bnUX$rX<
z@P0<$lmP~Afu1$5x5hqBAAl5fwR{5{90Fr`%3g2t?tiY<-u^w)=<f$tC~}<ie*3}z
z000JJOGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^Rj0uB@k
z0XiGRtN;K3Gf6~2R9M69m9cHbAP|Oso+4$0bCo^~o&s6Q29c1L05_Sz-U2C7HgJ<2
zaFZ3FNq?V;R9M(jo^hUEVTrFnaQOb;hdBd<LZMLDfl?|6A%e9wr0dq&AcP1?sjxTa
zWskV`9sr=VMl@lq4O(jefcG9!%3UT{&Zaae5n-Ap06^dOh~h*vkKTJ2W7r`TkWz+q
za?bfeoO8a26H#_0HVwq2vBX4#wrv;U>v){sY=1yXIiGv1LMon$#dtc;slsLJ?c+EM
z1M9jDpWjdO+WKgS2*wze&bN5D7K|TT`t`rOeavfV>C<uj+|9Qj;+zZbUypcw{`qrH
zRaNXRec)ac1LrZ|oC`<pJMR%(yMq5A>(0hsZ%${6&8Mzwc9?<GL=L&)yF1}Hj+-W$
erWs)<oQYpB{-sB{1l_&>0000<MNUMnLSTZ<3~x&S

diff --git a/Resources/Textures/Caldera/Clothing/Hanbok.rsi/meta.json b/Resources/Textures/Caldera/Clothing/Hanbok.rsi/meta.json
index f566c94015..fb1cbfbcec 100644
--- a/Resources/Textures/Caldera/Clothing/Hanbok.rsi/meta.json
+++ b/Resources/Textures/Caldera/Clothing/Hanbok.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Plyush/katayusha",
+    "copyright": "Plyush/molotovthief on discord",
     "size": {
       "x": 32,
       "y": 32