juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various Headphones Fixes and Tweaks (#38479)

Browse Source 
* sprites, wearables

* neck

* icon-on sprite
This commit is contained in:
Boaz1111
2025-06-28 16:01:28 +02:00
committed by GitHub
parent 6db9f65046
commit 0f74bac415
24 changed files with 223 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
View File

@@ -35,7 +35,7 @@
ClothingNeckScarfStripedTrans: 2
ClothingHeadHatXmasCrown: 2
BedsheetRainbow: 2
ClothingNeckHeadphones: 2
ClothingMultipleHeadphones: 2
ClothingHeadHatFlowerWreath: 2
ClothingUniformColorRainbow: 2
ClothingUnderSocksCoder: 2

40
Resources/Prototypes/Entities/Clothing/Multiple/misc.yml Normal file
View File

@@ -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

33
Resources/Prototypes/Entities/Clothing/Neck/misc.yml
View File

@@ -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

2
Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
View File

@@ -56,7 +56,7 @@
- id: ClothingHeadHatPaper
- id: ClothingHeadHatPirate
- id: ClothingMaskSterile
- id: ClothingNeckHeadphones
- id: ClothingMultipleHeadphones
- id: ClothingNeckTieRed
- id: ClothingOuterCoatGentle
- !type:AllSelector

2
Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
View File

@@ -241,7 +241,7 @@
- id: ClothingHeadHatAnimalHeadslime
prob: 0.03
orGroup: dresserthirdloot
- id: ClothingNeckHeadphones
- id: ClothingMultipleHeadphones
prob: 0.03
orGroup: dresserthirdloot
- id: ClothingUnderSocksCoder

2
Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
View File

@@ -26,7 +26,7 @@
id: Headphones
storage:
back:
- ClothingNeckHeadphones
- ClothingMultipleHeadphones
# Toys
- type: loadout

2
Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
View File

@@ -31,6 +31,6 @@
equipment:
head: ClothingHeadHatTophat
mask: ClothingMaskBreath
neck: ClothingNeckHeadphones
neck: ClothingMultipleHeadphones
outerClothing: ClothingOuterWinterMusician
gloves: ClothingHandsGlovesColorBlack

BIN
Resources/Textures/Clothing/Multiple/headphones.rsi/icon-on.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
Resources/Textures/Clothing/Multiple/headphones.rsi/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 487 B

BIN
Resources/Textures/Clothing/Multiple/headphones.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 499 B

BIN
Resources/Textures/Clothing/Multiple/headphones.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 508 B

175
Resources/Textures/Clothing/Multiple/headphones.rsi/meta.json Normal file
View File

@@ -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
]
]
}
]
}

0
Resources/Textures/Clothing/Neck/Misc/headphones.rsi/off-equipped-NECK.png → Resources/Textures/Clothing/Multiple/headphones.rsi/off-equipped-EARS.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 273 B

After

Width:  |  Height:  |  Size: 273 B

BIN
Resources/Textures/Clothing/Multiple/headphones.rsi/off-equipped-HELMET.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 273 B

BIN
Resources/Textures/Clothing/Multiple/headphones.rsi/off-equipped-NECK.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 374 B

0
Resources/Textures/Clothing/Neck/Misc/headphones.rsi/on-equipped-NECK.png → Resources/Textures/Clothing/Multiple/headphones.rsi/on-equipped-EARS.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
Resources/Textures/Clothing/Multiple/headphones.rsi/on-equipped-HELMET.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
Resources/Textures/Clothing/Multiple/headphones.rsi/on-equipped-NECK.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
Resources/Textures/Clothing/Neck/Misc/headphones.rsi/icon-on.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 176 B

BIN
Resources/Textures/Clothing/Neck/Misc/headphones.rsi/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 176 B

BIN
Resources/Textures/Clothing/Neck/Misc/headphones.rsi/inhand-left.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 329 B

BIN
Resources/Textures/Clothing/Neck/Misc/headphones.rsi/inhand-right.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 329 B

71
Resources/Textures/Clothing/Neck/Misc/headphones.rsi/meta.json
View File

@@ -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"
}
]
}

3
Resources/migration.yml
View File

@@ -681,3 +681,6 @@ BarSignEmprahAlignTile: BarSignEmprah
BarSignSpacebucksAlignTile: BarSignSpacebucks
BarSignMaltroachAlignTile: BarSignMaltroach
BarSignWhiskeyEchoesAlignTile: BarSignWhiskeyEchoes
# 2025-06-21
ClothingNeckHeadphones: ClothingMultipleHeadphones