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
..
IPIntel	Fix IPIntel causing frequent errors with the cleanup job. (#34428)	2025-01-14 21:38:26 +01:00
Whitelist	Automated whitelists (#23985)	2024-08-27 18:01:17 +02:00
ConnectionManager.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-16 20:00:41 +03:00
ConnectionManager.Whitelist.cs	Add IPIntel API support. (#33339)	2025-01-12 20:41:26 +01:00
GrantConnectBypassCommand.cs	Use moderator perms for grant_connect_bypass (#29406)	2024-06-24 23:56:29 +02:00
UserDataExt.cs	Integrate Modern HWID into content	2024-11-12 01:51:54 +01:00