Morb0 f22b645ff6 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Maps/bagel.yml # Resources/Prototypes/Maps/box.yml # Resources/Prototypes/Maps/core.yml # Resources/Prototypes/Maps/europa.yml # Resources/Prototypes/Maps/fland.yml # Resources/Prototypes/Maps/marathon.yml # Resources/Prototypes/Maps/meta.yml # Resources/Prototypes/Maps/omega.yml # Resources/Prototypes/Maps/packed.yml # Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml		2023-12-12 11:00:46 +03:00
..
Pools	Kettle -> Gemini: RnD and Atmos revamp (#21866)	2023-12-01 13:17:08 -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	Remove senior roles (#22303)	2023-12-12 13:37:05 +11:00
bagel.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-12 11:00:46 +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-12 11:00:46 +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-12 11:00:46 +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-12 11:00:46 +03:00
meta.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-12 11:00:46 +03:00
omega.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-12 11:00:46 +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
saltern.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-12 11:00:46 +03:00
salvage.yml	Security Chunk Salvage (#21403)	2023-11-03 14:06:19 -06:00