VigersRay 73c323bd9a Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Lobby/UI/LobbyGui.xaml # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json # Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png		2024-09-21 06:29:09 +03:00
..
Pools	derotate train while i work on it (#31121)	2024-08-17 01:01:33 -06:00
arenas.yml	Add Job preference tests (#28625)	2024-06-06 00:19:24 +10:00
bagel.yml	Bagel (#31806)	2024-09-03 14:06:18 -06:00
box.yml	boxstation AI update (#31771)	2024-09-03 00:29:26 -06:00
centcomm.yml	Тразитный хаб и играбельное ЦК (#51)	2024-06-09 16:39:56 +03:00
cog.yml	Updated cog (Maints edition) (#31935)	2024-09-07 13:58:16 -06:00
core.yml	Update Core (#31774)	2024-09-03 00:46:47 -06:00
debug.yml	Add Job preference tests (#28625)	2024-06-06 00:19:24 +10:00
fland.yml	fland update (#31803)	2024-09-03 14:05:52 -06:00
marathon.yml	marathon update (#31804)	2024-09-03 14:06:00 -06:00
meta.yml	Meta (#31785)	2024-09-03 04:05:44 -06:00
oasis.yml	upstream	2024-09-16 12:40:23 +03:00
omega.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-09-21 06:29:09 +03:00
packed.yml	packed update (#31807)	2024-09-03 14:08:27 -06:00
reach.yml	Adds a salvage jobspawn to reach (#31712)	2024-09-01 22:37:02 -06:00
saltern.yml	Fixing Botanist role numbers in various stations - V2 (#29581)	2024-07-21 01:23:27 -06:00
salvage.yml	anonymize salvage wrecks (#31087)	2024-08-17 15:09:21 +10:00
train.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-08-17 17:27:37 +03:00