mirror of
https://github.com/space-syndicate/space-station-14.git
synced 2026-10-10 10:51:14 +03:00
# Conflicts: # Content.Client/Preferences/ClientPreferencesManager.cs # Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Content.Server/Station/Systems/StationSpawningSystem.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Content.Shared/Preferences/ICharacterProfile.cs # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Prototypes/Roles/Jobs/Security/security_officer.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml # Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/icon.png # Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/icon.png # Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/equipped-HAND.png # Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/icon.png # Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/icon.png # Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/equipped-HAND.png # Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/icon.png # Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/equipped-HAND.png # Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/icon.png # Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/equipped-HAND.png # Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/icon.png # Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/icon.png # Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/meta.json # Resources/Textures/Clothing/Shoes/Color/black.rsi/meta.json # Resources/Textures/Clothing/Shoes/Color/blue.rsi/meta.json # Resources/Textures/Clothing/Shoes/Color/brown.rsi/meta.json # Resources/Textures/Clothing/Shoes/Color/green.rsi/meta.json # Resources/Textures/Clothing/Shoes/Color/orange.rsi/meta.json # Resources/Textures/Clothing/Shoes/Color/purple.rsi/meta.json # Resources/Textures/Clothing/Shoes/Color/red.rsi/meta.json # Resources/Textures/Clothing/Shoes/Color/white.rsi/meta.json # Resources/Textures/Clothing/Shoes/Color/yellow.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING-reptilian.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/meta.json |
||
|---|---|---|
| .. | ||
| 20200929113112_Init.cs | ||
| 20200929113112_Init.Designer.cs | ||
| 20201028210616_Admins.cs | ||
| 20201028210616_Admins.Designer.cs | ||
| 20201109092917_ExtraIndices.cs | ||
| 20201109092917_ExtraIndices.Designer.cs | ||
| 20201203093351_ClothingAndPronouns.cs | ||
| 20201203093351_ClothingAndPronouns.Designer.cs | ||
| 20210103151752_BackpackPreference.cs | ||
| 20210103151752_BackpackPreference.Designer.cs | ||
| 20210211211028_AdminOOCColor.cs | ||
| 20210211211028_AdminOOCColor.Designer.cs | ||
| 20210321225959_HWID.cs | ||
| 20210321225959_HWID.Designer.cs | ||
| 20210915093336_UniqueHighPriorityJob.cs | ||
| 20210915093336_UniqueHighPriorityJob.Designer.cs | ||
| 20211120202654_AdminLogs.cs | ||
| 20211120202654_AdminLogs.Designer.cs | ||
| 20211121123536_AdminLogsImpact.cs | ||
| 20211121123536_AdminLogsImpact.Designer.cs | ||
| 20220103235637_whitelist.cs | ||
| 20220103235637_whitelist.Designer.cs | ||
| 20220108185734_add-species.cs | ||
| 20220108185734_add-species.Designer.cs | ||
| 20220127165122_UnifyMore.cs | ||
| 20220127165122_UnifyMore.Designer.cs | ||
| 20220129005638_ServerBanHit.cs | ||
| 20220129005638_ServerBanHit.Designer.cs | ||
| 20220214060745_RoleBans.cs | ||
| 20220214060745_RoleBans.Designer.cs | ||
| 20220308222736_Cleanup.cs | ||
| 20220308222736_Cleanup.Designer.cs | ||
| 20220310173728_SpeciesMarkings.cs | ||
| 20220310173728_SpeciesMarkings.Designer.cs | ||
| 20220313151753_ServerNameFts.cs | ||
| 20220313151753_ServerNameFts.Designer.cs | ||
| 20220324144649_AdminNotes.cs | ||
| 20220324144649_AdminNotes.Designer.cs | ||
| 20220325170220_PlayerReadRules.cs | ||
| 20220325170220_PlayerReadRules.Designer.cs | ||
| 20220326104908_UploadedResourcesLog.cs | ||
| 20220326104908_UploadedResourcesLog.Designer.cs | ||
| 20220503222949_FixIndices.cs | ||
| 20220503222949_FixIndices.Designer.cs | ||
| 20220505084819_MarkingsJsonb.cs | ||
| 20220505084819_MarkingsJsonb.Designer.cs | ||
| 20220509060717_FlavorText.cs | ||
| 20220509060717_FlavorText.Designer.cs | ||
| 20220724000127_PlayTime.cs | ||
| 20220724000127_PlayTime.Designer.cs | ||
| 20220816163313_Traits.cs | ||
| 20220816163313_Traits.Designer.cs | ||
| 20221214230014_TTSVoice.cs | ||
| 20221214230014_TTSVoice.Designer.cs | ||
| 20230319110651_ProfileTraitIndexUnique.cs | ||
| 20230319110651_ProfileTraitIndexUnique.Designer.cs | ||
| 20230319112120_ServerBanExemption.cs | ||
| 20230319112120_ServerBanExemption.Designer.cs | ||
| 20230402214642_BanAutoDelete.cs | ||
| 20230402214642_BanAutoDelete.Designer.cs | ||
| 20230503001739_AdminNotesImprovement.cs | ||
| 20230503001739_AdminNotesImprovement.Designer.cs | ||
| 20230725193058_AdminNotesImprovementsForeignKeys.cs | ||
| 20230725193058_AdminNotesImprovementsForeignKeys.Designer.cs | ||
| 20230727190858_AdminLogCompoundKey.cs | ||
| 20230727190858_AdminLogCompoundKey.Designer.cs | ||
| 20231021071407_RoundStartDate.cs | ||
| 20231021071407_RoundStartDate.Designer.cs | ||
| 20231024041159_DropAdminLogEntity.cs | ||
| 20231024041159_DropAdminLogEntity.Designer.cs | ||
| 20231126234049_ConnectionLogServer.cs | ||
| 20231126234049_ConnectionLogServer.Designer.cs | ||
| 20231226154929_AdminLogPk.cs | ||
| 20231226154929_AdminLogPk.Designer.cs | ||
| 20240201091254_SpawnPriorityPreference.cs | ||
| 20240201091254_SpawnPriorityPreference.Designer.cs | ||
| 20240301130602_ClothingRemoval.cs | ||
| 20240301130602_ClothingRemoval.Designer.cs | ||
| 20240318021959_AdminMessageDismiss.cs | ||
| 20240318021959_AdminMessageDismiss.Designer.cs | ||
| 20240403072258_Loadouts.cs | ||
| 20240403072258_Loadouts.Designer.cs | ||
| 20240409013832_FixRoundStartDateNullability.cs | ||
| 20240409013832_FixRoundStartDateNullability.Designer.cs | ||
| 20240409014937_FixRoundStartDateNullability2.cs | ||
| 20240409014937_FixRoundStartDateNullability2.Designer.cs | ||
| SqliteServerDbContextModelSnapshot.cs | ||