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 |
||
|---|---|---|
| .. | ||
| 20200929113117_Init.cs | ||
| 20200929113117_Init.Designer.cs | ||
| 20201006223000_SelectedCharacterSlotFk.cs | ||
| 20201028210620_Admins.cs | ||
| 20201028210620_Admins.Designer.cs | ||
| 20201109092921_ExtraIndices.cs | ||
| 20201109092921_ExtraIndices.Designer.cs | ||
| 20201203093409_ClothingAndPronouns.cs | ||
| 20201203093409_ClothingAndPronouns.Designer.cs | ||
| 20210103151756_BackpackPreference.cs | ||
| 20210103151756_BackpackPreference.Designer.cs | ||
| 20210211211033_AdminOOCColor.cs | ||
| 20210211211033_AdminOOCColor.Designer.cs | ||
| 20210321230012_HWID.cs | ||
| 20210321230012_HWID.Designer.cs | ||
| 20210915093340_UniqueHighPriorityJob.cs | ||
| 20210915093340_UniqueHighPriorityJob.Designer.cs | ||
| 20211120202701_AdminLogs.cs | ||
| 20211120202701_AdminLogs.Designer.cs | ||
| 20211121123543_AdminLogsImpact.cs | ||
| 20211121123543_AdminLogsImpact.Designer.cs | ||
| 20220103235647_whitelist.cs | ||
| 20220103235647_whitelist.Designer.cs | ||
| 20220108185749_add-species.cs | ||
| 20220108185749_add-species.Designer.cs | ||
| 20220127170845_UnifyMore.cs | ||
| 20220127170845_UnifyMore.Designer.cs | ||
| 20220129005644_ServerBanHit.cs | ||
| 20220129005644_ServerBanHit.Designer.cs | ||
| 20220214061058_RoleBans.cs | ||
| 20220214061058_RoleBans.Designer.cs | ||
| 20220308222742_Cleanup.cs | ||
| 20220308222742_Cleanup.Designer.cs | ||
| 20220310173734_SpeciesMarkings.cs | ||
| 20220310173734_SpeciesMarkings.Designer.cs | ||
| 20220313151800_ServerNameFts.cs | ||
| 20220313151800_ServerNameFts.Designer.cs | ||
| 20220324144654_AdminNotes.cs | ||
| 20220324144654_AdminNotes.Designer.cs | ||
| 20220325170225_PlayerReadRules.cs | ||
| 20220325170225_PlayerReadRules.Designer.cs | ||
| 20220326104916_UploadedResourcesLog.cs | ||
| 20220326104916_UploadedResourcesLog.Designer.cs | ||
| 20220503222955_FixIndices.cs | ||
| 20220503222955_FixIndices.Designer.cs | ||
| 20220505084828_MarkingsJsonb.cs | ||
| 20220505084828_MarkingsJsonb.Designer.cs | ||
| 20220509060724_FlavorText.cs | ||
| 20220509060724_FlavorText.Designer.cs | ||
| 20220724000132_PlayTime.cs | ||
| 20220724000132_PlayTime.Designer.cs | ||
| 20220816163319_Traits.cs | ||
| 20220816163319_Traits.Designer.cs | ||
| 20221214230019_TTSVoice.cs | ||
| 20221214230019_TTSVoice.Designer.cs | ||
| 20230319110655_ProfileTraitIndexUnique.cs | ||
| 20230319110655_ProfileTraitIndexUnique.Designer.cs | ||
| 20230319112124_ServerBanExemption.cs | ||
| 20230319112124_ServerBanExemption.Designer.cs | ||
| 20230402214647_BanAutoDelete.cs | ||
| 20230402214647_BanAutoDelete.Designer.cs | ||
| 20230503001749_AdminNotesImprovement.cs | ||
| 20230503001749_AdminNotesImprovement.Designer.cs | ||
| 20230725193102_AdminNotesImprovementsForeignKeys.cs | ||
| 20230725193102_AdminNotesImprovementsForeignKeys.Designer.cs | ||
| 20230727190902_AdminLogCompoundKey.cs | ||
| 20230727190902_AdminLogCompoundKey.Designer.cs | ||
| 20231021071411_RoundStartDate.cs | ||
| 20231021071411_RoundStartDate.Designer.cs | ||
| 20231024041204_DropAdminLogEntity.cs | ||
| 20231024041204_DropAdminLogEntity.Designer.cs | ||
| 20231126234054_ConnectionLogServer.cs | ||
| 20231126234054_ConnectionLogServer.Designer.cs | ||
| 20231226154937_AdminLogPk.cs | ||
| 20231226154937_AdminLogPk.Designer.cs | ||
| 20240201091301_SpawnPriorityPreference.cs | ||
| 20240201091301_SpawnPriorityPreference.Designer.cs | ||
| 20240301130641_ClothingRemoval.cs | ||
| 20240301130641_ClothingRemoval.Designer.cs | ||
| 20240318022005_AdminMessageDismiss.cs | ||
| 20240318022005_AdminMessageDismiss.Designer.cs | ||
| 20240403072242_Loadouts.cs | ||
| 20240403072242_Loadouts.Designer.cs | ||
| 20240409013837_FixRoundStartDateNullability.cs | ||
| 20240409013837_FixRoundStartDateNullability.Designer.cs | ||
| PostgresServerDbContextModelSnapshot.cs | ||