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 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEF0ZWtljN$Rx_5rL;Ih!yAzQSh^rGOT2|b*r*X@zp z^!}~NtF(J-9%o*lfsV{Bfq@I7RH7R{F=U4vZH(96T^ru{y?)%pJtdYYcl?nS7AJLFxV0d-r{eGL2 z=X>mb7#edibggpORrP*q^YR;8^Hq22a$b1hV>#H;rA1}0*b7Z>z5-@4xB zek0=7^Z9*S@?9IuD`Y*6J(8GzHPDcYp`k1Az>hV3DLUt@r|OQOYkx~#z0N z-dwLFD*IsWDYMqKqBgqg9{<_QG*9e$;Ekw_w&K_2Cd}=eu+{#b)BpDC3=GfrgcnSR zXJ^pS)lm|7=lnk7&c<2=Yhgu(3s>(lyN2G_5ookw<1QYC(r^AH!e`F8bgVzje)I9s zKVM{o8CS5@fBvQ$a=P+`^)6+l8E(iP7D@P z51cJ)R^(-P<&v@IR|B(T!ZVZRyp;Uv$#2=e+|avoo^jDj*c~Wc#`^}^suPI7Uo5TtO9QvGGZ8AtQDlf87}g59K#{}$^BwcRTqQ) ztIrN=12+DCuEg+Qu6~`(Re$&YHUBLc8@_#CC;RE8<+MK!PcnE0if;L7tysNhjn|U6 zeJwF%XFs0WF!M-@ThUF^71Q-MF6w#nanafPp7ztC_DSrSe^ixW#{7B83CtS#%`Y3?8;)m?Bl-ICenmI{M{WVdi`1gTwpf z@gIHCxwD#Y<)}z@%fEgeSa6?}>EXUzZ7p4a3144xzIUx$s*=8&a5j;eOV6G zalbH3R54p@UF+JZ;&z3H z<}&W%lkb_-nBd`@n9Zuo?)vTar9(>V>?@w!P^D8xCq+WVc=@2N&;v5xw_T7?&OAB2?Z~V2N?wOoix^rE03;R0T1J@r~U+HvYzE)mR zQu_Udm$TgOXKfnA!ER-2DiW7=yuJO7f58mx&3b(A@nUQy z*DE=u76wHJ4u&tRoO@R1ev~#f?RQCbdF#74^!koFS(j%POXu#oX3$i3v@KB~)P0XS zf5WnqKOauKq_ajxGnk?H#E}^h{AYL@I{sMQ`V#8i6&d~NX{>2iWb~3(TRNMIx;+Xw zqaG)yyDxiCv@I(AfXuU_t0!yjaPTu1U2wDI=o;ObP2T?#SQ^CF^Ev!aXz@9?bjH@L z^TXao7rfH>{Oe79bam}F%hGA3!HlwIiN;z#x7>-1G2U#!?U0`{W&15#hNqK-l0RSe zS^M+~`&^U6bP0l+XkKt2x-A 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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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Cloaks/moth.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/moth.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..07ec6f2ba36f82b1362dbc87083cdb88b0a2e43f GIT binary patch literal 856 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}oCO|{#S9GG!XV7ZFl&wk z0|PUcr;B4qMC;q>`?IAIC64b8-^HS5?lPqz z@Anoh%Y3Bz^lEq1e{qI5Yj%si>Y$lRUO#+oZM;El!DF}c4qsk0`Ke@YSTem>>nwAI zXumJRjT?8E^goo;{IO_Tb%LSctxu!ghcygqA8nM3;7>>`J)3ri%TSUx@e2>vL8c8M zyld913rv1|eB;|XBdJT@PjeVMe0?RhN~u}A!pF^7iuKcL{x*RHm2cWry-IX3><#kM$oL2Y?HbK=yU3`c%fZEV@M z?w~vm^NeMW9=Z#!Qt~%n82RGwL4#kr+Nw4lk!fueTp{lLqJ%x;&XwH9(zBy8?%z#L zEF7pP*)e>yn|fMF=#%5ACAshC=6blCS|Z5#bHb_AnTrmDFbApe z#yto;C$6COcwNl*Qr;w^zM_2$aSviQd_E$4AoAzrix3i_IlR4si%D zA6amDhUh8p`iVOj)=Z7J+h5|VP+h+`=hes;_x#O>dpz=^UD}Ww!45 z$$i`p4sYk%X3Xjrni8ETs66-GfyDPyJ*%($eB_ z;`vH>&YucuDpNkQ&i?q~;?c>+o-;)#e)FF#V{p3A>C+WaVWF>e|F@hJeEj(uyMe7m z)cVSzS|Q`J^W)FFo;>5E(Yu)2ucNpcB$8#*84F}j|KGOfNBrjh4Eq@ZFMQSxYH+;7 Qz`(%Z>FVdQ&MBb@0NW{vNdN!< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Cloaks/moth.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/moth.rsi/meta.json new file mode 100644 index 0000000000..c37be7acac --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Cloaks/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-NECK", + "directions": 4 + } + ] +}