Morb0 33942c412a Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/deny-unshaded.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-0.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-1.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-2.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-3.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/on.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/panel.png		2023-12-14 00:57:14 +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-28 14:14:36 +03:00
AtmosTab	Remove 700 usages of Component.Owner (#21100)	2023-10-19 12:34:31 -07:00
ObjectsTab	More UI fixes (#22431)	2023-12-12 19:02:19 -07:00
PanicBunkerTab	[Secrets] VPN guard (#1594)	2023-11-28 18:52:28 +03:00
PlayerTab	More UI fixes (#22431)	2023-12-12 19:02:19 -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