ss14-wl

mirror of https://github.com/corvax-team/ss14-wl.git synced 2026-02-15 03:31:38 +01:00

Files

Morb0 32a8d1a21e Merge remote-tracking branch 'upstream/master' into upstream-sync

# Conflicts:
#	Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
#	Content.Server/Power/Generator/GeneratorSystem.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Objects/Misc/paper.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Textures/Effects/speech.rsi/meta.json
#	Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png

2024-02-03 03:38:29 +03:00

Migrations

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

2024-02-03 03:38:29 +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

Dependency update / fixes / skrungle bungle (#23745 )