Vigers Ray 1b61551b4d Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Server/GameTicking/GameTicker.StatusShell.cs # Content.Server/Implants/SubdermalImplantSystem.cs # Content.Server/Silicons/Borgs/BorgSystem.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Locale/en-US/_strings/advertisements/vending/smite.ftl # Resources/Maps/_Sunrise/Shuttles/wrecklaimer.yml # Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml # Resources/Prototypes/Entities/Stations/base.yml # Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml		2025-01-16 20:00:41 +03:00
..
AdminbusTab	Admin UI localization (#29340)	2024-06-22 23:05:33 +10:00
AdminTab	Revert "Proton (#420)"	2024-10-02 09:05:30 +03:00
AtmosTab	Admin UI localization (#29340)	2024-06-22 23:05:33 +10:00
ObjectsTab	add confirmation to the delete button in objects tab (#30946)	2024-08-17 12:05:17 -04:00
PanicBunkerTab	Panic Bunker uses minutes not hours (#28805)	2024-06-09 22:45:47 +02:00
PlayerTab	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-14 18:46:45 +03:00
RoundTab.xaml	Admin UI localization (#29340)	2024-06-22 23:05:33 +10: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