From cc411ecf57f98fbadf2336d80fd48ffb3af9b531 Mon Sep 17 00:00:00 2001
From: Skarletto <122584947+Skarletto@users.noreply.github.com>
Date: Sun, 23 Jul 2023 15:15:52 -0400
Subject: [PATCH] add cap cap (#18234)

* add cap cap

* locker'd
---
 .../Catalog/Fills/Lockers/heads.yml           |   1 +
 .../Entities/Clothing/Head/hats.yml           |  16 +++++++++++++++-
 .../Head/Hats/capcap.rsi/equipped-HELMET.png  | Bin 0 -> 596 bytes
 .../Clothing/Head/Hats/capcap.rsi/icon.png    | Bin 0 -> 381 bytes
 .../Clothing/Head/Hats/capcap.rsi/meta.json   |  18 ++++++++++++++++++
 5 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png
 create mode 100644 Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 401459bb30..ee74f8635e 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -93,6 +93,7 @@
       - id: WeaponAntiqueLaser
       - id: JetpackCaptainFilled
       - id: MedalCase
+      - id: ClothingHeadHatCapcap
 
 - type: entity
   id: LockerHeadOfPersonnelFilled
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 7813870d48..26edce4948 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -230,7 +230,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatHopcap
   name: head of personnel's cap
-  description: A grand, stylish captain cap.
+  description: A grand, stylish head of personnel's cap.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/hopcap.rsi
@@ -730,3 +730,17 @@
   - type: ContainerContainer
     containers:
       storagebase: !type:Container
+      
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatCapcap
+  name: cap cap
+  description: A grand, stylish captain cap.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/capcap.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/capcap.rsi
+  - type: Tag
+    tags:
+    - WhitelistChameleon
diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e6bdff9f213909b049ea9e849b56b784b53914f
GIT binary patch
literal 596
zcmV-a0;~OrP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%4oO5oRCt{2+COL$VHn5p?+xB!gw&d$rL;L>6d@I&gOh`cageSm#)3F0I5-*z
zA^{y8ggS{(BkEcl)WyNcK?61*8YQ-rW{7PA#w8A~gIvfzq3>O<ApAa4xVz-{<jI@q
zc^m?Y<qF1s-F|h)3Hmufx%vCu{7(6L;C$;h#&QMINlef=a1b+J##zkc{`iX9Z0t%S
zdh>l@^0)nl!QkcDTV%3ns+AhE%eO-pVw*ooko;{w=y{%L9=gB_?-`e0I!sMYckivO
zukz@O;cWdpi7!v7*Xujp06)Kzm;e|$0RV2ZVV!SP=vaKr#N+!}Dvp!Mrn}dxl^S!U
z4O*>Dwpv?}{SCZi$}|t3`{(_{=jYVFf3wQBF4k|tps2t6VD{h%+^rf!L_|bHL_|bH
zL_|d7e-(O+<j?8dW&?<RSHRy(=nhFk>;^!H28<e4oB1;PZq7v3gjlX%e%@WdS<H8@
zg&oNUT95!}A351q#QRf^$z;<w$DTxb0?dbtrdp|S{LQ7l=Epw01?*3t^?pF_ukO#~
zU&roI{5Zqf`l|JK+Lo70nW@QXN=H{X-M#_PSC8$EfK{=669D$SdqD4~dg0110Om>?
zku||frp!`t9Dr*N_x6p&f1kJt5bc5l{GHJcUK_P9u+vTOlBuEGR%>(UIqe6Ch=_=Y
ih=_=Yh=_>DXnz1!-tY}zkzbtv0000<MNUMnLSTZ$!XwfE

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..771ba8fca306aa158c752a5027947c846c0b5001
GIT binary patch
literal 381
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<=AJH&ArY;~
z2@<S}6GVEN7}<KBWTkY^{3Ac}f3~MyWZJ|foHsAUD`~AL%6~WEsl+0YPdmc@{#VuN
zOw`mn@a-8N^X=EqdE(2q37X9B6gsW{`kJxKkBPmC|GZsVA5LGP!rWhdwVuZ_NcKQg
zkrha-K)fRB=hVAZY_iUwY>B~wBJKySY}{LS4kWMmxU-wdk@4XF{b!9OC4gX?#<~QL
zI|olFD66(FdUkTNJI`m^f5t!V^fy@l`P=@T<*d5ZMh-5Hf9VMc2?7EFNjE~Y&n!q@
z(WO-X^iM9^{%6~H<n8t(10@ws6|n(<SduKm<`_4xzJu$33NkYvj^?S1SaCqcF_hh*
z_KW;YrIHU%ZYsC&%ij}xTg}F1#I5AYn!0A??|;p^Q^a$?;S*@U<#w=vk>Nyp+Ovaq
S3sQjL$>8bg=d#Wzp$PzI*qMX?

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
new file mode 100644
index 0000000000..4601ad8a0d
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from TG\u0027s https://github.com/tgstation/tgstation/commit/0671297bb1c1b31d5885f2768aecbe9dc51d39e7l , edited by Skarletto (github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file