diff --git a/Resources/Prototypes/Entities/Items/Clothing/OuterClothing.yml b/Resources/Prototypes/Entities/Items/Clothing/OuterClothing.yml index 14fd4cd485..63c4c47083 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/OuterClothing.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/OuterClothing.yml @@ -63,32 +63,6 @@ - type: Clothing sprite: Clothing/OuterClothing/apronchef.rsi -- type: entity - parent: OuterclothingBase - id: OuterclothingArmor - name: Armor - description: '' - components: - - type: Sprite - sprite: Clothing/OuterClothing/armor.rsi - - type: Icon - sprite: Clothing/OuterClothing/armor.rsi - - type: Clothing - sprite: Clothing/OuterClothing/armor.rsi - -- type: entity - parent: OuterclothingBase - id: OuterclothingArmorsec - name: Security armor - description: '' - components: - - type: Sprite - sprite: Clothing/OuterClothing/armorsec.rsi - - type: Icon - sprite: Clothing/OuterClothing/armorsec.rsi - - type: Clothing - sprite: Clothing/OuterClothing/armorsec.rsi - - type: entity parent: OuterclothingBase id: OuterclothingArmorreflec diff --git a/Resources/Prototypes/Entities/Items/Clothing/outer/armor.yml b/Resources/Prototypes/Entities/Items/Clothing/outer/armor.yml new file mode 100644 index 0000000000..cc6727e1be --- /dev/null +++ b/Resources/Prototypes/Entities/Items/Clothing/outer/armor.yml @@ -0,0 +1,32 @@ +- type: entity + parent: OuterclothingBase + id: OuterclothingArmorVest + name: armor vest + description: "A slim Type I armored vest that provides decent protection against most types of damage." + components: + - type: Sprite + sprite: Clothing/OuterClothing/armor.rsi + state: armoralt + + - type: Icon + sprite: Clothing/OuterClothing/armor.rsi + state: armoralt + + - type: Clothing + sprite: Clothing/OuterClothing/armor.rsi + ClothingPrefix: armoralt + HeldPrefix: armor + +- type: entity + parent: OuterclothingArmorVest + id: OuterclothingArmorVestAlt + description: "A Type I armored vest that provides decent protection against most types of damage." + components: + - type: Sprite + state: armor + + - type: Icon + state: armor + + - type: Clothing + ClothingPrefix: armor diff --git a/Resources/Textures/Clothing/OuterClothing/armor.rsi/armor-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/armor.rsi/armor-equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..427c203b19 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/armor.rsi/armor-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/armor.rsi/armor.png b/Resources/Textures/Clothing/OuterClothing/armor.rsi/armor.png new file mode 100644 index 0000000000..e70741f1ff Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/armor.rsi/armor.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/armor.rsi/armoralt-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/armor.rsi/armoralt-equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..3019268737 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/armor.rsi/armoralt-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/armor.rsi/armoralt.png b/Resources/Textures/Clothing/OuterClothing/armor.rsi/armoralt.png new file mode 100644 index 0000000000..a91a8b554f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/armor.rsi/armoralt.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/armor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/armor.rsi/equipped-OUTERCLOTHING.png deleted file mode 100644 index d53fddad04..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/armor.rsi/equipped-OUTERCLOTHING.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/armor.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/armor.rsi/icon.png deleted file mode 100644 index ffbdc81381..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/armor.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/armor.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/armor.rsi/inhand-left.png index b5d674612e..aea0f39676 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/armor.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/armor.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/armor.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/armor.rsi/inhand-right.png index 88c8e55c09..cef6f162c7 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/armor.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/armor.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/armor.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/armor.rsi/meta.json index 117a2241ce..1f4418b05a 100644 --- a/Resources/Textures/Clothing/OuterClothing/armor.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/armor.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} +{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "armor", "directions": 1, "delays": [[1.0]]}, {"name": "armor-equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "armoralt", "directions": 1, "delays": [[1.0]]}, {"name": "armoralt-equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/armorsec.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/armorsec.rsi/equipped-OUTERCLOTHING.png deleted file mode 100644 index ae61f2fd07..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/armorsec.rsi/equipped-OUTERCLOTHING.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/armorsec.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/armorsec.rsi/icon.png deleted file mode 100644 index dda25f475d..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/armorsec.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/armorsec.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/armorsec.rsi/inhand-left.png deleted file mode 100644 index 13ba70d9c3..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/armorsec.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/armorsec.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/armorsec.rsi/inhand-right.png deleted file mode 100644 index 13bc4252f3..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/armorsec.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/armorsec.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/armorsec.rsi/meta.json deleted file mode 100644 index 117a2241ce..0000000000 --- a/Resources/Textures/Clothing/OuterClothing/armorsec.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}