diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 2a15090326..7e64d40173 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -5,6 +5,7 @@ startingInventory: ClothingOuterWinterClown: 1 ClothingOuterWinterMime: 1 + ClothingMaskSexyClown: 1 ClothingMaskJoy: 2 ClothingHeadHatCardborg: 2 ClothingOuterCardborg: 2 diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 906a5ea817..8d34ead042 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -143,6 +143,18 @@ - type: BreathMask - type: IdentityBlocker +- type: entity + parent: ClothingMaskBase + id: ClothingMaskSexyClown + name: sexy-clown mask and wig + description: A feminine clown mask for the best clowns. + components: + - type: Sprite + sprite: Clothing/Mask/sexyclown.rsi + - type: Clothing + sprite: Clothing/Mask/sexyclown.rsi + - type: BreathMask + - type: entity parent: ClothingMaskBase id: ClothingMaskJoy diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index a2dbf6c95c..230900799b 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -553,3 +553,13 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/janimaid.rsi +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtClown + name: sexy clown suit + description: It makes you look HONKable! + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/sexyclown.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/sexyclown.rsi diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml index d1a9a534bb..c522b115d8 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml @@ -31,4 +31,5 @@ id: ClownPDA ears: ClothingHeadsetService satchel: ClothingBackpackSatchelFilled + innerclothingskirt: ClothingUniformJumpskirtClown duffelbag: ClothingBackpackDuffelClownFilled 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/inhand-left.png b/Resources/Textures/Clothing/Mask/sexyclown.rsi/inhand-left.png new file mode 100644 index 0000000000..98d9181802 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/sexyclown.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/sexyclown.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/sexyclown.rsi/inhand-right.png new file mode 100644 index 0000000000..2fdbbef4f4 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/sexyclown.rsi/inhand-right.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..5718721a9f --- /dev/null +++ b/Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6b3f58d7de4d4e374282819a7001eaa9bde1676d", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..ea58f2089d Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/icon.png new file mode 100644 index 0000000000..aa7a9403b3 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/inhand-left.png new file mode 100644 index 0000000000..5548bad0b5 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/inhand-right.png new file mode 100644 index 0000000000..02f32116d7 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/meta.json new file mode 100644 index 0000000000..357dab543a --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6b3f58d7de4d4e374282819a7001eaa9bde1676d", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file