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
..
alien_claw.yml
announcements.yml	Add two more reboot themes (#19219)	2023-08-18 23:58:44 +10:00
artifact.yml	add artifact sound effects (#17792)	2023-07-03 21:14:27 +10:00
atmospherics.yml
bike_horn.yml	Toy Box filled with toys (ready for merge) (#16252)	2023-06-03 13:31:47 +10:00
body_fall.yml
clownrecorder.yml	Adds the clown recorder (Clown fix) (#15074)	2023-04-06 20:06:52 -06:00
desceration.yml
dice.yml
disease.yml	Adds Bananium (#14663)	2023-04-29 15:38:09 +10:00
drink_open_sounds.yml
emotes.yml	Emotion (#17187)	2023-06-08 16:22:02 +10:00
explosion.yml	Explosion SFX juicing + higher persistence (#22544)	2023-12-16 03:57:46 +11:00
fence_rattle.yml	Chain link fencing (#18956)	2023-08-11 00:16:25 +10:00
food.yml
footsteps.yml	Space cobra 1.1 (#20298)	2023-12-06 20:25:57 -05:00
generator.yml	Portable Generator Rework (#19302)	2023-08-25 11:40:42 -07:00
generic_hit.yml	Port boxer from Nyano (#9080)	2022-07-26 18:34:19 -07:00
gib.yml
glassbreak.yml
gun_sounds.yml
ian_bark.yml	[Entity] Add Ian's Backpack (#15519)	2023-04-19 01:40:25 -06:00
impacts.yml
keyboard.yml
lighter_sounds.yml	Added a regular and an engraved zippo (flippo) lighter (#23020)	2023-12-27 15:47:35 -07:00
lobby.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-11-22 20:22:45 +03:00
NukeMusic.yml	Use new sound collection for nuke music	2023-04-29 15:02:06 +03:00
punching.yml
radiation.yml
sadtrombone.yml	Implanters and Subdermal Implants (#11840)	2022-11-20 17:49:37 +11:00
screams.yml	Cluwne smite (#13367)	2023-03-06 11:09:24 -08:00
shuttle.yml	Shuttle impact sounds (#11099)	2022-10-04 16:00:44 +11:00
skub.yml	Re-adds skub noise [Not april fools] (#14978)	2023-03-31 15:25:46 +11:00
sparks.yml
storage_rustle.yml
tools.yml	Added a regular and an engraved zippo (flippo) lighter (#23020)	2023-12-27 15:47:35 -07:00
toy_squeak.yml
traits.yml	add flash and dash sounds to paracusia (#20983)	2023-10-13 22:49:04 -07:00
tray.yml	Important fix for table climbing (#10803)	2022-08-25 23:41:37 +10:00
troll.yml	Remove among us noise from game (#16589)	2023-05-18 23:44:23 -06:00