Commit Graph
21 Commits
Author SHA1 Message Date
+37 21b4095dfd [MDB IGNORE] [IDB IGNORE] Upstream Sync - 04/17/2026 (#5453)
Upstream 04/17/2026

fixes https://github.com/Bubberstation/Bubberstation/issues/5549

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: tgstation-ci[bot] <179393467+tgstation-ci[bot]@users.noreply.github.com>
Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Rhials <28870487+Rhials@users.noreply.github.com>
Co-authored-by: rageguy505 <54517726+rageguy505@users.noreply.github.com>
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Aliceee2ch <160794176+Aliceee2ch@users.noreply.github.com>
Co-authored-by: Time-Green <7501474+Time-Green@users.noreply.github.com>
Co-authored-by: Tsar-Salat <62388554+Tsar-Salat@users.noreply.github.com>
Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
Co-authored-by: Maxipat <108554989+Maxipat112@users.noreply.github.com>
Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: SimplyLogan <47579821+loganuk@users.noreply.github.com>
Co-authored-by: loganuk <fakeemail123@aol.com>
Co-authored-by: Leland Kemble <70413276+lelandkemble@users.noreply.github.com>
Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
Co-authored-by: Roxy <75404941+TealSeer@users.noreply.github.com>
Co-authored-by: Lucy <lucy@absolucy.moe>
Co-authored-by: siliconOpossum <138069572+siliconOpossum@users.noreply.github.com>
Co-authored-by: Isratosh <Isratosh@hotmail.com>
Co-authored-by: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com>
Co-authored-by: Neocloudy <88008002+Neocloudy@users.noreply.github.com>
Co-authored-by: Alexander V. <volas@ya.ru>
Co-authored-by: ElGitificador <168473461+ElGitificador@users.noreply.github.com>
Co-authored-by: Twaticus <46540570+Twaticus@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Tim <timothymtorres@gmail.com>
Co-authored-by: Iamgoofball <iamgoofball@gmail.com>
Co-authored-by: Layzu666 <121319428+Layzu666@users.noreply.github.com>
Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com>
Co-authored-by: _0Steven <42909981+00-Steven@users.noreply.github.com>
Co-authored-by: mrmanlikesbt <99309552+mrmanlikesbt@users.noreply.github.com>
Co-authored-by: Ben10Omintrix <138636438+Ben10Omintrix@users.noreply.github.com>
Co-authored-by: John F. Kennedy <54908920+MacaroniCritter@users.noreply.github.com>
Co-authored-by: Cursor <102828457+theselfish@users.noreply.github.com>
Co-authored-by: Josh <josh.adam.powell@gmail.com>
Co-authored-by: Josh Powell <josh.powell@softwire.com>
Co-authored-by: Yobrocharlie <Charliemiller5617@gmail.com>
Co-authored-by: Hardly3D <66234359+Hardly3D@users.noreply.github.com>
Co-authored-by: shayoki <96078776+shayoki@users.noreply.github.com>
Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com>
2026-05-16 00:56:00 +02:00
MrMelbertandGitHub e4f533111f Deafness is now solely tracked by trait (#95029)
## About The Pull Request

Deletes `can_hear`, replaces it with trait-checking deafness.

The only two non-trait sources of deafness (hardcrit and lacking ears)
were refactored into using the trait.

## Why It's Good For The Game

Many places inconsistently check for the deaf trait rather than use
can_hear which meant behavior was not consistent.
Some code would treat "do we lack ears?" as being deaf, some would not. 

This unifies all the behavior so being deaf means you're deaf
everywhere.

It also means we can now easily react to gaining and losing deafness via
signal, where before we could not react to it without hooking the trait,
organ remove, AND stat change. Which no one did, of course, because who
would ever think to do that?

## Changelog

🆑 Melbert
refactor: Refactored how deafness is tracked. Please report any weird
interactions with sounds, like messages or sfx being missing.
fix: Lacking ears and being in hard crit now consistently treats you as
"being deaf". This affects a few minor interactions like empath, the
jukebox, and sleeping.
/🆑
2026-02-05 20:19:56 -05:00
FalloutFalconandGitHub b0ecc87d79 saftey checks for play_ambience (#93942)
## About The Pull Request
first part with the 1 minute return is so you can have a area without an
ambience without insane runtimes

second part: In the course of making
https://github.com/DarkPack13/SecondCity/pull/246 I experienced some
weird bugs where it was playing the sound but failing to get the length.
This notifies you why the fuck its happening cause its otherwise really
confusing
## Why It's Good For The Game
I spent a while debugging it, still REALLY confused why the bug is
actually happening in the first place, its somehow referencing a file
that's both gone, and no longer being referenced anywhere in the repo.
Either way this shit annoyed me lol.
2025-11-15 18:26:41 +01:00
RoxyandGitHub e8f068519d Fix ship ambience volume slider acting like an on/off switch (#90153)
## About The Pull Request

The code that uses the ship ambience volume slider uses the value in the
wrong SEND_SOUND call (one of the ones to stop the current playing
ambience) meaning the slider actually does nothing but toggle between
ship ambience being off and it being full volume. This fixes that

## Why It's Good For The Game

Volume make sound louder or quieter

## Changelog
🆑
fix: fixed the ship ambience volume slider not working properly
/🆑
2025-03-24 14:47:11 +01:00
RengaN02andGitHub 44d991b526 Sound Mixer Part 2 (#89251)
## About The Pull Request
Part 1 by grungussuss: https://github.com/tgstation/tgstation/pull/87529


![image](https://github.com/user-attachments/assets/7711dbe1-4a70-4cd4-9d82-8eb3fb60c9e9)
## Why It's Good For The Game

gives players more control over how loud they want certain sounds to be
## Changelog
🆑 Rengan
sound: the volume that vox, admin sound, insturments play at can now be
tweaked in preferences, check your preferences!
sound: Elevator now uses ambience volume preference, jukeboxes uses
instrument volume preference and end of round musics uses admin music
volume preference.
/🆑
2025-02-17 00:25:56 +01:00
Valithor ObsidionandGitHub 44f4c23cde Fix typo in path for cavesound3.ogg (#89181) 2025-01-24 11:40:42 +01:00
8603a6ef99 Sound caching, maintenance ambience improvements (#88752)
## About The Pull Request
ports https://github.com/DaedalusDock/daedalusdock/pull/1123
credit to kapu for the code, I just adapted some of it for us
While testing this I noticed that some ambience sounds have no fades, so
I added them, you can see comparisons here:
<details>
<summary> Click me for comparisons! </summary>


https://github.com/user-attachments/assets/0a93ec2f-7600-4510-9773-e2c721f06613


https://github.com/user-attachments/assets/3328a097-5dbc-402f-9dee-ece5aa7f9479


https://github.com/user-attachments/assets/b94157d4-a8a6-4877-94f6-1f07dc6ba860


https://github.com/user-attachments/assets/dc326c0c-7c8c-46ab-8149-97fd02dcc7f7


https://github.com/user-attachments/assets/e3309d6f-6d8d-4595-8c88-172c406f577d


https://github.com/user-attachments/assets/64109759-cbf6-446f-baf9-5705e1c81662


https://github.com/user-attachments/assets/28c0a112-a758-49d6-9f44-8e451a895d7a


https://github.com/user-attachments/assets/fec33b2e-6704-4d97-9c73-d0e58fef52ef


https://github.com/user-attachments/assets/4dc780bf-3fb4-402a-8803-7aef2968e012


https://github.com/user-attachments/assets/93d63a31-36aa-437f-95bc-840427155701


https://github.com/user-attachments/assets/59fd09d4-207d-4f7c-8355-34fb37981df4


https://github.com/user-attachments/assets/8c14e1e8-75be-4081-acac-d2cea05f8638


https://github.com/user-attachments/assets/3dac481c-62ea-4fd9-93c5-36f8cbbfab9b


https://github.com/user-attachments/assets/c92dd2aa-93f8-4c2e-9e00-7dbef3146280


https://github.com/user-attachments/assets/02baae83-2e51-4d83-8d97-be15bc58c6c9


https://github.com/user-attachments/assets/fcd969ac-7f29-4bb4-873c-30874e13516e


https://github.com/user-attachments/assets/24a053a3-1a71-4758-bb90-149ebc6b50b6


https://github.com/user-attachments/assets/40e7adee-d0bf-4636-b4d0-bc1c5c17688f


</details>

## Why It's Good For The Game

- sound caching will open possibilities for seamless sound loops and
overall knowing the length of a sound file is very useful
- closes https://github.com/tgstation/tgstation/issues/87054
- fade ins and fade outs prevent audio glitches on abrupt audio ends and
are nicer for the ears

## Changelog
🆑 kapu and grungussuss
fix: fixed ambience sounds getting cut off mid play
sound: addes fades for maintenance ambiences
refactor: changed the way maintenance sounds are 
/🆑

---------

Co-authored-by: Kapu1178 <75460809+Kapu1178@users.noreply.github.com>
2025-01-04 17:55:49 -08:00
grungussussandGitHub d09316667a Sound mixer attempt 2 (#87529)
## About The Pull Request

![image](https://github.com/user-attachments/assets/131caab0-5495-4f28-b9e0-46ce4ebc7b40)
## Why It's Good For The Game
gives players more control over how loud they want certain sounds to be
## Changelog
🆑 grungussuss
sound: the volume that ship ambience, ambience, radio noise and
announcements play at can now be tweaked in preferences, check your
preferences!
/🆑
2024-11-05 09:13:38 +13:00
grungussussandGitHub 95d1940ee1 ghosts don't get ambience cut off when changing areas (#87407)
## About The Pull Request
closes https://github.com/tgstation/tgstation/issues/85568
## Changelog
🆑 grungussuss
sound: ambience no longer gets cut off for ghosts
/🆑
2024-10-24 14:50:49 +02:00
grungussussandGitHub 58501dce77 Reorganizes the sound folder (#86726)
## About The Pull Request

<details>

- renamed ai folder to announcer

-- announcer --
- moved vox_fem to announcer
- moved approachingTG to announcer

- separated the ambience folder into ambience and instrumental
-- ambience --

- created holy folder moved all related sounds there
- created engineering folder and moved all related sounds there
- created security folder and moved ambidet there
- created general folder and moved ambigen there
- created icemoon folder and moved all icebox-related ambience there
- created medical folder and moved all medbay-related ambi there
- created ruin folder and moves all ruins ambi there
- created beach folder and moved seag and shore there
- created lavaland folder and moved related ambi there
- created aurora_caelus folder and placed its ambi there
- created misc folder and moved the rest of the files that don't have a
specific category into it

-- instrumental --

- moved traitor folder here
- created lobby_music folder and placed our songs there (title0 not used
anywhere? - server-side modification?)

-- items --

- moved secdeath to hailer
- moved surgery to handling

-- effects --

- moved chemistry into effects
- moved hallucinations into effects
- moved health into effects
- moved magic into effects

-- vehicles --

- moved mecha into vehicles


created mobs folder

-- mobs --

- moved creatures folder into mobs
- moved voice into mobs

renamed creatures to non-humanoids
renamed voice to humanoids

-- non-humanoids--

created cyborg folder
created hiss folder
moved harmalarm.ogg to cyborg

-- humanoids --




-- misc --

moved ghostwhisper to misc
moved insane_low_laugh to misc

I give up trying to document this.

</details>

- [X] ambience
- [x] announcer
- [x] effects
- [X] instrumental
- [x] items
- [x] machines
- [x] misc 
- [X] mobs
- [X] runtime
- [X] vehicles

- [ ] attributions

## Why It's Good For The Game

This folder is so disorganized that it's vomit inducing, will make it
easier to find and add new sounds, providng a minor structure to the
sound folder.

## Changelog
🆑 grungussuss
refactor: the sound folder in the source code has been reorganized,
please report any oddities with sounds playing or not playing
server: lobby music has been repathed to sound/music/lobby_music
/🆑
2024-09-23 22:24:50 -07:00
klorpaandGitHub d2c7806047 Spelling and Grammar Fixes (#85992)
## About The Pull Request
Fixes several errors to spelling, grammar, and punctuation.
## Why It's Good For The Game
## Changelog
🆑
spellcheck: fixed a few typos
/🆑
2024-08-21 17:07:02 +12:00
b643391e5a Ambience Buzz Handling Changes + Ambience buzz requires enviorment power (#84479)
## About The Pull Request
Partial port of https://github.com/DaedalusDock/daedalusdock/pull/996
- Fixes ambience prefrence inconsistancy issues with Observers unable to
turn off the ambience buzz.
- Ambience buzz requires a working, existing, charged APC with power to
the enviorment.
- Moves ``update_ambience_area()`` and ``refresh_looping_ambience()``
into ``code\controllers\subsystem\ambience.dm`` for better organization.

## Why It's Good For The Game

Mostly to tackle a prefrence bug where ghosts are unable to turn off
ambience buzz. But this also includes ambience buzz requiring a powered
area. Makes the station feel more dead when there's no enviorment power.
There should also be no buzzing inside space.

## Changelog

🆑 Kapu (ported by StrangeWeirdKitten)
fix: Ambience buzz will now respect ship ambience prefrences for
observers.
sound: Ambience buzz requires APC enviorment power to function
/🆑

---------

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2024-07-01 10:52:23 +02:00
AfevisandGitHub 48c986feda Fixes deaf mobs hearing ship/area ambience (#84207)
Fixes #65618

🆑 ShizCalev
fix: Deafened mobs will no longer hear the station's ambient sounds.
fix: Fixed ambient sounds resetting their loop when entering different
bodies (ie admin ghosting, being moved to other mobs, ect.)
/🆑
2024-06-29 01:00:17 +02:00
77aebb4c29 Audio File Cleanup (#74863)
## About The Pull Request
Removes a bunch of sound files that we don't use and moves some sound
files into better locations. I'm hoping to get an archive repo for
sounds going, much like the
[map_depot](https://github.com/tgstation/map_depot) and
[SS13-sprites](https://github.com/tgstation/SS13-sprites).

EDIT: The old sound files are being moved here:
https://github.com/tgstation/SS13-sounds

Also increased the volume of the clownana rustle sound and clipped off
some dead air from shockwave_explosion

## Why It's Good For The Game
Removes a total of 1.95MB worth of unused sound files from the codebase.

## Changelog
🆑 Tattle
soundadd: increased the volume of the clownana rustle
/🆑

---------

Co-authored-by: tattle <article.disaster@gmail.com>
2023-04-20 17:22:08 -06:00
872e64fb05 Adds spaces around logical operators (#72603)
## About The Pull Request
Part of a prior PR that was closed (#72562). This version does not add
the check in CI.
## Why It's Good For The Game
The work is already done, so I figured why not.
## Changelog
N/A Nothing player facing

Co-authored-by: Jeremiah Snow <jlsnow301@pm.me>
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2023-01-16 16:56:35 -08:00
5a4f5d54ea Ambience no longer uses reverb (#69003)
* no more local sound

* setup volume settings

* Update code/controllers/subsystem/ambience.dm

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>

* Update ambience.dm

Co-authored-by: Capybara <Capybara@CapybaraMailingServices.com>
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2022-08-13 18:19:48 -04:00
Kapu1178andGitHub 08f3b0bae0 Ambience tweaks (#68264)
* cleans up code and adjusts volume

* Removes can_hear() check

* volume

* review
2022-07-11 14:33:35 -05:00
Kapu1178andGitHub 986659b103 Improves ambience (#68041) 2022-07-07 01:17:14 -07:00
d610ab97c8 Adds keyloop to the autoclearing ss, cleans up ssambience a bit (#61540)
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2021-09-21 17:57:27 -07:00
FikouandGitHub 10f95b4889 ambience subsystem no longer plays to people in lobby (#59071) 2021-05-14 16:43:48 -04:00
QustinnusandGitHub 6988ef936a Refactors ambience to a subsystem (#56723)
Ambience is now in a subsystem, and plays every now and then without you having to move to a new area for it to play
2021-02-09 18:48:04 -03:00