From 0f74bac4154bb553933e6ca9c4e8f05136105485 Mon Sep 17 00:00:00 2001 From: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Date: Sat, 28 Jun 2025 16:01:28 +0200 Subject: [PATCH] Various Headphones Fixes and Tweaks (#38479) * sprites, wearables * neck * icon-on sprite --- .../VendingMachines/Inventories/pride.yml | 2 +- .../Entities/Clothing/Multiple/misc.yml | 40 ++++ .../Entities/Clothing/Neck/misc.yml | 33 ---- .../Markers/Spawners/Random/maintenance.yml | 2 +- .../Entities/Structures/Furniture/dresser.yml | 2 +- .../Loadouts/Miscellaneous/trinkets.yml | 2 +- .../Roles/Jobs/Civilian/musician.yml | 2 +- .../Multiple/headphones.rsi/icon-on.png | Bin 0 -> 1088 bytes .../Clothing/Multiple/headphones.rsi/icon.png | Bin 0 -> 487 bytes .../Multiple/headphones.rsi/inhand-left.png | Bin 0 -> 499 bytes .../Multiple/headphones.rsi/inhand-right.png | Bin 0 -> 508 bytes .../Multiple/headphones.rsi/meta.json | 175 ++++++++++++++++++ .../headphones.rsi/off-equipped-EARS.png} | Bin .../headphones.rsi/off-equipped-HELMET.png | Bin 0 -> 273 bytes .../headphones.rsi/off-equipped-NECK.png | Bin 0 -> 374 bytes .../headphones.rsi/on-equipped-EARS.png} | Bin .../headphones.rsi/on-equipped-HELMET.png | Bin 0 -> 1425 bytes .../headphones.rsi/on-equipped-NECK.png | Bin 0 -> 1449 bytes .../Neck/Misc/headphones.rsi/icon-on.png | Bin 176 -> 0 bytes .../Neck/Misc/headphones.rsi/icon.png | Bin 176 -> 0 bytes .../Neck/Misc/headphones.rsi/inhand-left.png | Bin 329 -> 0 bytes .../Neck/Misc/headphones.rsi/inhand-right.png | Bin 329 -> 0 bytes .../Neck/Misc/headphones.rsi/meta.json | 71 ------- Resources/migration.yml | 3 + 24 files changed, 223 insertions(+), 109 deletions(-) create mode 100644 Resources/Prototypes/Entities/Clothing/Multiple/misc.yml create mode 100644 Resources/Textures/Clothing/Multiple/headphones.rsi/icon-on.png create mode 100644 Resources/Textures/Clothing/Multiple/headphones.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Multiple/headphones.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Multiple/headphones.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Multiple/headphones.rsi/meta.json rename Resources/Textures/Clothing/{Neck/Misc/headphones.rsi/off-equipped-NECK.png => Multiple/headphones.rsi/off-equipped-EARS.png} (100%) create mode 100644 Resources/Textures/Clothing/Multiple/headphones.rsi/off-equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Multiple/headphones.rsi/off-equipped-NECK.png rename Resources/Textures/Clothing/{Neck/Misc/headphones.rsi/on-equipped-NECK.png => Multiple/headphones.rsi/on-equipped-EARS.png} (100%) create mode 100644 Resources/Textures/Clothing/Multiple/headphones.rsi/on-equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Multiple/headphones.rsi/on-equipped-NECK.png delete mode 100644 Resources/Textures/Clothing/Neck/Misc/headphones.rsi/icon-on.png delete mode 100644 Resources/Textures/Clothing/Neck/Misc/headphones.rsi/icon.png delete mode 100644 Resources/Textures/Clothing/Neck/Misc/headphones.rsi/inhand-left.png delete mode 100644 Resources/Textures/Clothing/Neck/Misc/headphones.rsi/inhand-right.png delete mode 100644 Resources/Textures/Clothing/Neck/Misc/headphones.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml index 23d836b7c1..79ce6426dc 100644 --- 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 index 0000000000..95b45bd8dc --- /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 c8892bc0b5..60ea7c49ec 100644 --- 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 5f54e9a5c3..6def2009cc 100644 --- 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 2690906fc1..ccfb25a802 100644 --- 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 156bade83b..2649dfa958 100644 --- 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 04891ab2c6..03032151dc 100644 --- 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 index 0000000000000000000000000000000000000000..2de89a0630f34b048e26b4e41e9e0f39b75db295 GIT binary patch literal 1088 zcmV-G1i$-
Px&;7LS5RCt{2oj-2tFbu{&KfC}L19U0S#dpZ!W8@e)QjgK)9V0-F;H5y80vQ8j
z@Ea1Nj{nG%Et0auAK<~MqffLbMUqW6L*i@#mUSQaJkRs0d0v)f7Fv4>cL0Bt>##_M
z8rntO=)l7vn&+CRJ3zY^yx!dXv*(;<-K}n91EUV0*8q=Ra>{<|Fb`@EV7NJjy2W;+X5JPXJM
zfdn81>4(v1mNEeSKY^Wr1*pQn$k>2!0mM|04%P(_lcoUKAixAPhY74Q$kGDHg6c8^
zhXaGE`@G)8CR>jJ6{dN*IEGmGzwLA6JD|Y9!us%kyxyrrQ
WiD_G6(jhvkbbduQ!mdu1MOL(r(iWK=;+A`g|#g4&@y
zeI1vT6U75(B}!#fo~;9gLTP8@DQ1OrAXD$*dURf=<^qC)gVR(t?@lRagF|6LSA*_9
zwi52LU~LXvfiN>+(vS?{pQ!RBwfW~q8`Y{59kM+`60=6>S@A0C1Hh%7wl}OX7EiX%
zO62@9+wLJNwfD9W&ok@*&9B&^(?-iuvhEX?OvaQ$^7&)Z
zVaKRiyLCk}h6qcS{In_&bSnI1`r&~C&ykA7u0LOG71dBtmxEqU-odyn2*&{AncfP2
zT&h+xaf@7~!yc>yv5u&n$5cU){fSOg=$3H`Jsk3Jc^&<-NxPrmAS{2k5dcJb1