From: Nim <128169402+Nimfar11@users.noreply.github.com>
Date: Sat, 13 May 2023 14:41:35 +0000 (+0300)
Subject: Mime and clown masks (#16350)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=4843ba9a5e77cec472673eafa250dab68901c405;p=space-station-14.git

Mime and clown masks (#16350)
---

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
index 0826849475..366aaf574c 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -36,6 +36,10 @@
     ClothingShoesDameDane: 2
     ClothingOuterDameDane: 2
     ClothingOuterClownPriest: 1
+    ClothingMaskSadMime: 1
+    ClothingMaskScaredMime: 1
   emaggedInventory:
     ClothingShoesBling: 1
     ClothingOuterDogi: 1
+    ClothingMaskSexyClown: 1
+    ClothingMaskSexyMime: 1
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index 189df1ecf2..e9329d9412 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -345,3 +345,47 @@
   - type: Clothing
     sprite: Clothing/Mask/bat.rsi
   - type: BreathMask
+
+- type: entity
+  parent: ClothingMaskClown
+  id: ClothingMaskSexyClown
+  name: sexy clown mask
+  description: Some naughty clowns think this is what the Honkmother looks like.
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/sexyclown.rsi
+  - type: Clothing
+    sprite: Clothing/Mask/sexyclown.rsi
+
+- type: entity
+  parent: ClothingMaskMime
+  id: ClothingMaskSexyMime
+  name: sexy mime mask
+  description: Those ruddy cheeks just want to be rubbed.
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/sexymime.rsi
+  - type: Clothing
+    sprite: Clothing/Mask/sexymime.rsi
+
+- type: entity
+  parent: ClothingMaskMime
+  id: ClothingMaskSadMime
+  name: sad mime mask
+  description: Many people think this is what a real mime mask looks like.
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/sadmime.rsi
+  - type: Clothing
+    sprite: Clothing/Mask/sadmime.rsi
+
+- type: entity
+  parent: ClothingMaskMime
+  id: ClothingMaskScaredMime
+  name: scared mime mask
+  description: Looks like it would scream if it wasn't a mask
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/scaredmime.rsi
+  - type: Clothing
+    sprite: Clothing/Mask/scaredmime.rsi
diff --git a/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK.png
new file mode 100644
index 0000000000..d7d5bb0d61
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK.png differ
diff --git a/Resources/Textures/Clothing/Mask/sadmime.rsi/icon.png b/Resources/Textures/Clothing/Mask/sadmime.rsi/icon.png
new file mode 100644
index 0000000000..6a20b27afd
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/sadmime.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json b/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
new file mode 100644
index 0000000000..32b7b1acf3
--- /dev/null
+++ b/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/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/scaredmime.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK.png
new file mode 100644
index 0000000000..2acf8252cb
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK.png differ
diff --git a/Resources/Textures/Clothing/Mask/scaredmime.rsi/icon.png b/Resources/Textures/Clothing/Mask/scaredmime.rsi/icon.png
new file mode 100644
index 0000000000..8ea799654b
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/scaredmime.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json b/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
new file mode 100644
index 0000000000..32b7b1acf3
--- /dev/null
+++ b/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/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/sexyclown.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK.png
new file mode 100644
index 0000000000..93622d570c
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK.png differ
diff --git a/Resources/Textures/Clothing/Mask/sexyclown.rsi/icon.png b/Resources/Textures/Clothing/Mask/sexyclown.rsi/icon.png
new file mode 100644
index 0000000000..34643912cf
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/sexyclown.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json b/Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json
new file mode 100644
index 0000000000..ca8bcd1bc1
--- /dev/null
+++ b/Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/blob/ed466a4c67828b44ddb9d9550366be5c2d745955/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/sexymime.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK.png
new file mode 100644
index 0000000000..b87cd44405
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK.png differ
diff --git a/Resources/Textures/Clothing/Mask/sexymime.rsi/icon.png b/Resources/Textures/Clothing/Mask/sexymime.rsi/icon.png
new file mode 100644
index 0000000000..4962ce0eef
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/sexymime.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json b/Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json
new file mode 100644
index 0000000000..ca8bcd1bc1
--- /dev/null
+++ b/Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/blob/ed466a4c67828b44ddb9d9550366be5c2d745955/icons/obj/clothing/masks.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-MASK",
+      "directions": 4
+    }
+  ]
+}