Morb0 a5980baa7d Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml # Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml # Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json # Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png # Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png # Resources/Textures/Structures/Wallmounts/signs.rsi/court.png # Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png # Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png # Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png # Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png # Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png # Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png # Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png # Resources/Textures/Structures/Wallmounts/signs.rsi/law.png # Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json # Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png # Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png # Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png # Resources/Textures/Structures/Wallmounts/signs.rsi/security.png # Resources/Textures/Structures/Wallmounts/signs.rsi/space.png # Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png # Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png # Resources/migration.yml		2024-07-21 07:20:43 +03:00
..
Migrations	Merge remote-tracking branch 'refs/remotes/upstream/master' into master-syndie	2024-06-27 13:40:52 +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/upstream/master' into upstream-sync	2024-07-21 07:20:43 +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