Morb0 e21ee44f9e Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs # Content.Server/VoiceMask/VoiceMaskSystem.cs # Resources/Prototypes/Datasets/verbs.yml # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml # Resources/Prototypes/Maps/aspid.yml # Resources/Prototypes/Maps/barratry.yml # Resources/Prototypes/Maps/cluster.yml # Resources/Prototypes/Maps/kettle.yml # Resources/Prototypes/Maps/origin.yml # Resources/ServerInfo/Guidebook/Cargo/Salvage.xml # Resources/Textures/Structures/Furniture/chairs.rsi/meta.json		2023-09-13 16:51:52 +03:00
..
Ambience	All license.txt files in Audio/Ambience removed (#18572)	2023-08-02 10:10:03 -05:00
Animals	[entities] Kangaroos, boxer improvements, boxing bell and hamlet updates. (#15546)	2023-04-23 20:31:07 -06:00
Announcements	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-21 09:44:38 +03:00
Corvax	Title2 lobby music (#1160)	2023-07-19 13:47:04 +03:00
Effects	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-21 09:44:38 +03:00
Items	Add fultons (#18958)	2023-08-29 16:34:05 +10:00
Lobby	Add missing song names (#18432)	2023-08-02 19:36:59 +10:00
Machines	Portable Generator Rework (#19302)	2023-08-25 11:40:42 -07:00
Magic	Ratvarian Language and CogChamp (#15639)	2023-04-29 18:34:19 +10:00
Mecha	Exosuit: Ripley (#12668)	2022-12-10 11:05:39 -06:00
MidiCustom	Cleanup pAI synth instrument in soundfont (#10836)	2022-08-25 20:16:01 -07:00
Misc	ninja 2 electric boogaloo (#15534)	2023-09-10 16:20:27 +10:00
StationEvents	Use new sound collection for nuke music	2023-04-29 15:02:06 +03:00
Voice	small moth changes (#18810)	2023-08-08 22:05:05 -06:00
Weapons	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-14 03:22:26 +03:00