Various Headphones Fixes and Tweaks (#38479)

* sprites, wearables

* neck

* icon-on sprite

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
index 23d836b7c10f2e750b684170ba098abfed037769..79ce6426dc028dd21e9c943034027fef16f43685 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
@@ -35,7 +35,7 @@
     ClothingNeckScarfStripedTrans: 2
     ClothingHeadHatXmasCrown: 2
     BedsheetRainbow: 2
-    ClothingNeckHeadphones: 2
+    ClothingMultipleHeadphones: 2
     ClothingHeadHatFlowerWreath: 2
     ClothingUniformColorRainbow: 2
     ClothingUnderSocksCoder: 2

diff --git a/Resources/Prototypes/Entities/Clothing/Multiple/misc.yml b/Resources/Prototypes/Entities/Clothing/Multiple/misc.yml
new file mode 100644 (file)
index 0000000..95b45bd
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Multiple/misc.yml
@@ -0,0 +1,40 @@
+- type: entity
+  parent: Clothing
+  id: ClothingMultipleHeadphones
+  name: headphones
+  description: Quality headphones from Drunk Masters, with good sound insulation.
+  components:
+  - type: Sprite
+    sprite: Clothing/Multiple/headphones.rsi
+    layers:
+    - state: icon
+      map: [ "enum.ToggleableVisuals.Layer" ]
+  - type: Clothing
+    equippedPrefix: off
+    sprite: Clothing/Multiple/headphones.rsi
+    slots:
+    - HEAD
+    - EARS
+    - NECK
+  - type: ToggleableVisuals
+    spriteLayer: enum.ToggleableVisuals.Layer
+    clothingVisuals:
+      head:
+      - state: on-equipped-HELMET
+      ears:
+      - state: on-equipped-EARS
+      neck:
+      - state: on-equipped-NECK
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.ToggleableVisuals.Enabled:
+        enum.ToggleableVisuals.Layer:
+          True: {state: icon-on}
+          False: {state: icon}
+  - type: ItemToggle
+    predictable: false
+    soundActivate:
+      path: /Audio/Items/flashlight_on.ogg
+    soundDeactivate:
+      path: /Audio/Items/flashlight_off.ogg

diff --git a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
index c8892bc0b580c8ddbc44946c67aa60edfc40d8d5..60ea7c49ecb21898e1d9f15bf9136f27b3d811ff 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
@@ -1,36 +1,3 @@
-- type: entity
-  parent: ClothingNeckBase
-  id: ClothingNeckHeadphones
-  name: headphones
-  description: Quality headphones from Drunk Masters, with good sound insulation.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/Misc/headphones.rsi
-    layers:
-    - state: icon
-      map: [ "enum.ToggleableVisuals.Layer" ]
-  - type: Clothing
-    equippedPrefix: off
-    sprite: Clothing/Neck/Misc/headphones.rsi
-  - type: ToggleableVisuals
-    spriteLayer: enum.ToggleableVisuals.Layer
-    clothingVisuals:
-      neck:
-      - state: on-equipped-NECK
-  - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-      enum.ToggleableVisuals.Enabled:
-        enum.ToggleableVisuals.Layer:
-          True: {state: icon-on}
-          False: {state: icon}
-  - type: ItemToggle
-    predictable: false
-    soundActivate:
-      path: /Audio/Items/flashlight_on.ogg
-    soundDeactivate:
-      path: /Audio/Items/flashlight_off.ogg
-
 - type: entity
   parent: Clothing
   id: ClothingNeckStethoscope

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index 5f54e9a5c3cf29e324bb3c8cf8178a63f1ed29a9..6def2009ccbf855b29c908d78a14d22293f7ee59 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -56,7 +56,7 @@
       - id: ClothingHeadHatPaper
       - id: ClothingHeadHatPirate
       - id: ClothingMaskSterile
-      - id: ClothingNeckHeadphones
+      - id: ClothingMultipleHeadphones
       - id: ClothingNeckTieRed
       - id: ClothingOuterCoatGentle
       - !type:AllSelector

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
index 2690906fc164c87f428b2e12161e0834cad8e52e..ccfb25a80270944a6d8d787ebc97aa707f923b34 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
@@ -241,7 +241,7 @@
       - id: ClothingHeadHatAnimalHeadslime
         prob: 0.03
         orGroup: dresserthirdloot
-      - id: ClothingNeckHeadphones
+      - id: ClothingMultipleHeadphones
         prob: 0.03
         orGroup: dresserthirdloot
       - id: ClothingUnderSocksCoder

diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
index 156bade83bf5b4a7c520610478bf05b2cb99405c..2649dfa95809021c07755136af587aeba7ee2ec5 100644 (file)
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -26,7 +26,7 @@
   id: Headphones
   storage:
     back:
-    - ClothingNeckHeadphones
+    - ClothingMultipleHeadphones
 
 # Toys
 - type: loadout

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
index 04891ab2c695c6760a07b4539ae05ba999fc9277..03032151dc3c227a66638922a225823fb5eaa434 100644 (file)
--- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
@@ -31,6 +31,6 @@
   equipment:
     head: ClothingHeadHatTophat
     mask: ClothingMaskBreath
-    neck: ClothingNeckHeadphones
+    neck: ClothingMultipleHeadphones
     outerClothing: ClothingOuterWinterMusician
     gloves: ClothingHandsGlovesColorBlack

diff --git a/Resources/Textures/Clothing/Multiple/headphones.rsi/icon-on.png b/Resources/Textures/Clothing/Multiple/headphones.rsi/icon-on.png
new file mode 100644 (file)
index 0000000..2de89a0
Binary files /dev/null and b/Resources/Textures/Clothing/Multiple/headphones.rsi/icon-on.png differ

diff --git a/Resources/Textures/Clothing/Multiple/headphones.rsi/icon.png b/Resources/Textures/Clothing/Multiple/headphones.rsi/icon.png
new file mode 100644 (file)
index 0000000..8236376
Binary files /dev/null and b/Resources/Textures/Clothing/Multiple/headphones.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Multiple/headphones.rsi/inhand-left.png b/Resources/Textures/Clothing/Multiple/headphones.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..0febda5
Binary files /dev/null and b/Resources/Textures/Clothing/Multiple/headphones.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Multiple/headphones.rsi/inhand-right.png b/Resources/Textures/Clothing/Multiple/headphones.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..ca83086
Binary files /dev/null and b/Resources/Textures/Clothing/Multiple/headphones.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Multiple/headphones.rsi/meta.json b/Resources/Textures/Clothing/Multiple/headphones.rsi/meta.json
new file mode 100644 (file)
index 0000000..4c419dd
--- /dev/null
+++ b/Resources/Textures/Clothing/Multiple/headphones.rsi/meta.json
@@ -0,0 +1,175 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, icon, inhand-left and inhand-right edited by Boaz1111 (github), on-equipped-NECK renamed to on-equipped-HEAD and on-equipped-EARS, off-equipped-NECK renamed to off-equipped-HEAD and off-equipped-EARS by Boaz1111 (github), icon-on made by TiniestShark (github) based on icon, on-equipped-NECK and off-equipped-NECK made by TiniestShark (github).",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "on-equipped-HELMET",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "off-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-EARS",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "off-equipped-EARS",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-NECK",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "off-equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-on",
+      "delays": [
+        [
+        0.2,
+        0.2,
+        0.2,
+        0.2,
+        0.2,
+        0.2,
+        0.2,
+        0.2
+        ]
+      ]
+    }
+  ]
+}

