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
..
GitHub.txt	Update Credits (#22906)	2023-12-23 20:21:46 -05:00
OriginalRemake.txt	Update credits	2020-06-26 03:46:28 +02:00
Patrons.yml	Update Patrons.yml (#21979)	2023-11-29 01:18:27 -08:00
SpaceStation13.txt	Update credits	2020-06-26 03:46:28 +02:00
SpecialThanks.txt	Credits	2020-06-14 15:15:15 +02:00
TTS.txt	TTS (Text-To-Speech) (#618)	2023-01-10 18:01:20 -08:00