Vigers Ray a7131170fa Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs # Content.Server/IoC/ServerContentIoC.cs # Content.Shared.Database/LogType.cs # Resources/Prototypes/Body/Organs/Animal/animal.yml # Resources/Prototypes/Body/Organs/arachnid.yml # Resources/Prototypes/GameRules/events.yml # Resources/Prototypes/GameRules/roundstart.yml		2025-08-16 00:12:59 +03:00
..
Content.Shared.Database.csproj	Update project files for configuration changes. (#14281)	2023-03-06 11:38:07 -08:00
LogImpact.cs	"New player" admin logging improvements (#35961)	2025-03-20 20:56:51 +01:00
LogType.cs	Merge remote-tracking branch 'space-wizards/master'	2025-08-16 00:12:59 +03:00
NoteSeverity.cs	Better notes and bans (#14228)	2023-07-21 13:38:52 +02:00
NoteType.cs	Better notes and bans (#14228)	2023-07-21 13:38:52 +02:00
TypedHwid.cs	Fix sandbox error with new HWID code. (#33461)	2024-11-22 18:14:46 +01:00