Morb0
4f43e73d14
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/SoundCollections/NukeMusic.yml
2024-03-11 08:37:54 +03:00
Gregg and GitHub
e47f84568e
fix: ambient music fade in ( #25874 ) ( #25969 )
2024-03-11 04:08:05 +11:00
Morb0
b70efe1fa8
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Audio/ContentAudioSystem.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
# Resources/Prototypes/Datasets/Names/first_male.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
# Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/herringbone.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/meta.json
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/mono.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/offset.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png
# Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
# Resources/Textures/Structures/Windows/directional.rsi/meta.json
2024-03-08 16:05:59 +03:00
4c87dcd3cb
fix: lobby music volume will be changed on options change without restart (also lobby music not looped anymore) ( #25530 )
...
* fix: lobby music volume will be changed on options change without restart (also lobby music not looped anymore)
* refactor: now lobby music is part of ContentAudioSystem. Lobby playlist is used instead of single track. Client now selects next lobby soundtrack after previous finished.
* refactor: incapsulated info on current lobby track in simple record
* refactor: fixed inconsistent naming between song and soundtrack for lobbymusic
* refactor: xml-doc for LobbyPlaylistChangedEvent
* fix: inverted invalid _audio.PlayGlobal check to return only if lobby soundtrack play call failed
---------
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru >
2024-03-02 15:40:04 -05:00
Morb0
92bd0148fe
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Administration/Systems/AdminSystem.cs
# Resources/Locale/en-US/chat/sanitizer-replacements.ftl
# Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
# Resources/Prototypes/StatusIcon/antag.yml
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png
2024-02-17 12:43:04 +03:00
68ce53ae17
Random spontaneous cleanup PR ( #25131 )
...
* Use new Subs.CVar helper
Removes manual config OnValueChanged calls, removes need to remember to manually unsubscribe.
This both reduces boilerplate and fixes many issues where subscriptions weren't removed on entity system shutdown.
* Fix a bunch of warnings
* More warning fixes
* Use new DateTime serializer to get rid of ISerializationHooks in changelog code.
* Get rid of some more ISerializationHooks for enums
* And a little more
* Apply suggestions from code review
Co-authored-by: 0x6273 <0x40@keemail.me >
---------
Co-authored-by: 0x6273 <0x40@keemail.me >
2024-02-13 16:48:39 -05:00
Morb0
70e63172f7
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# README.md
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
# Resources/ServerInfo/Guidebook/Medical/Cloning.xml
# Resources/ServerInfo/Guidebook/Survival.xml
# Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json
# Resources/Textures/Objects/Tools/t-ray.rsi/meta.json
# Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png
# Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open.png
2024-02-12 12:53:34 +03:00
Hannah Giovanna Dawson and GitHub
2e7d23674e
Actually fix round restart audio this time ( #24754 )
...
In which I'm a goober and don't clean up after
myself and accientally don't fix the issue I tried
to fix in my last round restart PR.
The audio is now maintained just like music during
restarts (yippee to ContentAudioSystem::OnRoundRestart)
This needs a refactor but at least the defect is fixed now.
2024-02-03 13:11:53 +11:00
Morb0
1e0bee212f
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Maps/barratry.yml
# Resources/ServerInfo/Gameplay.txt
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Engineering/Power.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml
# Resources/Textures/Clothing/Mask/bat.rsi/meta.json
# Resources/Textures/Clothing/Mask/bear.rsi/meta.json
# Resources/Textures/Clothing/Mask/bee.rsi/meta.json
# Resources/Textures/Clothing/Mask/breath.rsi/meta.json
# Resources/Textures/Clothing/Mask/clown.rsi/meta.json
# Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json
# Resources/Textures/Clothing/Mask/ert.rsi/meta.json
# Resources/Textures/Clothing/Mask/fox.rsi/meta.json
# Resources/Textures/Clothing/Mask/gas.rsi/meta.json
# Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json
# Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json
# Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json
# Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json
# Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json
# Resources/Textures/Clothing/Mask/jackal.rsi/meta.json
# Resources/Textures/Clothing/Mask/joy.rsi/meta.json
# Resources/Textures/Clothing/Mask/medical.rsi/meta.json
# Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json
# Resources/Textures/Clothing/Mask/merc.rsi/meta.json
# Resources/Textures/Clothing/Mask/mime.rsi/meta.json
# Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json
# Resources/Textures/Clothing/Mask/rat.rsi/meta.json
# Resources/Textures/Clothing/Mask/raven.rsi/meta.json
# Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json
# Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json
# Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
# Resources/Textures/Clothing/Mask/sterile.rsi/meta.json
# Resources/Textures/Clothing/Mask/swat.rsi/meta.json
2024-01-10 00:23:02 +03:00
metalgearsloth and GitHub
bc07cbc97c
Fix audio fades ( #23684 )
...
Audio refactor casualty
2024-01-08 00:23:22 +11:00
Morb0
8ba54ec466
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Audio/ContentAudioSystem.cs
# Content.Client/Options/UI/Tabs/AudioTab.xaml
# Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
# Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/assembly.png
2023-12-29 16:58:52 +03:00
4023134cf0
Add UI click sounds ( #22410 )
...
* Add UI click sounds
* tweaks
* Significant cleanup
* Audio options and numerous fixes
* Fix the remaining UI elements
* new click sound
---------
Co-authored-by: Kara <lunarautomaton6@gmail.com >
2023-12-29 15:43:36 +11:00
Morb0
29a7082223
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/Names/military.yml
# Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Prototypes/Maps/kettle.yml
# Resources/ServerInfo/Guidebook/Service/Botany.xml
2023-12-11 21:56:43 +03:00
metalgearsloth and GitHub
1bdf94da64
Audio fixes ( #22324 )
2023-12-11 21:26:55 +11:00
Morb0
32b4c85105
Add tts multiplier value
2023-12-10 10:54:29 +03:00
metalgearsloth and GitHub
b72c8553d8
Add audio multipliers back ( #22260 )
2023-12-09 15:18:15 +11:00
metalgearsloth and GitHub
98d5f9f56b
Make audio sliders use gain not volume ( #21984 )
2023-12-09 14:03:08 +11:00
269c93245d
Unrevert audio ( #21330 )
...
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com >
2023-11-27 22:12:34 +11:00
metalgearsloth and GitHub
5b8f3c48c4
Revert "Update submodule to 175.0.0 ( #21318 )" ( #21319 )
2023-10-29 15:29:30 +11:00
metalgearsloth and GitHub
9b1b3e03ed
Content audio ( #20862 )
2023-10-29 14:58:23 +11:00
metalgearsloth and GitHub
1485666a23
Ambient music fixes ( #17685 )
2023-06-27 21:28:51 +10:00
metalgearsloth and GitHub
0c83642c5a
Add ambient music ( #16829 )
2023-05-29 10:44:11 +10:00
metalgearsloth and GitHub
5449835bba
Fix audio occlusion ( #10538 )
2022-08-11 19:53:28 -07:00
metalgearsloth
b8e6e713d3
Call SoundSystem instead
2021-08-11 19:29:06 +10:00
metalgearsloth
3a4adfa410
Fix audio occlusion
...
This was previously being done on every SoundComponent.
2021-08-11 19:20:49 +10:00
Morb0