mirror of
https://github.com/space-syndicate/space-station-14.git
synced 2026-10-11 03:11:14 +03:00
# 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 |
||
|---|---|---|
| .. | ||
| PlayerRecord.cs | ||
| ServerBanDef.cs | ||
| ServerBanNote.cs | ||
| ServerDbBase.cs | ||
| ServerDbEntryManager.cs | ||
| ServerDbManager.cs | ||
| ServerDbPostgres.cs | ||
| ServerDbSqlite.cs | ||
| ServerRoleBanDef.cs | ||
| ServerRoleBanNote.cs | ||
| ServerRoleUnbanDef.cs | ||
| ServerUnbanDef.cs | ||
| UserDbDataManager.cs | ||