diff --git a/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/off-equipped-NECK.png b/Resources/Textures/Clothing/Multiple/headphones.rsi/off-equipped-EARS.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/headphones.rsi/off-equipped-NECK.png
rename to Resources/Textures/Clothing/Multiple/headphones.rsi/off-equipped-EARS.png

diff --git a/Resources/Textures/Clothing/Multiple/headphones.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Multiple/headphones.rsi/off-equipped-HELMET.png
new file mode 100644 (file)
index 0000000..671cf6b
Binary files /dev/null and b/Resources/Textures/Clothing/Multiple/headphones.rsi/off-equipped-HELMET.png differ

diff --git a/Resources/Textures/Clothing/Multiple/headphones.rsi/off-equipped-NECK.png b/Resources/Textures/Clothing/Multiple/headphones.rsi/off-equipped-NECK.png
new file mode 100644 (file)
index 0000000..a90ae1d
Binary files /dev/null and b/Resources/Textures/Clothing/Multiple/headphones.rsi/off-equipped-NECK.png differ

diff --git a/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/on-equipped-NECK.png b/Resources/Textures/Clothing/Multiple/headphones.rsi/on-equipped-EARS.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/headphones.rsi/on-equipped-NECK.png
rename to Resources/Textures/Clothing/Multiple/headphones.rsi/on-equipped-EARS.png

diff --git a/Resources/Textures/Clothing/Multiple/headphones.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Multiple/headphones.rsi/on-equipped-HELMET.png
new file mode 100644 (file)
index 0000000..59841d3
Binary files /dev/null and b/Resources/Textures/Clothing/Multiple/headphones.rsi/on-equipped-HELMET.png differ

diff --git a/Resources/Textures/Clothing/Multiple/headphones.rsi/on-equipped-NECK.png b/Resources/Textures/Clothing/Multiple/headphones.rsi/on-equipped-NECK.png
new file mode 100644 (file)
index 0000000..d65f536
Binary files /dev/null and b/Resources/Textures/Clothing/Multiple/headphones.rsi/on-equipped-NECK.png differ

diff --git a/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/icon-on.png b/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/icon-on.png
deleted file mode 100644 (file)
index f1ea592..0000000
Binary files a/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/icon-on.png and /dev/null differ

diff --git a/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/icon.png b/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/icon.png
deleted file mode 100644 (file)
index f1ea592..0000000
Binary files a/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/icon.png and /dev/null differ

diff --git a/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/inhand-left.png
deleted file mode 100644 (file)
index ab7a61a..0000000
Binary files a/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/inhand-left.png and /dev/null differ

diff --git a/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/inhand-right.png
deleted file mode 100644 (file)
index 8a09470..0000000
Binary files a/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/inhand-right.png and /dev/null differ

diff --git a/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/meta.json
deleted file mode 100644 (file)
index c4b27b7..0000000
--- a/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/meta.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "on-equipped-NECK",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "off-equipped-NECK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "icon"
-    },
-    {
-      "name": "icon-on"
-    }
-  ]
-}

diff --git a/Resources/migration.yml b/Resources/migration.yml
index d420668b8d59ba8252aaffff966e04dc68f23456..87a996e23bde3563d1b6ac2f4ec5873a2fdf15de 100644 (file)
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -681,3 +681,6 @@ BarSignEmprahAlignTile: BarSignEmprah
 BarSignSpacebucksAlignTile: BarSignSpacebucks
 BarSignMaltroachAlignTile: BarSignMaltroach
 BarSignWhiskeyEchoesAlignTile: BarSignWhiskeyEchoes
+
+# 2025-06-21
+ClothingNeckHeadphones: ClothingMultipleHeadphones