From 77cfdabe53b1d88d3c2031beabf30db46d03ca01 Mon Sep 17 00:00:00 2001 From: Kirus59 <145689588+Kirus59@users.noreply.github.com> Date: Fri, 19 Apr 2024 00:07:15 +0300 Subject: [PATCH] CapBeret (#912) * Add Cap Beret * Update meta.json --------- Co-authored-by: Dexler <69513582+DexlerXD@users.noreply.github.com> --- .../Catalog/Fills/Lockers/dressers.yml | 1 + .../Entities/Structures/Machines/lathe.yml | 1 + .../Prototypes/Recipes/Lathes/clothing.yml | 10 +++++++ .../SS220/Entities/Clothing/Head/capberet.yml | 14 ++++++++++ .../Hats/beret_cap.rsi/equipped-HELMET.png | Bin 0 -> 573 bytes .../Clothing/Head/Hats/beret_cap.rsi/icon.png | Bin 0 -> 327 bytes .../Head/Hats/beret_cap.rsi/inhand-left.png | Bin 0 -> 489 bytes .../Head/Hats/beret_cap.rsi/inhand-right.png | Bin 0 -> 492 bytes .../Head/Hats/beret_cap.rsi/meta.json | 26 ++++++++++++++++++ 9 files changed, 52 insertions(+) create mode 100644 Resources/Prototypes/SS220/Entities/Clothing/Head/capberet.yml create mode 100644 Resources/Textures/SS220/Clothing/Head/Hats/beret_cap.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hats/beret_cap.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hats/beret_cap.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hats/beret_cap.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hats/beret_cap.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml index 9cdb3a36c9cd..bf2d653d4768 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml @@ -6,6 +6,7 @@ - type: StorageFill contents: - id: ClothingHeadHatCaptain + - id: ClothingHeadBeretCap #SS220 CapBeret - id: ClothingNeckCloakCap - id: ClothingNeckCloakCapFormal - id: ClothingUniformJumpsuitCapFormal diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index d3090aada8bc..7165ec086c16 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -887,6 +887,7 @@ - ClothingUniformJumpskirtColorGrey - ClothingUniformJumpsuitBartender - ClothingUniformJumpskirtBartender + - ClothingHeadBeretCap #SS220 CapBeret - ClothingHeadCaptainCap #SS220 Captain's Cap tweak - ClothingHeadHatCaptain - ClothingUniformJumpsuitCaptain diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index ef994d407396..ac0ccce36e7b 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -988,6 +988,16 @@ Cloth: 100 Durathread: 50 +#SS220 CapBeret begin +- type: latheRecipe + id: ClothingHeadBeretCap + result: ClothingHeadBeretCap + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 +#SS220 CapBeret end + #SS220 Captain's Cap tweak begin - type: latheRecipe id: ClothingHeadCaptainCap diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Head/capberet.yml b/Resources/Prototypes/SS220/Entities/Clothing/Head/capberet.yml new file mode 100644 index 000000000000..be050555ff66 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Clothing/Head/capberet.yml @@ -0,0 +1,14 @@ +- type: entity + parent: ClothingHeadBase + id: ClothingHeadBeretCap + name: берет капитана + description: Голубой берет миротворца. + components: + - type: Sprite + sprite: SS220/Clothing/Head/Hats/beret_cap.rsi + - type: Clothing + sprite: SS220/Clothing/Head/Hats/beret_cap.rsi + - type: Tag + tags: + - ClothMade + - WhitelistChameleon diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/beret_cap.rsi/equipped-HELMET.png b/Resources/Textures/SS220/Clothing/Head/Hats/beret_cap.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..cee4a66478b0566d64955dc8167d94598dd76f5d GIT binary patch literal 573 zcmV-D0>b@?P)Px$^+`lQRCr$Pnz2g6KoExaz*6LjD{UeucA_ug1K9W)f)8b5Y2gEionj{kn#S^q zLo7vQ19L24h0K`D{NSJF63FiV&o}?2*_ow(e$6cPA0M55%ewXZvb$~D*0h&JziFCI zf4+0DS^oHRYtmOQ%EiwQ&(i0r-H3mz9#RJ30U;Nk3*TOxboyJ1ru$t#UndI$6@aq% zTy(x}F2B<9?j>E^?@taviZ4@Bg0Mgs44_}UM86;5DN`WPFE!#b1c1EDn4#?y*WRVR3T?5^ZH160dguch~nkAAiSl(sGX=p3OXI8)w9c-1(P(KCj_s z{JlBMmycMrsIVW^kCAZ15v#VGEQB}9c2tBiYD|Y+8uq$Fky8~Ef5)Tv^7?Ka> VEB>B#)C3qZ44$rjF6*2UngBWketG}^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/beret_cap.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Head/Hats/beret_cap.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..5bfca5537e47fbc37b50b4e2e7fab6d9f101008e GIT binary patch literal 489 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z7kj!mhE&A8 zjWYB*>>#jbPm@~j%79sW8siVJYy4n*&mk)B;U(A5;?g>$i_J;cd|?NRy@S`5X)=-8 z0cCSHyL~$sI<08Cv9k2E8|{mS(*6ts_(mqM8$fuy>>ab_nlpxo-O?A&-?P3 zb^GGZKJWi{d4Ia-0?)XP{deq_UVUzK_slyV-xr^KH_iU4G&ObR)b&@+hiy>P@8yo% zyXHyvB8#5$@p)0NBPLJqWl*%U+rMhodEcN}6Mw~CIjiO{U1e?Fwwu#K8_ZZPq-!wT zVl=T6ZYX2uJ^@Z6i6>-z%?G-t&_?p0XBSzRZ?32i+HAA9r6(3bI|?aN(EvYokAZ z_sL)R&+j0k)0pqCpZL?1|MBtmb1FN1CSH?&{p;tvwoN+UrSAO+VE2BwDRTX`2Qggz zr6R5ud-7-7#kw;)FttzL9{N$^=)6k|E7xCUob=|xvS2=^+uYyVwzK&#Tywej=^|r> z?B;9U>=DAQr`_2Xl%9#wmrd{$(Uq5NxMrBWx1_-|a7#@IL)7s#UoSD@(lEg*tWS@A~BPV~#p$CDUp&K>$z_bDcG@}b99zZxFe+3k69K8wTsgQvGv z?Tul$u*6hg$$RceG82-v#w2qnTtD|^X*b`C?vi!SFEH*bTc#gd;t;>2*!K8d<}$%U XrH+woGY