space-station-14

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

Files

Morbo 82a466f4ff Merge remote-tracking branch 'upstream/master' into upstream-sync

# Conflicts:
#	Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
#	Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Resources/Audio/Announcements/license.txt
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json

2023-03-07 18:54:29 +03:00

Migrations

Merge remote-tracking branch 'upstream/master' into upstream-sync

2023-02-25 07:37:50 +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

Update project files for configuration changes. (#14281 )