diff --git a/Resources/Prototypes/Entities/Clothing/Head/base.yml b/Resources/Prototypes/Entities/Clothing/Head/base.yml index d35da8e8808..a7cb46c3958 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/base.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/base.yml @@ -29,3 +29,33 @@ - type: PressureProtection highPressureMultiplier: 0.5 lowPressureMultiplier: 100 + +- type: entity + parent: ClothingHeadHardsuitBase + id: ClothingHeadHardsuitWithLightBase + name: base hardsuit helmet with light + abstract: true + components: + - type: Sprite + layers: + - state: icon + - state: icon-flash + visible: false + - type: Clothing + HeldPrefix: off + ClothingPrefix: off + - type: PointLight + enabled: false + radius: 3 + - type: LoopingSound + - type: Appearance + visuals: + - type: FlashLightVisualizer + - type: ItemActions + actions: + - actionType: ToggleLight + # right now there is no power system for hardsuits + # so hardsuit helmet just have small battery inside + - type: HandheldLight + - type: PowerCellSlot + startingCellType: PowerCellSmallHigh diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index f663e3ffd65..cfa983df68b 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -1,5 +1,5 @@ - type: entity - parent: ClothingHeadHardsuitBase + parent: ClothingHeadHardsuitWithLightBase id: ClothingHeadHelmetHardsuitAtmos name: atmos hardsuit helmet description: A special hardsuit helmet designed for working in low-pressure, high thermal environments. @@ -32,7 +32,7 @@ sprite: Clothing/Head/Hardsuits/deathsquad.rsi - type: entity - parent: ClothingHeadHardsuitBase + parent: ClothingHeadHardsuitWithLightBase id: ClothingHeadHelmetHardsuitEngineering name: engineering hardsuit helmet description: An engineering hardsuit helmet designed for working in low-pressure, high radioactive environments. @@ -46,7 +46,7 @@ lowPressureMultiplier: 100 - type: entity - parent: ClothingHeadHardsuitBase + parent: ClothingHeadHardsuitWithLightBase id: ClothingHeadHelmetHardsuitEngineeringWhite name: CE hardsuit helmet description: Special hardsuit helmet, made for the chief engineer of the station. @@ -71,7 +71,7 @@ lowPressureMultiplier: 100 - type: entity - parent: ClothingHeadHardsuitBase + parent: ClothingHeadHardsuitWithLightBase id: ClothingHeadHelmetHardsuitMedical name: medical hardsuit helmet description: Lightweight medical hardsuit helmet that doesn't restrict your head movements. @@ -85,9 +85,9 @@ lowPressureMultiplier: 55 - type: entity - parent: ClothingHeadHardsuitBase + parent: ClothingHeadHardsuitWithLightBase id: ClothingHeadHelmetHardsuitRd - name: rd hardsuit helmet + name: research director's hardsuit helmet description: Lightweight hardsuit helmet that doesn't restrict your head movements. components: - type: Sprite @@ -99,7 +99,7 @@ lowPressureMultiplier: 55 - type: entity - parent: ClothingHeadHardsuitBase + parent: ClothingHeadHardsuitWithLightBase id: ClothingHeadHelmetHardsuitSalvage name: salvage hardsuit helmet description: A special helmet designed for work in a hazardous, low pressure environment. Has reinforced plating for wildlife encounters and dual floodlights. @@ -113,7 +113,7 @@ lowPressureMultiplier: 100 - type: entity - parent: ClothingHeadHardsuitBase + parent: ClothingHeadHardsuitWithLightBase id: ClothingHeadHelmetHardsuitSecurity name: security hardsuit helmet description: Armored hardsuit helmet for security needs. @@ -127,7 +127,7 @@ lowPressureMultiplier: 100 - type: entity - parent: ClothingHeadHardsuitBase + parent: ClothingHeadHardsuitWithLightBase id: ClothingHeadHelmetHardsuitSecurityRed name: hos hardsuit helmet description: Red armored hardsuit helmet for security needs. Belongs to the HoS. @@ -141,7 +141,7 @@ lowPressureMultiplier: 100 - type: entity - parent: ClothingHeadHardsuitBase + parent: ClothingHeadHardsuitWithLightBase id: ClothingHeadHelmetHardsuitSyndie name: blood red hardsuit helmet description: An advanced red hardsuit helmet designed for work in special operations. @@ -150,9 +150,11 @@ sprite: Clothing/Head/Hardsuits/syndicate.rsi - type: Clothing sprite: Clothing/Head/Hardsuits/syndicate.rsi + - type: PointLight + color: green - type: entity - parent: ClothingHeadHardsuitBase + parent: ClothingHeadHardsuitWithLightBase id: ClothingHeadHelmetHardsuitWizard name: wizard hardsuit helmet description: A bizarre gem-encrusted helmet that radiates magical energies. diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml index a0c7b0e26b2..d94314de03c 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml @@ -1,4 +1,4 @@ -# Power cells +# Power cells - type: entity id: PowerCellBase diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left.png deleted file mode 100644 index 7b91c45b694..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right.png deleted file mode 100644 index d26398b840e..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json index 366c8b9bdce..22a5d5a2345 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json @@ -16,19 +16,27 @@ "directions": 1 }, { - "name": "equipped-HELMET", + "name": "off-equipped-HELMET", "directions": 4 }, { - "name": "flash-equipped-HELMET", + "name": "off-inhand-left", "directions": 4 }, { - "name": "inhand-left", + "name": "off-inhand-right", "directions": 4 }, { - "name": "inhand-right", + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-inhand-left.png new file mode 100644 index 00000000000..e9ba55de1e0 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-inhand-right.png new file mode 100644 index 00000000000..45d73f73dfc Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/flash-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/flash-equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-inhand-left.png new file mode 100644 index 00000000000..be7ccc076c8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-inhand-right.png new file mode 100644 index 00000000000..77b15e837d7 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json index 366c8b9bdce..22a5d5a2345 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json @@ -16,19 +16,27 @@ "directions": 1 }, { - "name": "equipped-HELMET", + "name": "off-equipped-HELMET", "directions": 4 }, { - "name": "flash-equipped-HELMET", + "name": "off-inhand-left", "directions": 4 }, { - "name": "inhand-left", + "name": "off-inhand-right", "directions": 4 }, { - "name": "inhand-right", + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/inhand-left.png rename to Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-left.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/inhand-right.png rename to Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-right.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/flash-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/flash-equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-left.png new file mode 100644 index 00000000000..7c6e7831c89 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-right.png new file mode 100644 index 00000000000..5ee7bc104c3 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-HELMET.png deleted file mode 100644 index c10e42cf14e..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json index 366c8b9bdce..22a5d5a2345 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json @@ -16,19 +16,27 @@ "directions": 1 }, { - "name": "equipped-HELMET", + "name": "off-equipped-HELMET", "directions": 4 }, { - "name": "flash-equipped-HELMET", + "name": "off-inhand-left", "directions": 4 }, { - "name": "inhand-left", + "name": "off-inhand-right", "directions": 4 }, { - "name": "inhand-right", + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET.png new file mode 100644 index 00000000000..55b9fa1d3e7 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/inhand-left.png rename to Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-left.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/inhand-right.png rename to Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-right.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/flash-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/flash-equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-left.png new file mode 100644 index 00000000000..bff16d72c49 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-right.png new file mode 100644 index 00000000000..355977d540b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/inhand-left.png deleted file mode 100644 index 5c14b8e7626..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/inhand-right.png deleted file mode 100644 index d7ffaacbbb9..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json index 366c8b9bdce..22a5d5a2345 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json @@ -16,19 +16,27 @@ "directions": 1 }, { - "name": "equipped-HELMET", + "name": "off-equipped-HELMET", "directions": 4 }, { - "name": "flash-equipped-HELMET", + "name": "off-inhand-left", "directions": 4 }, { - "name": "inhand-left", + "name": "off-inhand-right", "directions": 4 }, { - "name": "inhand-right", + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-left.png new file mode 100644 index 00000000000..8fbfbbf6c6a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-right.png new file mode 100644 index 00000000000..035c6fc0619 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/flash-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/flash-equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-left.png new file mode 100644 index 00000000000..85cbfb321a0 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-right.png new file mode 100644 index 00000000000..c876fefb6c2 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json index 665e2ac94ea..22a5d5a2345 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json @@ -16,11 +16,27 @@ "directions": 1 }, { - "name": "equipped-HELMET", + "name": "off-equipped-HELMET", "directions": 4 }, { - "name": "flash-equipped-HELMET", + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png new file mode 100644 index 00000000000..dc16b147b84 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png new file mode 100644 index 00000000000..e289c62a841 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/flash-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/flash-equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png new file mode 100644 index 00000000000..b107272ddae Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png new file mode 100644 index 00000000000..59a3181afb1 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/inhand-left.png deleted file mode 100644 index 99e29235813..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/inhand-right.png deleted file mode 100644 index 16be438488f..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json index 366c8b9bdce..22a5d5a2345 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json @@ -16,19 +16,27 @@ "directions": 1 }, { - "name": "equipped-HELMET", + "name": "off-equipped-HELMET", "directions": 4 }, { - "name": "flash-equipped-HELMET", + "name": "off-inhand-left", "directions": 4 }, { - "name": "inhand-left", + "name": "off-inhand-right", "directions": 4 }, { - "name": "inhand-right", + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-left.png new file mode 100644 index 00000000000..b11a533c26b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-right.png new file mode 100644 index 00000000000..b9c9df2350a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/flash-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/flash-equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-left.png new file mode 100644 index 00000000000..12d13f0e189 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-right.png new file mode 100644 index 00000000000..141dc492a4e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/inhand-left.png deleted file mode 100644 index 8b4ba7b8d96..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/inhand-right.png deleted file mode 100644 index 44e2e8e0f3c..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json index 366c8b9bdce..22a5d5a2345 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json @@ -16,19 +16,27 @@ "directions": 1 }, { - "name": "equipped-HELMET", + "name": "off-equipped-HELMET", "directions": 4 }, { - "name": "flash-equipped-HELMET", + "name": "off-inhand-left", "directions": 4 }, { - "name": "inhand-left", + "name": "off-inhand-right", "directions": 4 }, { - "name": "inhand-right", + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-left.png new file mode 100644 index 00000000000..c81cf30dc9c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-right.png new file mode 100644 index 00000000000..f5b449d7b99 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/flash-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/flash-equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-left.png new file mode 100644 index 00000000000..32f699cb473 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-right.png new file mode 100644 index 00000000000..71d2a093251 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json index 665e2ac94ea..22a5d5a2345 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json @@ -16,11 +16,27 @@ "directions": 1 }, { - "name": "equipped-HELMET", + "name": "off-equipped-HELMET", "directions": 4 }, { - "name": "flash-equipped-HELMET", + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/security.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-left.png new file mode 100644 index 00000000000..68329b89c1a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-right.png new file mode 100644 index 00000000000..38cc8ca8a67 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/flash-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/security.rsi/flash-equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-left.png new file mode 100644 index 00000000000..742af4cd003 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-right.png new file mode 100644 index 00000000000..79f70ac1217 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon-flash.png new file mode 100644 index 00000000000..a2da1025505 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json index abce6563905..22a5d5a2345 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json @@ -12,19 +12,31 @@ "directions": 1 }, { - "name": "equipped-HELMET", + "name": "icon-flash", + "directions": 1 + }, + { + "name": "off-equipped-HELMET", "directions": 4 }, { - "name": "combat-equipped-HELMET", + "name": "off-inhand-left", "directions": 4 }, { - "name": "inhand-left", + "name": "off-inhand-right", "directions": 4 }, { - "name": "inhand-right", + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/inhand-left.png rename to Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-left.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/inhand-right.png rename to Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-right.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET.png new file mode 100644 index 00000000000..4fd853dd131 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-left.png new file mode 100644 index 00000000000..c1350c82422 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-right.png new file mode 100644 index 00000000000..db67f97b6f4 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/inhand-left.png deleted file mode 100644 index 6cda60d68b0..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/inhand-right.png deleted file mode 100644 index 1a23feecdbb..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json index 366c8b9bdce..22a5d5a2345 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json @@ -16,19 +16,27 @@ "directions": 1 }, { - "name": "equipped-HELMET", + "name": "off-equipped-HELMET", "directions": 4 }, { - "name": "flash-equipped-HELMET", + "name": "off-inhand-left", "directions": 4 }, { - "name": "inhand-left", + "name": "off-inhand-right", "directions": 4 }, { - "name": "inhand-right", + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-left.png new file mode 100644 index 00000000000..90b7c2574ad Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-right.png new file mode 100644 index 00000000000..de647331f93 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/flash-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/flash-equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-left.png new file mode 100644 index 00000000000..fc11467e8f9 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-right.png new file mode 100644 index 00000000000..131989b5928 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-right.png differ