diff --git a/Resources/Prototypes/_Mono/Entities/Clothing/Head/Hardsuits/tsfmc.yml b/Resources/Prototypes/_Mono/Entities/Clothing/Head/Hardsuits/tsfmc.yml index 5b4798f3c87..c2c4f908216 100644 --- a/Resources/Prototypes/_Mono/Entities/Clothing/Head/Hardsuits/tsfmc.yml +++ b/Resources/Prototypes/_Mono/Entities/Clothing/Head/Hardsuits/tsfmc.yml @@ -1,5 +1,5 @@ - type: entity - parent: ClothingHeadHardsuitBase + parent: NFClothingHeadHardsuitWithLightBaseNfsd id: ClothingHeadHelmetHardsuitM82 name: M82 helmet description: The interchangeable helmet system for the majority of M82 hardsuits. Outfitted with a basic NVG system. @@ -36,7 +36,7 @@ - HeadSide - type: entity - parent: [ClothingHeadHardsuitBase, ShowMedicalIcons] + parent: [NFClothingHeadHardsuitWithLightBaseNfsd, ShowMedicalIcons] id: ClothingHeadHelmetHardsuitM86 name: M86 helmet description: Modified from M82 series helmets, outfitted with night-vision equipment and refined gel-layers. diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/equipped-HELMET-hydrakin.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/equipped-HELMET-hydrakin.png deleted file mode 100644 index 9eeaceb4423..00000000000 Binary files a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/equipped-HELMET-hydrakin.png and /dev/null differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/equipped-HELMET-reptilian.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/equipped-HELMET-reptilian.png deleted file mode 100644 index fa98eaedc73..00000000000 Binary files a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/equipped-HELMET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/equipped-HELMET-vox.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/equipped-HELMET-vox.png deleted file mode 100644 index b82abefdf66..00000000000 Binary files a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/equipped-HELMET.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/equipped-HELMET.png deleted file mode 100644 index d274ed6195a..00000000000 Binary files a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/icon-flash.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/icon-flash.png new file mode 100644 index 00000000000..f0eeea692cb Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/icon-flash.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/icon.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/icon.png index a409c367042..7012c6ca226 100644 Binary files a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/icon.png and b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/icon.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/meta.json b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/meta.json index b7ac538348b..b8c059e0f65 100644 --- a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/meta.json +++ b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/meta.json @@ -11,20 +11,39 @@ "name": "icon" }, { - "name": "equipped-HELMET", + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-hydrakin", "directions": 4 }, { - "name": "equipped-HELMET-reptilian", + "name": "on-equipped-HELMET-hydrakin", "directions": 4 }, { - "name": "equipped-HELMET-hydrakin", + "name": "off-equipped-HELMET-vox", "directions": 4 }, { - "name": "equipped-HELMET-vox", + "name": "on-equipped-HELMET-vox", "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/off-equipped-HELMET-hydrakin.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/off-equipped-HELMET-hydrakin.png new file mode 100644 index 00000000000..07f439d2a99 Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/off-equipped-HELMET-hydrakin.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 00000000000..f6caf1a356c Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 00000000000..959be3d8607 Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/off-equipped-HELMET.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/off-equipped-HELMET.png new file mode 100644 index 00000000000..666e36d13a0 Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/on-equipped-HELMET-hydrakin.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/on-equipped-HELMET-hydrakin.png new file mode 100644 index 00000000000..b5367f41d59 Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/on-equipped-HELMET-hydrakin.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/on-equipped-HELMET-reptilian.png new file mode 100644 index 00000000000..0e510c84fa3 Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 00000000000..40e213e139a Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/on-equipped-HELMET.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/on-equipped-HELMET.png new file mode 100644 index 00000000000..fb43bb5c2ec Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m82.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/equipped-HELMET-hydrakin.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/equipped-HELMET-hydrakin.png deleted file mode 100644 index 8fe20368f22..00000000000 Binary files a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/equipped-HELMET-hydrakin.png and /dev/null differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/equipped-HELMET-reptilian.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/equipped-HELMET-reptilian.png deleted file mode 100644 index 6d8c57f62a0..00000000000 Binary files a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/equipped-HELMET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/equipped-HELMET-vox.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/equipped-HELMET-vox.png deleted file mode 100644 index 1df0f178f8d..00000000000 Binary files a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/equipped-HELMET.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/equipped-HELMET.png deleted file mode 100644 index 87990bbebda..00000000000 Binary files a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/icon-flash.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/icon-flash.png new file mode 100644 index 00000000000..90890789e43 Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/icon-flash.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/icon.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/icon.png index a409c367042..578505e50b5 100644 Binary files a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/icon.png and b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/icon.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/meta.json b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/meta.json index b7ac538348b..b8c059e0f65 100644 --- a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/meta.json +++ b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/meta.json @@ -11,20 +11,39 @@ "name": "icon" }, { - "name": "equipped-HELMET", + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-hydrakin", "directions": 4 }, { - "name": "equipped-HELMET-reptilian", + "name": "on-equipped-HELMET-hydrakin", "directions": 4 }, { - "name": "equipped-HELMET-hydrakin", + "name": "off-equipped-HELMET-vox", "directions": 4 }, { - "name": "equipped-HELMET-vox", + "name": "on-equipped-HELMET-vox", "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/off-equipped-HELMET-hydrakin.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/off-equipped-HELMET-hydrakin.png new file mode 100644 index 00000000000..e2bd0a06100 Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/off-equipped-HELMET-hydrakin.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 00000000000..fa761cd8ff8 Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 00000000000..3c936dc6a38 Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/off-equipped-HELMET.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/off-equipped-HELMET.png new file mode 100644 index 00000000000..758f646610e Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/on-equipped-HELMET-hydrakin.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/on-equipped-HELMET-hydrakin.png new file mode 100644 index 00000000000..d0a57311041 Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/on-equipped-HELMET-hydrakin.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/on-equipped-HELMET-reptilian.png new file mode 100644 index 00000000000..18208654603 Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 00000000000..97299aab2cb Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/on-equipped-HELMET.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/on-equipped-HELMET.png new file mode 100644 index 00000000000..b60a0f96297 Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/m86.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/syndicate.rsi/meta.json b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/syndicate.rsi/meta.json index cda542f0acb..f624de7f23a 100644 --- a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/syndicate.rsi/meta.json +++ b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/syndicate.rsi/meta.json @@ -46,4 +46,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m82c.rsi/equipped-OUTERCLOTHING-hydrakin.png b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m82c.rsi/equipped-OUTERCLOTHING-hydrakin.png index 97979b189ff..eeccc91bff0 100644 Binary files a/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m82c.rsi/equipped-OUTERCLOTHING-hydrakin.png and b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m82c.rsi/equipped-OUTERCLOTHING-hydrakin.png differ diff --git a/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m82c.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m82c.rsi/equipped-OUTERCLOTHING-reptilian.png index 0f6875e8de3..1bf2c496184 100644 Binary files a/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m82c.rsi/equipped-OUTERCLOTHING-reptilian.png and b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m82c.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m82c.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m82c.rsi/equipped-OUTERCLOTHING-vox.png index ec8a34715af..98c17dd4f6f 100644 Binary files a/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m82c.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m82c.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m82c.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m82c.rsi/equipped-OUTERCLOTHING.png index 4ad2bafd657..d9b8c3319c6 100644 Binary files a/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m82c.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m82c.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m86.rsi/equipped-OUTERCLOTHING-hydrakin.png b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m86.rsi/equipped-OUTERCLOTHING-hydrakin.png index 0c322449d89..93f9227673c 100644 Binary files a/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m86.rsi/equipped-OUTERCLOTHING-hydrakin.png and b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m86.rsi/equipped-OUTERCLOTHING-hydrakin.png differ diff --git a/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m86.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m86.rsi/equipped-OUTERCLOTHING-reptilian.png index 30785098683..a360a0cad6b 100644 Binary files a/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m86.rsi/equipped-OUTERCLOTHING-reptilian.png and b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m86.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m86.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m86.rsi/equipped-OUTERCLOTHING-vox.png index d09b80c03f7..cc4c3016c39 100644 Binary files a/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m86.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m86.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m86.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m86.rsi/equipped-OUTERCLOTHING.png index d80eaef0db5..7d15811d9bf 100644 Binary files a/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m86.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/m86.rsi/equipped-OUTERCLOTHING.png differ