From 3e7ff70d31d89d3e0d199a216d04ab82ca615e21 Mon Sep 17 00:00:00 2001 From: Puro <103608145+PuroSlavKing@users.noreply.github.com> Date: Sun, 26 Mar 2023 22:11:43 +0300 Subject: [PATCH] [Clothing] Moth cloak and mask (#14851) * Moth cloak * Update meta.json * Update meta.json * fixed moth mask yes. * Moth mask now hides hair yes. * now the moth's cloak will spawn on the map yes --- .../Entities/Clothing/Head/hoods.yml | 15 +++++++++++++++ .../Entities/Clothing/Neck/cloaks.yml | 17 +++++++++++++++++ .../Markers/Spawners/Random/maintenance.yml | 1 + .../Head/Hoods/moth.rsi/equipped-HELMET.png | Bin 0 -> 1338 bytes .../Clothing/Head/Hoods/moth.rsi/icon.png | Bin 0 -> 491 bytes .../Clothing/Head/Hoods/moth.rsi/meta.json | 18 ++++++++++++++++++ .../Neck/Cloaks/moth.rsi/equipped-NECK.png | Bin 0 -> 2115 bytes .../Clothing/Neck/Cloaks/moth.rsi/icon.png | Bin 0 -> 856 bytes .../Clothing/Neck/Cloaks/moth.rsi/meta.json | 18 ++++++++++++++++++ 9 files changed, 69 insertions(+) create mode 100644 Resources/Textures/Clothing/Head/Hoods/moth.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hoods/moth.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hoods/moth.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Neck/Cloaks/moth.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Clothing/Neck/Cloaks/moth.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Neck/Cloaks/moth.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index d589a5cdb4..ed3b56668e 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -139,3 +139,18 @@ sprite: Clothing/Head/Hoods/goliathcloak.rsi - type: Clothing sprite: Clothing/Head/Hoods/goliathcloak.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatHoodMoth + name: moth mask + description: A mask in the form of a moths head is usually made of lightweight materials. It mimics the shape of a moths head with large eyes and long antennae. Such masks are often used in cosplay, or when shooting movies and videos. + components: + - type: Sprite + sprite: Clothing/Head/Hoods/moth.rsi + - type: Clothing + sprite: Clothing/Head/Hoods/moth.rsi + - type: IdentityBlocker + - type: Tag + tags: + - HidesHair diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index d3e50a610b..61b71afaa1 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -130,3 +130,20 @@ - type: ContainerContainer containers: toggleable-clothing: !type:ContainerSlot {} + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakMoth + name: moth cloak + description: A cloak in the form of moth wings is an unusual and original element of the wardrobe that can attract the attention of others. It is made of a thin fabric imitating moth wings, with soft and fluffy edges. The raincoat is fastened around the neck with Velcro, and has a hood in the shape of a moths head. + components: + - type: Sprite + sprite: Clothing/Neck/Cloaks/moth.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodMoth + requiredSlot: + - neck + - type: ContainerContainer + containers: + toggleable-clothing: !type:ContainerSlot {} + diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 0b6f7208ae..d200e12386 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -16,6 +16,7 @@ - ClothingHeadHelmetTemplar - ClothingNeckCloakTrans - ClothingNeckCloakAdmin + - ClothingNeckCloakMoth - ClothingNeckCloakGoliathCloak - ToySkeleton - Basketball diff --git a/Resources/Textures/Clothing/Head/Hoods/moth.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/moth.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..1bde95390d06f9e8a84c599cce8752deaebb0d41 GIT binary patch literal 1338 zcmV-A1;zS_P)`6pHRCt{2nome0R~*N`({)*RX%wNR2CdRmLQ^w311O+afEbal}Yl8}rE z%dWg0vhVFA>So@o<7?OXfQNY*-|zSP&hNeX^ZQAJ5S(RNnw?-|z9!Xjo*l~`FFe|$ z)OcPwJ!R=UUK;21eKd9KoceE*>}tv$FO<-iP3=p~GC-0fkiVnEC>a0%>df!IJY?s* zKlm{-3IK|#K)QPGm4m0)wQnW6EeX)*OfnY7jXQVQSn7xGFfg= z$AybB05B0QT$C|Bt0OU?Il7}JCNyFWzG4*WM6hF@I|EYD0X*5S){Q;cuOby4;GN1g zg{>7lEw1DIvjUzL*HPG7u{{^p9*~`hkhMSlLjQ-?008H_S8$MD2LLQBEFuu@L+@zZ zv3(#r6CnW5)!hR{RoJ*uGO)3_3;=cZPjnN^&P0f>!w1>p#r*Uf69K3NfAjV&RLgnj zJGvtxnC+W`rx+#UkbNrxG<^;*BYV84mh-rI`xfS>=h!$6UiNr_9i3-NF6eEJ-Vzm6 zf%*1m$3FKG=<4oa#;61Icw=?h@g)!pY1rG|M4P{pjTO^R~`hWu&VCFP~Ze(wJ zlkEre*e=}90ix+0jZ6BD&aV94_U0?yd2BBM(O6l6j=T*0pK#=5=yk&tK(qs*aRm_V zfM{F+L^~iFR{+rth{hE_v;(4X1rY6kXj}nAJ0KcY0MQPJ#_~tea(apYFY5C^tx&Q1 z=OO^$oiBbo)lWzNeE&HCfcE#U9rEcpmi*z#07+35wD~(Bd%Ublq+Y&+Tz1Xz%CMQl zghq1NHK>;_v7(IZ@uJP&Nk5iaz8Jip#U%ikpPnNCFf`QDDsx=cRMJ({V#>q@n|?Lj|ZcO$5Sy2!#8%=Cf5A3x+i0GHKxLcWX-k zSC|NoAO31*N=vjq+eIq+34mI223>xIt(6x(al)Mez78LZl7V1ILt$$LEeA#R+tR`! zu0MF>*d}=W!6RvDVUZoT928mbM#+G$!}pT^J{m3ovNI7v>+)2DYB>*8meA@CaHpRg z0^vTi`U6m93Dt6*1rLDs3~+72+!;Vi(i^MG$Ys*(c|cJW1VdU~&F-Y3rEx`7*!@43 zNn>MmxvpD;2d+K9*Wo+Vi9rL_cXV`h_t;899{c8oD05Rrb_OIE(zxy0?hl}tE3-~s zeE`mMq7Xt}`gh0)Q$zB9jYi*^#YPBeULJqlIrFc>t^lGP5REHJNR9J=Wm9b01Kop0+s36r;utVr3D2js)Y8;$|y0|zvbg)}z zhe8Ma8*~ro)XhSjsJl2dOByNro0|G&sm}&>q@~>4DNE4{o^Qm-qYb-n*P3 zB6Kr)y6PSRga9Ex2mtg23B0Rq@f$TYk3?fc?MIdztGQvn?|VKXZEwA@`>GqX4gKyPf6x7s}b<&zR)^V3YN<%))T2Dexvqr z4If>dl=>wY8J|>U=8%c^mC*pqY`m6cB0knerWc;T9{~cX_ h4MTtsAOr{j-T^sc?m~)y_^SW_002ovPDHLkV1lbT*r5Ob literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hoods/moth.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/moth.rsi/meta.json new file mode 100644 index 0000000000..de79344649 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hoods/moth.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Paradise Station from this PR https://github.com/ParadiseSS13/Paradise/pull/17000, original sprite by S34N (https://github.com/S34NW) and modified sprite by PuroSlavKing (https://github.com/PuroSlavKing)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Neck/Cloaks/moth.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/moth.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..de0d51289e9700340f9b05dc4c47de598501e534 GIT binary patch literal 2115 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 i%m22#_+PXC0KWiH(DN%&fI-p#0000