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
..
Pools	Reach (#22519)	2023-12-14 22:38:05 -07:00
arenas.yml	1v1 me first to 31 no powerups [Deathmatch Gamemode] (#19467)	2023-08-30 18:06:15 -07:00
aspid.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-12 11:00:46 +03:00
atlas.yml	atlas update (#22646)	2023-12-17 02:52:09 -07:00
bagel.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-18 01:51:30 +03:00
barratry.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-12 11:00:46 +03:00
box.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-12 11:00:46 +03:00
centcomm.yml	Refactor stations to properly use entity prototypes. (stationsv3) (#16570)	2023-05-19 15:45:09 -05:00
cluster.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-12 11:00:46 +03:00
core.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-16 03:05:40 +03:00
debug.yml	Adds the thermo-electric generator (#18840)	2023-08-12 15:41:55 -05:00
europa.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-12 11:00:46 +03:00
fland.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-21 03:03:30 +03:00
gemini.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-12 11:00:46 +03:00
marathon.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-18 01:51:30 +03:00
meta.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-16 03:05:40 +03:00
omega.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-24 20:02:16 +03:00
origin.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-12 11:00:46 +03:00
packed.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-12 11:00:46 +03:00
reach.yml	Reach (#22519)	2023-12-14 22:38:05 -07:00
saltern.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-12 11:00:46 +03:00
salvage.yml	Engineering Chunk Salvage (#22529)	2023-12-17 02:57:44 -07:00