Morb0 55a91108c1 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Chat/Managers/ChatManager.cs # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json		2023-10-15 17:52:02 +03:00
..
AdminbusTab	Fix misc commands (#20004)	2023-09-11 15:21:52 +10:00
AdminTab	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-02 02:18:19 +03:00
AtmosTab	Fix misc commands (#20004)	2023-09-11 15:21:52 +10:00
ObjectsTab	Fix warnings and code cleanup/fixes (#13570)	2023-01-19 13:56:45 +11:00
PanicBunkerTab	Make the panic bunker UI send cvar updates on focus exit, add erase verb tooltip message (#20987)	2023-10-14 02:28:08 -07:00
PlayerTab	Fix not being able to sort by playtime in the F7 players tab (#21004)	2023-10-14 14:56:06 -07:00
RoundTab.xaml	Ghost roles create new minds, better tracking of roles at round end screen (#5175)	2021-11-15 11:14:34 -07:00
RoundTab.xaml.cs	Seal/abstract/virtual everything (#6739)	2022-02-16 18:23:23 +11:00
ServerTab.xaml	Add panic bunker UI and automatic panic bunker (#20954)	2023-10-13 11:56:12 -07:00
ServerTab.xaml.cs	Add panic bunker UI and automatic panic bunker (#20954)	2023-10-13 11:56:12 -07:00