Mime and clown masks (#16350)

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
index 082684947519714f638bdbc7e1eb19bacdaab163..366aaf574c7111fedbbf9679176dbdca992fa793 100644 (file)
--- 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 189df1ecf2a2195cedfd168daf5e5927d6577e05..e9329d94125deb03b1334439789d8b6e74c6992a 100644 (file)
--- 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 (file)
index 0000000..d7d5bb0
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 (file)
index 0000000..6a20b27
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 (file)
index 0000000..32b7b1a
--- /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 (file)
index 0000000..2acf825
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 (file)
index 0000000..8ea7996
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 (file)
index 0000000..32b7b1a
--- /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 (file)
index 0000000..93622d5
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 (file)
index 0000000..3464391
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 (file)
index 0000000..ca8bcd1
--- /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 (file)
index 0000000..b87cd44
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 (file)
index 0000000..4962ce0
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 (file)
index 0000000..ca8bcd1
--- /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
+    }
+  ]
+}