diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 7e64d40173..2a15090326 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -5,7 +5,6 @@ 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 8d34ead042..906a5ea817 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -143,18 +143,6 @@ - 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 230900799b..a2dbf6c95c 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -553,13 +553,3 @@ - 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 c522b115d8..d1a9a534bb 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml @@ -31,5 +31,4 @@ 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 deleted file mode 100644 index 93622d570c..0000000000 Binary files a/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/sexyclown.rsi/icon.png b/Resources/Textures/Clothing/Mask/sexyclown.rsi/icon.png deleted file mode 100644 index 34643912cf..0000000000 Binary files a/Resources/Textures/Clothing/Mask/sexyclown.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/sexyclown.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/sexyclown.rsi/inhand-left.png deleted file mode 100644 index 98d9181802..0000000000 Binary files a/Resources/Textures/Clothing/Mask/sexyclown.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/sexyclown.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/sexyclown.rsi/inhand-right.png deleted file mode 100644 index 2fdbbef4f4..0000000000 Binary files a/Resources/Textures/Clothing/Mask/sexyclown.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json b/Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json deleted file mode 100644 index 5718721a9f..0000000000 --- a/Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "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 deleted file mode 100644 index ea58f2089d..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/equipped-INNERCLOTHING.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/icon.png deleted file mode 100644 index aa7a9403b3..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/icon.png and /dev/null 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 deleted file mode 100644 index 5548bad0b5..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/inhand-left.png and /dev/null 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 deleted file mode 100644 index 02f32116d7..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/meta.json deleted file mode 100644 index 357dab543a..0000000000 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "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