Vigers Ray 0c1e15e516 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Info/LinkBanner.cs # Resources/Locale/en-US/_strings/atmos/gas-pipe-sensor.ftl # Resources/Locale/en-US/_strings/station-events/events/greytide-virus.ftl # Resources/Prototypes/Datasets/Names/diona.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml		2024-11-26 17:50:59 +03:00
..
Whitelist	Automated whitelists (#23985)	2024-08-27 18:01:17 +02:00
ConnectionManager.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-26 17:50:59 +03:00
ConnectionManager.Whitelist.cs	Fix whitelist (#31563)	2024-08-28 17:11:25 +10: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