VigersRay 5f10d21fa6 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Server/Administration/Commands/PlayTimeCommands.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Content.Server/Station/Systems/StationSpawningSystem.cs # Content.Server/StationEvents/Events/BreakerFlipRule.cs # Content.Shared/Roles/JobPrototype.cs # Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml # Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml # Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml # Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml # Resources/Prototypes/Entities/Mobs/base.yml # Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml # Resources/Prototypes/GameRules/events.yml # Resources/Prototypes/Roles/Antags/traitor.yml # Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml # Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml # Resources/Prototypes/Roles/Jobs/Civilian/clown.yml # Resources/Prototypes/Roles/Jobs/Civilian/musician.yml # Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml # Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml # Resources/Prototypes/Roles/Jobs/Medical/chemist.yml # Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml # Resources/Prototypes/Roles/Jobs/Science/research_director.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml		2024-06-04 09:41:27 +03:00
..
Migrations	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-04 09:41:27 +03:00
add-migration.ps1	Holy crap auth works (#2099)	2020-09-29 14:26:00 +02:00
add-migration.sh	DB QOL stuff, but not breaking the migrations now (#5086)	2021-10-31 15:18:01 +01:00
Content.Server.Database.csproj	Switch project files to C# 12. (#25487)	2024-02-23 15:02:59 +11:00
DesignTimeContextFactories.cs	Server ban exemption system (#15076)	2023-04-03 10:24:55 +10:00
Model.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-04 09:41:27 +03:00
ModelPostgres.cs	Fix admin notes and database time nonsense. (#25280)	2024-02-20 10:13:31 +01:00
ModelSqlite.cs	Dependency update / fixes / skrungle bungle (#23745)	2024-01-12 23:22:01 +01:00
SnakeCaseNaming.cs	Fix EFCore obsoletion warnings in Content.Server.Database (#26285)	2024-03-20 15:47:36 +01:00