From: Golden Can <greentopcan@gmail.com>
Date: Sat, 27 Jul 2024 04:09:23 +0000 (+0200)
Subject: Security Clown Mask (#30249)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=1149290825a7adf1dd4825fa6d11a740ed900800;p=space-station-14.git

Security Clown Mask (#30249)

Added Security Clown Mask available from hacked SecDrobes.
---

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
index 5b733f0d35..ff1ee4e4da 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -23,3 +23,5 @@
     ClothingEyesBlindfold: 1
     ClothingShoesBootsCombat: 1
     ClothingShoesBootsWinterSec: 2
+  contrabandInventory:
+    ClothingMaskClownSecurity: 1
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index 1f2ed875a6..b3a76c5855 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -230,6 +230,24 @@
     graph: BananaClownMask
     node: mask
 
+- type: entity
+  parent: ClothingMaskClown
+  id: ClothingMaskClownSecurity
+  name: security clown wig and mask
+  description: A debatably oxymoronic but protective mask and wig.
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/clown_security.rsi
+  - type: Clothing
+    sprite: Clothing/Mask/clown_security.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+        Slash: 0.95
+        Piercing: 0.95
+        Heat: 0.95
+
 - type: entity
   parent: ClothingMaskBase
   id: ClothingMaskJoy
diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-hamster.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-hamster.png
new file mode 100644
index 0000000000..27efed7a1c
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-hamster.png differ
diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-reptilian.png
new file mode 100644
index 0000000000..f41daaa15a
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-reptilian.png differ
diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-vox.png
new file mode 100644
index 0000000000..924520c2a8
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-vox.png differ
diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK.png
new file mode 100644
index 0000000000..01013b3e5a
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK.png differ
diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/icon.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/icon.png
new file mode 100644
index 0000000000..90e9e2e1f0
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/inhand-left.png
new file mode 100644
index 0000000000..60f46602d7
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/inhand-right.png
new file mode 100644
index 0000000000..bb3c306586
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/meta.json b/Resources/Textures/Clothing/Mask/clown_security.rsi/meta.json
new file mode 100644
index 0000000000..6f5cb2dc1e
--- /dev/null
+++ b/Resources/Textures/Clothing/Mask/clown_security.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Modified version of clown mask by GoldenCan(github) (Copyright for clown mask: 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 and slightly modified by Flareguy)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-MASK",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-hamster",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-reptilian",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-vox",
+      "directions": 4
+    }
+  ]
+}