From 40361ec0ada39e0700dbe5cb95286a6011480aaa Mon Sep 17 00:00:00 2001
From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Thu, 12 May 2022 05:15:25 -0600
Subject: [PATCH] Fish Cap (#8046)

* Add files via upload

* Update hats.yml

* Update clothesmate.yml
---
 .../Inventories/clothesmate.yml               |   1 +
 .../Entities/Clothing/Head/hats.yml           |  11 +++++++
 .../Head/Hats/fishcap.rsi/equipped-HELMET.png | Bin 0 -> 379 bytes
 .../Clothing/Head/Hats/fishcap.rsi/icon.png   | Bin 0 -> 359 bytes
 .../Head/Hats/fishcap.rsi/inhand-left.png     | Bin 0 -> 389 bytes
 .../Head/Hats/fishcap.rsi/inhand-right.png    | Bin 0 -> 392 bytes
 .../Clothing/Head/Hats/fishcap.rsi/meta.json  |  27 ++++++++++++++++++
 7 files changed, 39 insertions(+)
 create mode 100644 Resources/Textures/Clothing/Head/Hats/fishcap.rsi/equipped-HELMET.png
 create mode 100644 Resources/Textures/Clothing/Head/Hats/fishcap.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Head/Hats/fishcap.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Head/Hats/fishcap.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Head/Hats/fishcap.rsi/meta.json

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
index f2cf161f78..ff09d09619 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -51,3 +51,4 @@
     ClothingHeadHatBunny: 2
     ClothingHeadHatCake: 2
     ClothingOuterWinterCoat: 3
+    ClothingHeadFishCap: 2
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 9d69de1a51..852a547455 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -434,3 +434,14 @@
     sprite: Clothing/Head/Hats/papersacksmile.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/papersacksmile.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadFishCap
+  name: fishing cap
+  description: Women fear me. Fish fear me. Men turn their eyes away from me. As I walk no beast dares make a sound in my presence. I am alone on this barren Earth.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/fishcap.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/fishcap.rsi
diff --git a/Resources/Textures/Clothing/Head/Hats/fishcap.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/fishcap.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000000000000000000000000000000000..7db49b964bf560fd29d617c38affdcbd70e77648
GIT binary patch
literal 379
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zO+8&4Ln`LH
zy=Cav5+HEwBfs;`X|r;2a~(IBZ#*nq!MNs{c0>j1H8=kUtk-UJxoPt!KAM)Telp^u
zkoXy+%F}M&|F5o?@IB3lGvJH|&}@bc%}UqT*=(I!{at_G=4~?j|1YyKm6g}ByRkk$
z^mFT%Uv@r%Ovn58R@TJXT)7@t_|Ep&+FANdb2dM}nG(J^{(61qYKH%vzeQ)*_`Q0a
zX~sM0jM)zEfGH=7CboK{TGzzCeI0!H_VFTHIZt!{!++TrK~{o*Ow(ER8+SJ^(vVtW
znUp3LJ8zAh#1h+i%f;r)ma1=is5E1yXHYcX)Rfxp4WI8Oay__t#dPk)oSFGv;XLn;
zbnLdhC$>RD_-++{OmLuDkXW9}vj6O_)3f(v+64X8`EuaO_xZ~u7wg*PR)Orw{=sz5
VKf%~^jpP>)*VEO{Wt~$(698Jip349L

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Hats/fishcap.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/fishcap.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8e6af121c89f3923e089709457120ba53c9bf35
GIT binary patch
literal 359
zcmV-t0hs=YP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<S8A(JzRCt{2)Ugi1KpY0}t5hNulUOCv!6>|du}{D*Onrt9eFdF}
zohL9FEzAay*u*Z<MC07GDHoOVzuq-n?i)CFdfzXnYNCRp0UDqI8Xykv`k1@!Zj9Uj
zm?RmOmxG_*2`Nwj0S2(;G>_rxJ!UbcRTn~l0j;JLy`Rp<)EdQPMSuZGaRT|CrwI>N
zX6F)UUnM7yDvu_f2#vcK&G+0>P<jGcqU;262NZq+&e~B@m>DqLc47#MA-?VNFSy*$
zzZ(z^Aa}Fjjbezqi05qiau|UAm8vE(CcWq*p6&R>G{ABgfTmU<FF`a+AU`8eECevy
z4dy`;d=~DZR5=VlHYPQgw~izN`w1jV<N-NG12mv;zzdubZmCO{ECK)k002ovPDHLk
FV1kA-iLw9y

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Hats/fishcap.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/fishcap.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..d13e5c497a4ca21fb58c9d0fcbd1370297243433
GIT binary patch
literal 389
zcmV;00eb$4P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$KS@MERCt{2+C5IgKoExEZ;{JTf|Qz?D)d-%Z~`t6s&EC6xB}@o0T&>xIRF)h
zK!OrFA`OjW5)879XB|V{r?S`fcz5JKc~$}d00000n<ltN9FMHjcJt8eJRUJ>@(ns3
znf7;;>}(fJ^OslY@wxs0JYqDEcn6fE_tV>AIb5IAKF-V(&JHBygYLkVcR)M8`*z)|
zd{y^>djftELiN>KwU3#(Co;+{Fqut?<>~R%EpDA8HWeiSo`a6fKcyFkrl+^h_2EFe
zx{vY-1Aw-A{cy^%ta6_;O<SF#vk#%ZA_42}00000002POdi_uED>Ji2^>{^#vU!x!
zSPYg|MU$hw(zdx|zfHo%{}Lks>+V2Z%O&?^ZD*4FnP<SF<nBFnrvC}ZXN-l*R4Zlo
jWy3*-9RdIV_$NL9AEi_SgpF-{00000NkvXXu0mjf71^i%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Hats/fishcap.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/fishcap.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9cc9144fc4db2249c802082fcf7b0359298a9ef
GIT binary patch
literal 392
zcmV;30eAk1P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$LP<nHRCt{2+A&VUFcg5{XOyvwAa!PD3Of-SoPZ02sa%19E6@o}zy)A6J4_q`
ziHu<*(qo7k+SsLWkRWdUPpag+I92`JCY7H>000000KnK7Cz7Y?#O_|)enS>8hSgx6
zsvPc1vbWoWs-hHmeUB#zfn!K~@9}wl-?YumnTUv})=4!cjyzOF*{R=7JD`^jKOPU+
zVv<5Q30NnVnGfat3Ctd6O?!SiZ`wmof-y!UPlK-UCSZBc+s>WRt7Db7kMHB@MCAHu
z*i#PxJw<<Wv(|R*n`N03>-<M(TakeO{r~^~00000e{JKMptaV!mgcL$>+Q3cq1Vq^
zyrr>?@>G+P1MewS)tHhn`Xw<E(D%Z1J1~|@>oNG%H=ruYm6u3-rS*O{!Re&lbkt%l
mj_PxZCqyh8s{jB1#^?(Px>px_@^=~l0000<MNUMnLSTZtOswAk

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Hats/fishcap.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/fishcap.rsi/meta.json
new file mode 100644
index 0000000000..dd5cb1212c
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/fishcap.rsi/meta.json
@@ -0,0 +1,27 @@
+
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation closed pull at https://github.com/tgstation/tgstation/pull/66796 and modified by emisse for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file