diff --git a/Resources/Prototypes/Entities/items/clothing/belts.yml b/Resources/Prototypes/Entities/items/clothing/belts.yml index 84cb15b8a0..b023279c80 100644 --- a/Resources/Prototypes/Entities/items/clothing/belts.yml +++ b/Resources/Prototypes/Entities/items/clothing/belts.yml @@ -24,5 +24,3 @@ sprite: Clothing/belt_utility.rsi - type: Storage Capacity: 30 - - diff --git a/Resources/Prototypes/Entities/items/clothing/gloves.yml b/Resources/Prototypes/Entities/items/clothing/gloves.yml index af0b3af5a7..a47c382c76 100644 --- a/Resources/Prototypes/Entities/items/clothing/gloves.yml +++ b/Resources/Prototypes/Entities/items/clothing/gloves.yml @@ -53,19 +53,4 @@ state: leather - type: Clothing sprite: Clothing/gloves_leather.rsi - HeatResistance: 1500 - -- type: entity - parent: GlovesBase - id: WhiteGloves - name: White Gloves - description: These look pretty fancy. - components: - - type: Sprite - sprite: Clothing/gloves_white.rsi - state: white - - type: Icon - sprite: Clothing/gloves_white.rsi - state: white - - type: Clothing - sprite: Clothing/gloves_white.rsi \ No newline at end of file + HeatResistance: 1500 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/items/clothing/hats.yml b/Resources/Prototypes/Entities/items/clothing/hats.yml index 423ed9fde7..26aaed52c0 100644 --- a/Resources/Prototypes/Entities/items/clothing/hats.yml +++ b/Resources/Prototypes/Entities/items/clothing/hats.yml @@ -40,37 +40,3 @@ sprite: Clothing/captain_hat.rsi Slots: - helmet - -- type: entity - parent: HatBase - id: HatHOP - name: Head of Personnel's Hat - description: Papers, please. - components: - - type: Sprite - sprite: Clothing/hop_hat.rsi - state: hop - - type: Icon - sprite: Clothing/hop_hat.rsi - state: hop - - type: Clothing - sprite: Clothing/hop_hat.rsi - Slots: - - helmet - -- type: entity - parent: HatBase - id: HatBeret - name: Beret - description: A beret, an artists favorite headwear. - components: - - type: Sprite - sprite: Clothing/beret.rsi - state: beret - - type: Icon - sprite: Clothing/beret.rsi - state: beret - - type: Clothing - sprite: Clothing/beret.rsi - Slots: - - helmet diff --git a/Resources/Prototypes/Entities/items/clothing/masks.yml b/Resources/Prototypes/Entities/items/clothing/masks.yml index 37ed00bff3..9a0c7d2388 100644 --- a/Resources/Prototypes/Entities/items/clothing/masks.yml +++ b/Resources/Prototypes/Entities/items/clothing/masks.yml @@ -47,19 +47,4 @@ sprite: Clothing/mask_clown.rsi state: icon - type: Clothing - sprite: Clothing/mask_clown.rsi - -- type: entity - parent: MasksBase - id: MaskMime - name: Mime Mask - description: The traditional mime's mask. It has an eerie facial posture. - components: - - type: Sprite - sprite: Clothing/mask_mime.rsi - state: mime - - type: Icon - sprite: Clothing/mask_mime.rsi - state: mime - - type: Clothing - sprite: Clothing/mask_mime.rsi \ No newline at end of file + sprite: Clothing/mask_clown.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Entities/items/clothing/shoes.yml b/Resources/Prototypes/Entities/items/clothing/shoes.yml index a046c1d5c8..1d7d2a03be 100644 --- a/Resources/Prototypes/Entities/items/clothing/shoes.yml +++ b/Resources/Prototypes/Entities/items/clothing/shoes.yml @@ -100,21 +100,4 @@ state: brown - type: Clothing - sprite: Clothing/shoes_brown.rsi - -- type: entity - parent: ShoesBase - id: ShoesMime - name: Mime Shoes - description: Comfortable-looking shoes. - components: - - type: Sprite - sprite: Clothing/shoes_mime.rsi - state: mime - - - type: Icon - sprite: Clothing/shoes_mime.rsi - state: mime - - - type: Clothing - sprite: Clothing/shoes_mime.rsi \ No newline at end of file + sprite: Clothing/shoes_brown.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Entities/items/clothing/suits.yml b/Resources/Prototypes/Entities/items/clothing/suits.yml index 991628dcfd..fa6132001a 100644 --- a/Resources/Prototypes/Entities/items/clothing/suits.yml +++ b/Resources/Prototypes/Entities/items/clothing/suits.yml @@ -58,18 +58,3 @@ - type: Clothing sprite: Clothing/chef_apron.rsi - -- type: entity - parent: SuitBase - id: BeltSuspenders - name: Suspenders - description: They suspend the illusion of the mime's play. - components: - - type: Sprite - sprite: Clothing/suspenders.rsi - state: suspenders - - type: Icon - sprite: Clothing/suspenders.rsi - state: suspenders - - type: Clothing - sprite: Clothing/suspenders.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Entities/items/clothing/uniforms.yml b/Resources/Prototypes/Entities/items/clothing/uniforms.yml index d5986f3ef1..fa65553d34 100644 --- a/Resources/Prototypes/Entities/items/clothing/uniforms.yml +++ b/Resources/Prototypes/Entities/items/clothing/uniforms.yml @@ -141,38 +141,4 @@ state: captain - type: Clothing - sprite: Clothing/captain_uniform.rsi - -- type: entity - parent: UniformBase - id: UniformHOP - name: Head of Personnel's Jumpsuit - description: It's a jumpsuit worn by someone who works in the position of "Head of Personnel". - components: - - type: Sprite - sprite: Clothing/hop_jumpsuit.rsi - state: hop - - - type: Icon - sprite: Clothing/hop_jumpsuit.rsi - state: hop - - - type: Clothing - sprite: Clothing/hop_jumpsuit.rsi - -- type: entity - parent: UniformBase - id: UniformMime - name: Mime's Outfit - description: It's not very colourful. - components: - - type: Sprite - sprite: Clothing/mime_outfit.rsi - state: mime - - - type: Icon - sprite: Clothing/mime_outfit.rsi - state: mime - - - type: Clothing - sprite: Clothing/mime_outfit.rsi \ No newline at end of file + sprite: Clothing/captain_uniform.rsi diff --git a/Resources/Textures/Clothing/beret.rsi/beret.png b/Resources/Textures/Clothing/beret.rsi/beret.png deleted file mode 100644 index feac165f6d..0000000000 Binary files a/Resources/Textures/Clothing/beret.rsi/beret.png and /dev/null differ diff --git a/Resources/Textures/Clothing/beret.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/beret.rsi/equipped-HELMET.png deleted file mode 100644 index 2918a7d0b3..0000000000 Binary files a/Resources/Textures/Clothing/beret.rsi/equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/beret.rsi/meta.json b/Resources/Textures/Clothing/beret.rsi/meta.json deleted file mode 100644 index 831fc7e571..0000000000 --- a/Resources/Textures/Clothing/beret.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/tree/Bleeding-Edge/icons", - "states": [ - { - "name": "equipped-HELMET", - "directions": 4, - "delays": [ - [ 1.0 ], - [ 1.0 ], - [ 1.0 ], - [ 1.0 ] - ] - }, - { - "name": "beret", - "directions": 1, - "delays": [ [ 1.0 ] ] - } - ] -} diff --git a/Resources/Textures/Clothing/gloves_white.rsi/equipped-HAND.png b/Resources/Textures/Clothing/gloves_white.rsi/equipped-HAND.png deleted file mode 100644 index db6ccef964..0000000000 Binary files a/Resources/Textures/Clothing/gloves_white.rsi/equipped-HAND.png and /dev/null differ diff --git a/Resources/Textures/Clothing/gloves_white.rsi/meta.json b/Resources/Textures/Clothing/gloves_white.rsi/meta.json deleted file mode 100644 index 2a3252cfc8..0000000000 --- a/Resources/Textures/Clothing/gloves_white.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", - "states": [ - { - "name": "white", - "directions": 1, - "delays": [ [ 1.0 ] ] - }, - { - "name": "equipped-HAND", - "directions": 4, - "delays": [ - [ 1.0 ], - [ 1.0 ], - [ 1.0 ], - [ 1.0 ] - ] - } - ] -} diff --git a/Resources/Textures/Clothing/gloves_white.rsi/white.png b/Resources/Textures/Clothing/gloves_white.rsi/white.png deleted file mode 100644 index 4732b24b5b..0000000000 Binary files a/Resources/Textures/Clothing/gloves_white.rsi/white.png and /dev/null differ diff --git a/Resources/Textures/Clothing/hop_coat.rsi/equipped-OUTER.png b/Resources/Textures/Clothing/hop_coat.rsi/equipped-OUTER.png deleted file mode 100644 index 823f77efb1..0000000000 Binary files a/Resources/Textures/Clothing/hop_coat.rsi/equipped-OUTER.png and /dev/null differ diff --git a/Resources/Textures/Clothing/hop_hat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/hop_hat.rsi/equipped-HELMET.png deleted file mode 100644 index 866e91981a..0000000000 Binary files a/Resources/Textures/Clothing/hop_hat.rsi/equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/hop_hat.rsi/hop.png b/Resources/Textures/Clothing/hop_hat.rsi/hop.png deleted file mode 100644 index 55e5a58f11..0000000000 Binary files a/Resources/Textures/Clothing/hop_hat.rsi/hop.png and /dev/null differ diff --git a/Resources/Textures/Clothing/hop_hat.rsi/meta.json b/Resources/Textures/Clothing/hop_hat.rsi/meta.json deleted file mode 100644 index 8eb2d55846..0000000000 --- a/Resources/Textures/Clothing/hop_hat.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/tree/Bleeding-Edge/icons", - "states": [ - { - "name": "equipped-HELMET", - "directions": 4, - "delays": [ - [ 1.0 ], - [ 1.0 ], - [ 1.0 ], - [ 1.0 ] - ] - }, - { - "name": "hop", - "directions": 1, - "delays": [ [ 1.0 ] ] - } - ] -}