Morb0 9888f8fa57 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs # Content.Client/Lobby/LobbyUIController.cs # Content.Server/Administration/Systems/AdminSystem.cs # Content.Server/Connection/ConnectionManager.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Content.Shared/Administration/Events/PanicBunkerChangedEvent.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Accents/word_replacements.yml # Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml # Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml # Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml # Resources/Prototypes/Entities/Mobs/base.yml # Resources/Prototypes/Roles/Antags/nukeops.yml # Resources/Prototypes/Roles/Antags/revolutionary.yml # Resources/Prototypes/Roles/Antags/traitor.yml # Resources/Prototypes/Roles/Antags/zombie.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml # Resources/ServerInfo/Guidebook/Cargo/Cargo.xml # Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml # Resources/ServerInfo/Guidebook/Cargo/Salvage.xml # Resources/ServerInfo/Guidebook/Controls/Controls.xml # Resources/ServerInfo/Guidebook/Controls/Radio.xml # Resources/ServerInfo/Guidebook/Engineering/Engineering.xml # Resources/ServerInfo/Guidebook/Engineering/Fires.xml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/ServerInfo/Guidebook/Jobs.xml # Resources/ServerInfo/Guidebook/Medical/Chemist.xml # Resources/ServerInfo/Guidebook/Medical/Medical.xml # Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml # Resources/ServerInfo/Guidebook/Science/Science.xml # Resources/ServerInfo/Guidebook/Security/Security.xml # Resources/ServerInfo/Guidebook/Service/Bartender.xml # Resources/ServerInfo/Guidebook/Service/Chef.xml # Resources/ServerInfo/Guidebook/SpaceStation14.xml # Resources/ServerInfo/Guidebook/Survival.xml # Resources/Textures/Objects/Storage/boxes.rsi/meta.json		2024-06-14 19:48:52 +03:00
..
20200929113112_Init.cs	Holy crap auth works (#2099)	2020-09-29 14:26:00 +02:00
20200929113112_Init.Designer.cs	Holy crap auth works (#2099)	2020-09-29 14:26:00 +02:00
20201028210616_Admins.cs	ConGroups are gone. Long live admin flags in content.	2020-10-30 16:06:48 +01:00
20201028210616_Admins.Designer.cs	ConGroups are gone. Long live admin flags in content.	2020-10-30 16:06:48 +01:00
20201109092917_ExtraIndices.cs	Permissions panel.	2020-11-10 16:50:28 +01:00
20201109092917_ExtraIndices.Designer.cs	Permissions panel.	2020-11-10 16:50:28 +01:00
20201203093351_ClothingAndPronouns.cs	Clothing and pronoun fields (#2689)	2020-12-24 14:42:40 +01:00
20201203093351_ClothingAndPronouns.Designer.cs	Clothing and pronoun fields (#2689)	2020-12-24 14:42:40 +01:00
20210103151752_BackpackPreference.cs	Backpack preferences. (#2864)	2021-01-03 16:22:14 +01:00
20210103151752_BackpackPreference.Designer.cs	Backpack preferences. (#2864)	2021-01-03 16:22:14 +01:00
20210211211028_AdminOOCColor.cs	OOC sent by an admin will have a different color (#3117)	2021-02-14 15:59:56 +01:00
20210211211028_AdminOOCColor.Designer.cs	OOC sent by an admin will have a different color (#3117)	2021-02-14 15:59:56 +01:00
20210321225959_HWID.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00
20210321225959_HWID.Designer.cs	Use HWIDs for bans.	2021-03-22 01:32:09 +01:00
20210915093336_UniqueHighPriorityJob.cs	Add extra unique constraints to DB jobs.	2021-09-15 11:37:05 +02:00
20210915093336_UniqueHighPriorityJob.Designer.cs	Add extra unique constraints to DB jobs.	2021-09-15 11:37:05 +02:00
20211120202654_AdminLogs.cs	THE RETURN OF THE KING	2021-11-22 19:08:27 +01:00
20211120202654_AdminLogs.Designer.cs	THE RETURN OF THE KING	2021-11-22 19:08:27 +01:00
20211121123536_AdminLogsImpact.cs	THE RETURN OF THE KING	2021-11-22 19:08:27 +01:00
20211121123536_AdminLogsImpact.Designer.cs	THE RETURN OF THE KING	2021-11-22 19:08:27 +01:00
20220103235637_whitelist.cs	Rename migrations to fix CS8981 warnings. (#14160)	2023-02-19 10:59:52 +11:00
20220103235637_whitelist.Designer.cs	Rename migrations to fix CS8981 warnings. (#14160)	2023-02-19 10:59:52 +11:00
20220108185734_add-species.cs	Rename migrations to fix CS8981 warnings. (#14160)	2023-02-19 10:59:52 +11:00
20220108185734_add-species.Designer.cs	Rename migrations to fix CS8981 warnings. (#14160)	2023-02-19 10:59:52 +11:00
20220127165122_UnifyMore.cs	Unify remaining DB model classes between SQLite and Postgres.	2022-01-27 18:12:09 +01:00
20220127165122_UnifyMore.Designer.cs	Unify remaining DB model classes between SQLite and Postgres.	2022-01-27 18:12:09 +01:00
20220129005638_ServerBanHit.cs	Revert "Revert "Log ban hits in DB. ( (#6361)	2022-02-02 22:57:11 +01:00
20220129005638_ServerBanHit.Designer.cs	Revert "Revert "Log ban hits in DB. ( (#6361)	2022-02-02 22:57:11 +01:00
20220214060745_RoleBans.cs	Role bans (#6703)	2022-02-21 23:11:39 +01:00
20220214060745_RoleBans.Designer.cs	Role bans (#6703)	2022-02-21 23:11:39 +01:00
20220308222736_Cleanup.cs	Fix database model migrations after role bans.	2022-03-08 23:36:02 +01:00
20220308222736_Cleanup.Designer.cs	Fix database model migrations after role bans.	2022-03-08 23:36:02 +01:00
20220310173728_SpeciesMarkings.cs	Markings (#7072)	2022-05-05 10:07:42 +02:00
20220310173728_SpeciesMarkings.Designer.cs	Markings (#7072)	2022-05-05 10:07:42 +02:00
20220313151753_ServerNameFts.cs	Server names and admin log full-text search (#6327)	2022-03-13 18:36:48 +01:00
20220313151753_ServerNameFts.Designer.cs	Server names and admin log full-text search (#6327)	2022-03-13 18:36:48 +01:00
20220324144649_AdminNotes.cs	Admin notes (#7259)	2022-04-16 20:57:50 +02:00
20220324144649_AdminNotes.Designer.cs	Admin notes (#7259)	2022-04-16 20:57:50 +02:00
20220325170220_PlayerReadRules.cs	Track rule reading in database, don't show popup locally (#7278)	2022-03-26 20:16:57 +01:00
20220325170220_PlayerReadRules.Designer.cs	Track rule reading in database, don't show popup locally (#7278)	2022-03-26 20:16:57 +01:00
20220326104908_UploadedResourcesLog.cs	Adds Network Resource Uploading for admins. (#6904)	2022-03-26 12:46:37 +01:00
20220326104908_UploadedResourcesLog.Designer.cs	Adds Network Resource Uploading for admins. (#6904)	2022-03-26 12:46:37 +01:00
20220503222949_FixIndices.cs	Fix admin log indices. (#7920)	2022-05-04 16:18:55 +02:00
20220503222949_FixIndices.Designer.cs	Fix admin log indices. (#7920)	2022-05-04 16:18:55 +02:00
20220505084819_MarkingsJsonb.cs	Make Profile.Markings db column jsonb (#7947)	2022-05-05 11:23:48 +02:00
20220505084819_MarkingsJsonb.Designer.cs	Make Profile.Markings db column jsonb (#7947)	2022-05-05 11:23:48 +02:00
20220509060717_FlavorText.cs	Flavor text (#8070)	2022-05-13 15:58:45 -07:00
20220509060717_FlavorText.Designer.cs	Flavor text (#8070)	2022-05-13 15:58:45 -07:00
20220724000127_PlayTime.cs	Play time tracking: Job timers 3: more titles: when the (#9978)	2022-08-07 16:00:42 +10:00
20220724000127_PlayTime.Designer.cs	Play time tracking: Job timers 3: more titles: when the (#9978)	2022-08-07 16:00:42 +10:00
20220816163313_Traits.cs	Implement traits system (#10693)	2022-09-10 08:40:06 -07:00
20220816163313_Traits.Designer.cs	Implement traits system (#10693)	2022-09-10 08:40:06 -07:00
20221214230014_TTSVoice.cs	TTS (Text-To-Speech) (#618)	2023-01-10 18:01:20 -08:00
20221214230014_TTSVoice.Designer.cs	TTS (Text-To-Speech) (#618)	2023-01-10 18:01:20 -08:00
20230319110651_ProfileTraitIndexUnique.cs	Server ban exemption system (#15076)	2023-04-03 10:24:55 +10:00
20230319110651_ProfileTraitIndexUnique.Designer.cs	Fix db	2024-04-27 12:02:01 +03:00
20230319112120_ServerBanExemption.cs	Server ban exemption system (#15076)	2023-04-03 10:24:55 +10:00
20230319112120_ServerBanExemption.Designer.cs	Fix db	2024-04-27 12:02:01 +03:00
20230402214642_BanAutoDelete.cs	Server ban exemption system (#15076)	2023-04-03 10:24:55 +10:00
20230402214642_BanAutoDelete.Designer.cs	Fix db	2024-04-27 12:02:01 +03:00
20230503001739_AdminNotesImprovement.cs	Better notes and bans (#14228)	2023-07-21 13:38:52 +02:00
20230503001739_AdminNotesImprovement.Designer.cs	Fix db	2024-04-27 12:02:01 +03:00
20230725193058_AdminNotesImprovementsForeignKeys.cs	GDPR stuff update (#18300)	2023-07-26 20:05:51 +02:00
20230725193058_AdminNotesImprovementsForeignKeys.Designer.cs	Fix db	2024-04-27 12:02:01 +03:00
20230727190858_AdminLogCompoundKey.cs	Remove autogenerated from admin log key. (#18377)	2023-07-29 16:44:28 +10:00
20230727190858_AdminLogCompoundKey.Designer.cs	Fix db	2024-04-27 12:02:01 +03:00
20231021071407_RoundStartDate.cs	Store round start date in the database (#21153)	2023-10-22 21:01:48 -07:00
20231021071407_RoundStartDate.Designer.cs	Fix db	2024-04-27 12:02:01 +03:00
20231024041159_DropAdminLogEntity.cs	Drop admin log entity db table (#21216)	2023-10-23 22:08:20 -07:00
20231024041159_DropAdminLogEntity.Designer.cs	Fix db	2024-04-27 12:02:01 +03:00
20231126234049_ConnectionLogServer.cs	Log server ID in connection logs table (#21911)	2023-12-07 09:48:56 +11:00
20231126234049_ConnectionLogServer.Designer.cs	Fix db	2024-04-27 12:02:01 +03:00
20231226154929_AdminLogPk.cs	Fix admin log key order. (#23052)	2024-01-11 01:03:25 +01:00
20231226154929_AdminLogPk.Designer.cs	Fix db	2024-04-27 12:02:01 +03:00
20240201091254_SpawnPriorityPreference.cs	Client customization late-join spawner priority for arrivals/cryostorage (#24586)	2024-02-01 21:12:09 +11:00
20240201091254_SpawnPriorityPreference.Designer.cs	Fix db	2024-04-27 12:02:01 +03:00
20240301130602_ClothingRemoval.cs	Loadouts redux (#25715)	2024-04-16 22:57:43 +10:00
20240301130602_ClothingRemoval.Designer.cs	Fix db	2024-04-27 12:02:01 +03:00
20240318021959_AdminMessageDismiss.cs	Fix missing semicolon after migration. (#26337)	2024-03-22 16:50:55 +01:00
20240318021959_AdminMessageDismiss.Designer.cs	Fix db	2024-04-27 12:02:01 +03:00
20240403072258_Loadouts.cs	Loadouts redux (#25715)	2024-04-16 22:57:43 +10:00
20240403072258_Loadouts.Designer.cs	Fix db	2024-04-27 12:02:01 +03:00
20240409013832_FixRoundStartDateNullability.cs	Fix database round start date issues (#26838)	2024-04-14 07:39:43 +02:00
20240409013832_FixRoundStartDateNullability.Designer.cs	Fix db	2024-04-27 12:02:01 +03:00
20240409014937_FixRoundStartDateNullability2.cs	Fix database round start date issues (#26838)	2024-04-14 07:39:43 +02:00
20240409014937_FixRoundStartDateNullability2.Designer.cs	Fix db	2024-04-27 12:02:01 +03:00
20240531011549_RoleWhitelist.cs	Add job whitelist system (#28085)	2024-06-01 05:08:31 -07:00
20240531011549_RoleWhitelist.Designer.cs	Add job whitelist system (#28085)	2024-06-01 05:08:31 -07:00
20240606065717_RemoveLastReadRules.cs	Convert rules to use guidebook parsing (#28647)	2024-06-06 03:11:26 -04:00
20240606065717_RemoveLastReadRules.Designer.cs	Convert rules to use guidebook parsing (#28647)	2024-06-06 03:11:26 -04:00
20240606175141_ReturnLastReadRules.cs	Fixes client having authority over rules popup cvars (#28655)	2024-06-07 21:53:20 +02:00
20240606175141_ReturnLastReadRules.Designer.cs	Fixes client having authority over rules popup cvars (#28655)	2024-06-07 21:53:20 +02:00
SqliteServerDbContextModelSnapshot.cs	Fixes client having authority over rules popup cvars (#28655)	2024-06-07 21:53:20 +02:00