Morb0 92bd0148fe Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Administration/Systems/AdminSystem.cs # Resources/Locale/en-US/chat/sanitizer-replacements.ftl # Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml # Resources/Prototypes/StatusIcon/antag.yml # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png # Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png # Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png		2024-02-17 12:43:04 +03:00
..
AdminbusTab	Random spontaneous cleanup PR (#25131)	2024-02-13 16:48:39 -05:00
AdminTab	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-28 14:14:36 +03:00
AtmosTab	Random spontaneous cleanup PR (#25131)	2024-02-13 16:48:39 -05:00
ObjectsTab	Fix objects tab not showing nents (#23837)	2024-01-10 01:30:20 -07:00
PanicBunkerTab	[Secrets] VPN guard (#1594)	2023-11-28 18:52:28 +03:00
PlayerTab	Fix right click not showing the context menu in AHelps, players tab and objects tab (#22798)	2023-12-20 23:32:52 -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