From: Puro <103608145+PuroSlavKing@users.noreply.github.com> Date: Sun, 26 Mar 2023 19:11:43 +0000 (+0300) Subject: [Clothing] Moth cloak and mask (#14851) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=3e7ff70d31d89d3e0d199a216d04ab82ca615e21;p=space-station-14.git [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 --- 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 0000000000..1bde95390d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/moth.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/moth.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/moth.rsi/icon.png new file mode 100644 index 0000000000..6b46bdb16d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/moth.rsi/icon.png differ 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 0000000000..de0d51289e Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/moth.rsi/equipped-NECK.png differ 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 0000000000..07ec6f2ba3 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/moth.rsi/icon.png differ 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 + } + ] +}