From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Sun, 23 Apr 2023 06:56:23 +0000 (+0300) Subject: [entity] Animal masks (#15583) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=f2ae5687cc276158066ff41ff1c4fdaa2b385eb3;p=space-station-14.git [entity] Animal masks (#15583) * animal masks Seven new animal masks. Let the masquerade be more diverse. * maint fluff spawner --- diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 7967aec736..5fdad8fa1f 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -255,3 +255,87 @@ sprite: Clothing/Mask/swat.rsi - type: Clothing sprite: Clothing/Mask/swat.rsi + +- type: entity + parent: ClothingMaskBase + id: ClothingMaskRat + name: rat mask + description: A mask of a rat that looks like a rat. Perhaps they will take you for a fellow rat. + components: + - type: Sprite + sprite: Clothing/Mask/rat.rsi + - type: Clothing + sprite: Clothing/Mask/rat.rsi + - type: BreathMask + +- type: entity + parent: ClothingMaskBase + id: ClothingMaskFox + name: fox mask + description: What does the fox say? + components: + - type: Sprite + sprite: Clothing/Mask/fox.rsi + - type: Clothing + sprite: Clothing/Mask/fox.rsi + - type: BreathMask + +- type: entity + parent: ClothingMaskBase + id: ClothingMaskBee + name: bee mask + description: For the queen! + components: + - type: Sprite + sprite: Clothing/Mask/bee.rsi + - type: Clothing + sprite: Clothing/Mask/bee.rsi + - type: BreathMask + +- type: entity + parent: ClothingMaskBase + id: ClothingMaskBear + name: bear mask + description: I'm a cloudy, cloudy, cloudy, I'm not a bear at all. + components: + - type: Sprite + sprite: Clothing/Mask/bear.rsi + - type: Clothing + sprite: Clothing/Mask/bear.rsi + - type: BreathMask + +- type: entity + parent: ClothingMaskBase + id: ClothingMaskRaven + name: raven mask + description: Where I am, death... or glitter. + components: + - type: Sprite + sprite: Clothing/Mask/raven.rsi + - type: Clothing + sprite: Clothing/Mask/raven.rsi + - type: BreathMask + +- type: entity + parent: ClothingMaskBase + id: ClothingMaskJackal + name: jackal mask + description: It is better not to turn your back to the owner of the mask, it may bite. + components: + - type: Sprite + sprite: Clothing/Mask/jackal.rsi + - type: Clothing + sprite: Clothing/Mask/jackal.rsi + - type: BreathMask + +- type: entity + parent: ClothingMaskBase + id: ClothingMaskBat + name: bat mask + description: A bloodsucker by night, and a cute, blinded beast by day. + components: + - type: Sprite + sprite: Clothing/Mask/bat.rsi + - type: Clothing + sprite: Clothing/Mask/bat.rsi + - type: BreathMask diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index d200e12386..0b0b6f46bb 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -36,6 +36,7 @@ - ClothingNeckPansexualPin - ClothingNeckTransPin - CluwneHorn + - ClothingMaskRat rareChance: 0.01 prototypes: - Lighter @@ -53,6 +54,12 @@ - ClothingUnderSocksBee - ClothingUnderSocksCoder - ClothingHeadHatSquid + - ClothingMaskFox + - ClothingMaskBee + - ClothingMaskBear + - ClothingMaskRaven + - ClothingMaskJackal + - ClothingMaskBat chance: 0.6 offset: 0.0 diff --git a/Resources/Textures/Clothing/Mask/bat.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/bat.rsi/equipped-MASK.png new file mode 100644 index 0000000000..0af5a0858b Binary files /dev/null and b/Resources/Textures/Clothing/Mask/bat.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/bat.rsi/icon.png b/Resources/Textures/Clothing/Mask/bat.rsi/icon.png new file mode 100644 index 0000000000..e85519fb91 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/bat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/bat.rsi/meta.json b/Resources/Textures/Clothing/Mask/bat.rsi/meta.json new file mode 100644 index 0000000000..518989cd13 --- /dev/null +++ b/Resources/Textures/Clothing/Mask/bat.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/dannno/-tg-station/blob/a51c5a85d327f562004cef2f36c081ad0d95fd9a/icons/obj/clothing/masks.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/bear.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/bear.rsi/equipped-MASK.png new file mode 100644 index 0000000000..12fe9ec475 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/bear.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/bear.rsi/icon.png b/Resources/Textures/Clothing/Mask/bear.rsi/icon.png new file mode 100644 index 0000000000..81a469c729 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/bear.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/bear.rsi/meta.json b/Resources/Textures/Clothing/Mask/bear.rsi/meta.json new file mode 100644 index 0000000000..518989cd13 --- /dev/null +++ b/Resources/Textures/Clothing/Mask/bear.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/dannno/-tg-station/blob/a51c5a85d327f562004cef2f36c081ad0d95fd9a/icons/obj/clothing/masks.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/bee.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/bee.rsi/equipped-MASK.png new file mode 100644 index 0000000000..ae26dc100e Binary files /dev/null and b/Resources/Textures/Clothing/Mask/bee.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/bee.rsi/icon.png b/Resources/Textures/Clothing/Mask/bee.rsi/icon.png new file mode 100644 index 0000000000..a33c43f42a Binary files /dev/null and b/Resources/Textures/Clothing/Mask/bee.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/bee.rsi/meta.json b/Resources/Textures/Clothing/Mask/bee.rsi/meta.json new file mode 100644 index 0000000000..518989cd13 --- /dev/null +++ b/Resources/Textures/Clothing/Mask/bee.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/dannno/-tg-station/blob/a51c5a85d327f562004cef2f36c081ad0d95fd9a/icons/obj/clothing/masks.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/fox.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/fox.rsi/equipped-MASK.png new file mode 100644 index 0000000000..3f0a881334 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/fox.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/fox.rsi/icon.png b/Resources/Textures/Clothing/Mask/fox.rsi/icon.png new file mode 100644 index 0000000000..d4bca3f6cb Binary files /dev/null and b/Resources/Textures/Clothing/Mask/fox.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/fox.rsi/meta.json b/Resources/Textures/Clothing/Mask/fox.rsi/meta.json new file mode 100644 index 0000000000..518989cd13 --- /dev/null +++ b/Resources/Textures/Clothing/Mask/fox.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/dannno/-tg-station/blob/a51c5a85d327f562004cef2f36c081ad0d95fd9a/icons/obj/clothing/masks.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/jackal.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/jackal.rsi/equipped-MASK.png new file mode 100644 index 0000000000..b5a3ab1186 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/jackal.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/jackal.rsi/icon.png b/Resources/Textures/Clothing/Mask/jackal.rsi/icon.png new file mode 100644 index 0000000000..23619a4ae9 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/jackal.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/jackal.rsi/meta.json b/Resources/Textures/Clothing/Mask/jackal.rsi/meta.json new file mode 100644 index 0000000000..518989cd13 --- /dev/null +++ b/Resources/Textures/Clothing/Mask/jackal.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/dannno/-tg-station/blob/a51c5a85d327f562004cef2f36c081ad0d95fd9a/icons/obj/clothing/masks.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/rat.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/rat.rsi/equipped-MASK.png new file mode 100644 index 0000000000..60b74d7629 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/rat.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/rat.rsi/icon.png b/Resources/Textures/Clothing/Mask/rat.rsi/icon.png new file mode 100644 index 0000000000..6082b72671 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/rat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/rat.rsi/meta.json b/Resources/Textures/Clothing/Mask/rat.rsi/meta.json new file mode 100644 index 0000000000..518989cd13 --- /dev/null +++ b/Resources/Textures/Clothing/Mask/rat.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/dannno/-tg-station/blob/a51c5a85d327f562004cef2f36c081ad0d95fd9a/icons/obj/clothing/masks.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/raven.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/raven.rsi/equipped-MASK.png new file mode 100644 index 0000000000..ec686bbbec Binary files /dev/null and b/Resources/Textures/Clothing/Mask/raven.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/raven.rsi/icon.png b/Resources/Textures/Clothing/Mask/raven.rsi/icon.png new file mode 100644 index 0000000000..435a671c4c Binary files /dev/null and b/Resources/Textures/Clothing/Mask/raven.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/raven.rsi/meta.json b/Resources/Textures/Clothing/Mask/raven.rsi/meta.json new file mode 100644 index 0000000000..518989cd13 --- /dev/null +++ b/Resources/Textures/Clothing/Mask/raven.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/dannno/-tg-station/blob/a51c5a85d327f562004cef2f36c081ad0d95fd9a/icons/obj/clothing/masks.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +}