Morb0 c333fc2b20 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Power/PowerMonitoringWindow.xaml.cs # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Entities/Mobs/NPCs/pets.yml # Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml # Resources/Prototypes/Maps/omega.yml # Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-right.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json		2023-12-24 20:02:16 +03:00
..
Ambience	Sound Effect For Emagged Borgs (#21451)	2023-11-20 10:36:25 -05:00
Animals	Bread dog (#22548)	2023-12-16 01:30:20 -07:00
Announcements	Fix yml source	2023-11-14 19:29:26 +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-12-24 20:02:16 +03:00
Items	It's time to build a barbershop! (#22565)	2023-12-22 02:54:00 -07:00
Lobby	Add missing song names (#18432)	2023-08-02 19:36:59 +10:00
Machines	Electrolysis and Centrifuge (#22517)	2023-12-15 02:52:46 -07:00
Magic	Convert other attributions in Resources/Audio (#21609)	2023-11-12 16:14:26 -07: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	New Thief minor antagonist (#21520)	2023-12-24 02:58:28 -07:00
StationEvents	Use new sound collection for nuke music	2023-04-29 15:02:06 +03:00
Voice	Update lizard vocalizations (#21750)	2023-11-19 14:51:56 -08:00
Weapons	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-24 20:02:16 +03:00