space-station-14

mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-02-15 04:50:55 +01:00

Files

Morb0 721f7bfecf Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync

# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/Prototypes/Datasets/Names/ai.yml
#	Resources/Prototypes/Datasets/adjectives.yml
#	Resources/Prototypes/Datasets/verbs.yml
#	Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
#	Resources/Prototypes/Entities/Mobs/base.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
#	SpaceStation14.sln

2024-08-28 16:40:36 +03:00

Migrations

Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync

2024-08-28 16:40:36 +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 )