diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml index 09899d627a..025f06ae57 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -25,6 +25,8 @@ - Supply - type: Sprite sprite: Clothing/Ears/Headsets/cargo.rsi + - type: Clothing + sprite: Clothing/Ears/Headsets/cargo.rsi - type: entity parent: ClothingHeadset @@ -39,6 +41,8 @@ - Supply - type: Sprite sprite: Clothing/Ears/Headsets/cargo.rsi + - type: Clothing + sprite: Clothing/Ears/Headsets/cargo.rsi - type: entity parent: ClothingHeadset @@ -59,6 +63,8 @@ - Supply - type: Sprite sprite: Clothing/Ears/Headsets/centcom.rsi + - type: Clothing + sprite: Clothing/Ears/Headsets/centcom.rsi - type: entity parent: ClothingHeadset @@ -78,6 +84,8 @@ - Supply - type: Sprite sprite: Clothing/Ears/Headsets/command.rsi + - type: Clothing + sprite: Clothing/Ears/Headsets/command.rsi - type: entity parent: ClothingHeadset @@ -91,6 +99,8 @@ - Engineering - type: Sprite sprite: Clothing/Ears/Headsets/engineering.rsi + - type: Clothing + sprite: Clothing/Ears/Headsets/engineering.rsi - type: entity parent: ClothingHeadset @@ -105,6 +115,8 @@ - Engineering - type: Sprite sprite: Clothing/Ears/Headsets/engineering.rsi + - type: Clothing + sprite: Clothing/Ears/Headsets/engineering.rsi - type: entity parent: ClothingHeadset @@ -118,6 +130,8 @@ - Medical - type: Sprite sprite: Clothing/Ears/Headsets/medical.rsi + - type: Clothing + sprite: Clothing/Ears/Headsets/medical.rsi - type: entity parent: ClothingHeadset @@ -132,6 +146,8 @@ - Science - type: Sprite sprite: Clothing/Ears/Headsets/medicalscience.rsi + - type: Clothing + sprite: Clothing/Ears/Headsets/medicalscience.rsi - type: entity parent: ClothingHeadset @@ -145,6 +161,8 @@ - Supply - type: Sprite sprite: Clothing/Ears/Headsets/mining.rsi + - type: Clothing + sprite: Clothing/Ears/Headsets/mining.rsi - type: entity parent: ClothingHeadset @@ -158,6 +176,8 @@ - Science - type: Sprite sprite: Clothing/Ears/Headsets/robotics.rsi + - type: Clothing + sprite: Clothing/Ears/Headsets/robotics.rsi - type: entity parent: ClothingHeadset @@ -171,6 +191,8 @@ - Science - type: Sprite sprite: Clothing/Ears/Headsets/science.rsi + - type: Clothing + sprite: Clothing/Ears/Headsets/science.rsi - type: entity parent: ClothingHeadset @@ -185,6 +207,8 @@ - Science - type: Sprite sprite: Clothing/Ears/Headsets/science.rsi + - type: Clothing + sprite: Clothing/Ears/Headsets/science.rsi - type: entity parent: ClothingHeadset @@ -198,6 +222,8 @@ - Security - type: Sprite sprite: Clothing/Ears/Headsets/security.rsi + - type: Clothing + sprite: Clothing/Ears/Headsets/security.rsi - type: entity parent: ClothingHeadset @@ -211,6 +237,8 @@ - Service - type: Sprite sprite: Clothing/Ears/Headsets/service.rsi + - type: Clothing + sprite: Clothing/Ears/Headsets/service.rsi - type: entity parent: ClothingHeadset diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml index 09e3a66dcf..e0dc3057f6 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml @@ -9,13 +9,35 @@ - type: Sprite state: icon_alt - type: Clothing + equippedPrefix: alt slots: - ears +- type: entity + parent: ClothingHeadsetAlt + id: ClothingHeadsetAltCentCom + name: CentCom over-ear headset + components: + - type: Headset + channels: + - Common + - Command + - CentCom + - Engineering + - Medical + - Science + - Security + - Service + - Supply + - type: Sprite + sprite: Clothing/Ears/Headsets/centcom.rsi + - type: Clothing + sprite: Clothing/Ears/Headsets/centcom.rsi + - type: entity parent: ClothingHeadsetAlt id: ClothingHeadsetAltCommand - name: command overear-headset + name: command over-ear headset components: - type: Headset channels: @@ -35,7 +57,7 @@ - type: entity parent: ClothingHeadsetAlt id: ClothingHeadsetAltMedical - name: medical overear-headset + name: medical over-ear headset components: - type: Headset channels: @@ -50,7 +72,7 @@ - type: entity parent: ClothingHeadsetAlt id: ClothingHeadsetAltSecurity - name: security overear-headset + name: security over-ear headset components: - type: Headset channels: @@ -65,7 +87,7 @@ - type: entity parent: ClothingHeadsetAlt id: ClothingHeadsetAltSyndicate - name: syndicate overear-headset + name: syndicate over-ear headset description: An updated, modular syndicate intercom that fits over the head and takes encryption keys. Protects ears from flashbangs. components: - type: Headset diff --git a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/equipped-EARS.png index f44dc32718..9f5f5e5fce 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/equipped-EARS.png and b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/equipped-EARS.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/alt-equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/alt-equipped-EARS.png new file mode 100644 index 0000000000..55535e7024 Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/alt-equipped-EARS.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/equipped-EARS.png new file mode 100644 index 0000000000..ca345f3759 Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/equipped-EARS.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json index bfa84ad2fc..1e84b43d94 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json @@ -12,6 +12,14 @@ }, { "name": "icon_alt" + }, + { + "name": "equipped-EARS", + "directions": 4 + }, + { + "name": "alt-equipped-EARS", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/alt-equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/alt-equipped-EARS.png new file mode 100644 index 0000000000..c002f27486 Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/alt-equipped-EARS.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/equipped-EARS.png index c002f27486..b2cd414cf2 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/equipped-EARS.png and b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/equipped-EARS.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/meta.json index 2918dff3d1..1e84b43d94 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/meta.json @@ -16,6 +16,10 @@ { "name": "equipped-EARS", "directions": 4 + }, + { + "name": "alt-equipped-EARS", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/equipped-EARS.png index e6bfcdcd68..8fb3cf6460 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/equipped-EARS.png and b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/equipped-EARS.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/alt-equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/alt-equipped-EARS.png new file mode 100644 index 0000000000..f44dc32718 Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/alt-equipped-EARS.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/equipped-EARS.png index f44dc32718..b2cd414cf2 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/equipped-EARS.png and b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/equipped-EARS.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/meta.json index 2918dff3d1..1e84b43d94 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/meta.json @@ -16,6 +16,10 @@ { "name": "equipped-EARS", "directions": 4 + }, + { + "name": "alt-equipped-EARS", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/equipped-EARS.png new file mode 100644 index 0000000000..6c3ec4221f Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/equipped-EARS.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/meta.json index 79395547c5..3d37ed5434 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/meta.json @@ -9,6 +9,10 @@ "states": [ { "name": "icon" + }, + { + "name": "equipped-EARS", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/equipped-EARS.png new file mode 100644 index 0000000000..9f5f5e5fce Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/equipped-EARS.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/meta.json index 79395547c5..df6ee47d08 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/meta.json @@ -9,6 +9,10 @@ "states": [ { "name": "icon" + }, + { + "name": "equipped-EARS", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/equipped-EARS.png new file mode 100644 index 0000000000..05da7f35df Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/equipped-EARS.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/meta.json index 79395547c5..df6ee47d08 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/meta.json @@ -9,6 +9,10 @@ "states": [ { "name": "icon" + }, + { + "name": "equipped-EARS", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/equipped-EARS.png new file mode 100644 index 0000000000..a0d2f5a295 Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/equipped-EARS.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json index 79395547c5..3d37ed5434 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json @@ -9,6 +9,10 @@ "states": [ { "name": "icon" + }, + { + "name": "equipped-EARS", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/alt-equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/alt-equipped-EARS.png new file mode 100644 index 0000000000..e635973b36 Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/alt-equipped-EARS.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/equipped-EARS.png index e635973b36..f9001cd06e 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/equipped-EARS.png and b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/equipped-EARS.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json index 2918dff3d1..1e84b43d94 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json @@ -16,6 +16,10 @@ { "name": "equipped-EARS", "directions": 4 + }, + { + "name": "alt-equipped-EARS", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Ears/Headsets/service.rsi/equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/service.rsi/equipped-EARS.png new file mode 100644 index 0000000000..2e3c41f531 Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/service.rsi/equipped-EARS.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/service.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/service.rsi/meta.json index 79395547c5..df6ee47d08 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/service.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/service.rsi/meta.json @@ -9,6 +9,10 @@ "states": [ { "name": "icon" + }, + { + "name": "equipped-EARS", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/equipped-EARS.png new file mode 100644 index 0000000000..1abbd39075 Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/equipped-EARS.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/alt-equipped-EARS.png similarity index 100% rename from Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/equipped-EARS.png rename to Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/alt-equipped-EARS.png diff --git a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json index c4b73b7d03..a36cd58203 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json @@ -11,7 +11,7 @@ "name": "icon_alt" }, { - "name": "equipped-EARS", + "name": "alt-equipped-EARS", "directions": 4 } ]