From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com> Date: Thu, 5 Jun 2025 23:23:13 +0000 (-0400) Subject: Added security mime mask (#37890) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=3d942e1cadc4c32c91e5af21995d584d2a0d8b92;p=space-station-14.git Added security mime mask (#37890) * Added security mime mask * Improved security mime mask equipped sprites * Improved security mime mask icon sprite * meta.json spacing fix --- diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index b4526732a9..c9b9e3ffda 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -27,6 +27,7 @@ ClothingHeadHelmetJustice: 1 contrabandInventory: ClothingMaskClownSecurity: 1 + ClothingMaskMimeSecurity: 1 ToyFigurineSecurity: 1 ToyFigurineWarden: 1 ToyFigurineHeadOfSecurity: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 9f3db58e02..e45618b513 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -644,6 +644,24 @@ - type: Clothing sprite: Clothing/Mask/scaredmime.rsi +- type: entity + parent: [ClothingMaskMime, BaseSecurityContraband] + id: ClothingMaskMimeSecurity + name: security mime mask + description: You have the right to remain silent. + components: + - type: Sprite + sprite: Clothing/Mask/mime_security.rsi + - type: Clothing + sprite: Clothing/Mask/mime_security.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Heat: 0.95 + - type: entity parent: ClothingMaskBase id: ClothingMaskItalianMoustache diff --git a/Resources/Textures/Clothing/Mask/mime_security.rsi/equipped-MASK-hamster.png b/Resources/Textures/Clothing/Mask/mime_security.rsi/equipped-MASK-hamster.png new file mode 100644 index 0000000000..6dd728e8d7 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/mime_security.rsi/equipped-MASK-hamster.png differ diff --git a/Resources/Textures/Clothing/Mask/mime_security.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/mime_security.rsi/equipped-MASK-reptilian.png new file mode 100644 index 0000000000..764412f6f0 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/mime_security.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/mime_security.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/mime_security.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..c46f7d0b4d Binary files /dev/null and b/Resources/Textures/Clothing/Mask/mime_security.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/mime_security.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/mime_security.rsi/equipped-MASK.png new file mode 100644 index 0000000000..e099f659f6 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/mime_security.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/mime_security.rsi/icon.png b/Resources/Textures/Clothing/Mask/mime_security.rsi/icon.png new file mode 100644 index 0000000000..c78c671758 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/mime_security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/mime_security.rsi/meta.json b/Resources/Textures/Clothing/Mask/mime_security.rsi/meta.json new file mode 100644 index 0000000000..88c9c1edcf --- /dev/null +++ b/Resources/Textures/Clothing/Mask/mime_security.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e. Security edit by Hitlinemoss, based on secglasses.rsi and clown_security.rsi.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-hamster", + "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + } + ] +}