Morb0 c44d509701 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs # Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml # Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs # Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs # Content.Server/VoiceMask/VoiceMaskSystem.cs # Content.Server/VoiceMask/VoiceMaskerComponent.cs # Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Textures/Interface/Alerts/essence_counter.rsi/essence0.png # Resources/Textures/Interface/Alerts/essence_counter.rsi/essence16.png		2024-03-29 11:43:30 +03:00
..
alien_claw.yml
announcements.yml	Add two more reboot themes (#19219)	2023-08-18 23:58:44 +10:00
arcade.yml	Arcade machine improvements (#24200)	2024-03-28 17:28:45 +11: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
bureaucracy.yml	Add sfx for writing on paper (#25257)	2024-02-16 16:48:18 -07:00
church_bell.yml	Church Bells (#26030)	2024-03-26 00:24:00 +11:00
clownrecorder.yml
desceration.yml
destruction.yml	Destruction & impact sound rework pass 1 (#24282)	2024-01-19 10:33:07 -05:00
dice.yml
disease.yml	Adds Bananium (#14663)	2023-04-29 15:38:09 +10:00
drink_close_sounds.yml	Add verbs to Open/Close Openable containers, and add optional seals (#24780)	2024-02-13 17:08:07 -05:00
drink_open_sounds.yml
emotes.yml	Juice that makes you Weh! (but real!) (#25132)	2024-02-26 00:54:07 +11: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	Add cowboy hats and boots (#24299)	2024-01-28 14:23:16 +11:00
generator.yml	Portable Generator Rework (#19302)	2023-08-25 11:40:42 -07:00
generic_hit.yml
gib.yml
gun_impacts.yml	Destruction & impact sound rework pass 1 (#24282)	2024-01-19 10:33:07 -05:00
gun_sounds.yml
hit_impacts.yml	Destruction & impact sound rework pass 1 (#24282)	2024-01-19 10:33:07 -05:00
ian_bark.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	2024-01-26 14:17:51 +03:00
NukeMusic.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-03-11 08:37:54 +03:00
punching.yml
radiation.yml
sadtrombone.yml
screams.yml
shuttle.yml
skub.yml
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	Destruction & impact sound rework pass 1 (#24282)	2024-01-19 10:33:07 -05:00
tray.yml
troll.yml	Remove among us noise from game (#16589)	2023-05-18 23:44:23 -06:00
whistle.yml	Syndicate Decoy Bundle + Snap Pops (#25333)	2024-02-28 16:53:46 -05:00