diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index fad026eef968df..e0ef74029282f5 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1704,7 +1704,8 @@ id: UplinkClothingOuterArmorRaid name: uplink-syndie-raid-name description: uplink-syndie-raid-desc - icon: { sprite: /Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi, state: icon } + # icon: { sprite: /Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi, state: icon } + icon: { sprite: /Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi, state: icon } #ss220 raid suit resprite productEntity: ClothingBackpackDuffelSyndicateRaidBundle cost: Telecrystal: 8 diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index 193ee794d89433..5cb382da73373d 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -384,9 +384,11 @@ description: An armored helmet for use with the syndicate raid suit. Very stylish. components: - type: Sprite - sprite: Clothing/Head/Helmets/syndie-raid.rsi + # sprite: Clothing/Head/Helmets/syndie-raid.rsi #ss220 raid suit resprite + sprite: SS220/Clothing/Head/Helmets/syndie-raid-helmet.rsi #ss220 raid suit resprite - type: Clothing - sprite: Clothing/Head/Helmets/syndie-raid.rsi + # sprite: Clothing/Head/Helmets/syndie-raid.rsi #ss220 raid suit resprite + sprite: SS220/Clothing/Head/Helmets/syndie-raid-helmet.rsi #ss220 raid suit resprite - type: Armor modifiers: #There's gotta be SOME reason to use this over other helmets. coefficients: diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index a4d96f7f7b2ffe..a1199e36214a78 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -107,14 +107,21 @@ description: A somewhat flexible and well-armored suit with a powerful shoulder mounted flashlight manufactured in the Gorlex Marauder's iconic blood-red color scheme, it does not protect its wearer from space. components: - type: Sprite - sprite: Clothing/OuterClothing/Armor/syndie-raid.rsi + # sprite: Clothing/OuterClothing/Armor/syndie-raid.rsi + sprite: SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi #ss220 raid suit resprite layers: - state: icon + #ss220 raid suit resprite begin + - state: icon-flash + visible: false + map: [ "light" ] + #ss220 raid suit resprite end - state: light-overlay visible: false shader: unshaded - type: Clothing - sprite: Clothing/OuterClothing/Armor/syndie-raid.rsi + # sprite: Clothing/OuterClothing/Armor/syndie-raid.rsi #ss220 raid suit resprite + sprite: SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi #ss220 raid suit resprite - type: Armor modifiers: coefficients: diff --git a/Resources/Textures/SS220/Clothing/Head/Helmets/syndie-raid-helmet.rsi/equipped-HELMET-vox.png b/Resources/Textures/SS220/Clothing/Head/Helmets/syndie-raid-helmet.rsi/equipped-HELMET-vox.png new file mode 100644 index 00000000000000..a189b257795661 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Helmets/syndie-raid-helmet.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Helmets/syndie-raid-helmet.rsi/equipped-HELMET.png b/Resources/Textures/SS220/Clothing/Head/Helmets/syndie-raid-helmet.rsi/equipped-HELMET.png new file mode 100644 index 00000000000000..4e38d01dabba76 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Helmets/syndie-raid-helmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Helmets/syndie-raid-helmet.rsi/icon.png b/Resources/Textures/SS220/Clothing/Head/Helmets/syndie-raid-helmet.rsi/icon.png new file mode 100644 index 00000000000000..b411bcd80a6b66 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Helmets/syndie-raid-helmet.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Helmets/syndie-raid-helmet.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Head/Helmets/syndie-raid-helmet.rsi/inhand-left.png new file mode 100644 index 00000000000000..16785f14f4dc56 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Helmets/syndie-raid-helmet.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Helmets/syndie-raid-helmet.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Head/Helmets/syndie-raid-helmet.rsi/inhand-right.png new file mode 100644 index 00000000000000..b07cf4fc6136aa Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Helmets/syndie-raid-helmet.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Helmets/syndie-raid-helmet.rsi/meta.json b/Resources/Textures/SS220/Clothing/Head/Helmets/syndie-raid-helmet.rsi/meta.json new file mode 100644 index 00000000000000..67fc361080317c --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Head/Helmets/syndie-raid-helmet.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "Made by DaGo7393 (discord) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light-vox.png b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light-vox.png new file mode 100644 index 00000000000000..09fc13375e77d1 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light-vox.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light.png b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light.png new file mode 100644 index 00000000000000..845202194ae8fc Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 00000000000000..1498055109eee0 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000000..ecd231b615dca2 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/icon-flash.png b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/icon-flash.png new file mode 100644 index 00000000000000..98a2cce8d3aa03 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/icon-flash.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/icon.png b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/icon.png new file mode 100644 index 00000000000000..3b6df91ef74cd4 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-left.png new file mode 100644 index 00000000000000..47810605735303 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-right.png new file mode 100644 index 00000000000000..15984945923ea3 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/light-overlay.png b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/light-overlay.png new file mode 100644 index 00000000000000..00778afffc267a Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/light-overlay.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/meta.json b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/meta.json new file mode 100644 index 00000000000000..27d312c355d0a1 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "Made by DaGo7393 (discord) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "light-overlay" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-light", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-light-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon-flash" + } + ] +}