Morb0 0cffa43345 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Maps/core.yml # Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml # Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml # Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml # Resources/Prototypes/Roles/Jobs/Civilian/musician.yml # Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json # Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json # Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json # Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/icon.png # Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-left.png # Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-right.png # Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/meta.json # Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png # Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json # Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png # Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png # Resources/Textures/Decals/bricktile.rsi/dark_box.png # Resources/Textures/Decals/bricktile.rsi/dark_corner_ne.png # Resources/Textures/Decals/bricktile.rsi/dark_corner_nw.png # Resources/Textures/Decals/bricktile.rsi/dark_corner_se.png # Resources/Textures/Decals/bricktile.rsi/dark_corner_sw.png # Resources/Textures/Decals/bricktile.rsi/dark_end_e.png # Resources/Textures/Decals/bricktile.rsi/dark_end_n.png # Resources/Textures/Decals/bricktile.rsi/dark_end_s.png # Resources/Textures/Decals/bricktile.rsi/dark_end_w.png # Resources/Textures/Decals/bricktile.rsi/dark_inner_ne.png # Resources/Textures/Decals/bricktile.rsi/dark_inner_nw.png # Resources/Textures/Decals/bricktile.rsi/dark_inner_se.png # Resources/Textures/Decals/bricktile.rsi/dark_inner_sw.png # Resources/Textures/Decals/bricktile.rsi/dark_line_e.png # Resources/Textures/Decals/bricktile.rsi/dark_line_n.png # Resources/Textures/Decals/bricktile.rsi/dark_line_s.png # Resources/Textures/Decals/bricktile.rsi/dark_line_w.png # Resources/Textures/Decals/bricktile.rsi/meta.json # Resources/Textures/Decals/bricktile.rsi/steel_box.png # Resources/Textures/Decals/bricktile.rsi/steel_corner_ne.png # Resources/Textures/Decals/bricktile.rsi/steel_corner_nw.png # Resources/Textures/Decals/bricktile.rsi/steel_corner_se.png # Resources/Textures/Decals/bricktile.rsi/steel_corner_sw.png # Resources/Textures/Decals/bricktile.rsi/steel_end_e.png # Resources/Textures/Decals/bricktile.rsi/steel_end_n.png # Resources/Textures/Decals/bricktile.rsi/steel_end_s.png # Resources/Textures/Decals/bricktile.rsi/steel_end_w.png # Resources/Textures/Decals/bricktile.rsi/steel_inner_ne.png # Resources/Textures/Decals/bricktile.rsi/steel_inner_nw.png # Resources/Textures/Decals/bricktile.rsi/steel_inner_se.png # Resources/Textures/Decals/bricktile.rsi/steel_inner_sw.png # Resources/Textures/Decals/bricktile.rsi/steel_line_e.png # Resources/Textures/Decals/bricktile.rsi/steel_line_n.png # Resources/Textures/Decals/bricktile.rsi/steel_line_w.png # Resources/Textures/Decals/bricktile.rsi/white_box.png # Resources/Textures/Decals/bricktile.rsi/white_corner_ne.png # Resources/Textures/Decals/bricktile.rsi/white_corner_nw.png # Resources/Textures/Decals/bricktile.rsi/white_corner_se.png # Resources/Textures/Decals/bricktile.rsi/white_corner_sw.png # Resources/Textures/Decals/bricktile.rsi/white_end_e.png # Resources/Textures/Decals/bricktile.rsi/white_end_n.png # Resources/Textures/Decals/bricktile.rsi/white_end_s.png # Resources/Textures/Decals/bricktile.rsi/white_end_w.png # Resources/Textures/Decals/bricktile.rsi/white_inner_ne.png # Resources/Textures/Decals/bricktile.rsi/white_inner_nw.png # Resources/Textures/Decals/bricktile.rsi/white_inner_se.png # Resources/Textures/Decals/bricktile.rsi/white_inner_sw.png # Resources/Textures/Decals/bricktile.rsi/white_line_e.png # Resources/Textures/Decals/bricktile.rsi/white_line_n.png # Resources/Textures/Decals/bricktile.rsi/white_line_s.png # Resources/Textures/Decals/bricktile.rsi/white_line_w.png # Resources/Textures/Decals/minitile.rsi/dark_box.png # Resources/Textures/Decals/minitile.rsi/dark_corner_ne.png # Resources/Textures/Decals/minitile.rsi/dark_corner_nw.png # Resources/Textures/Decals/minitile.rsi/dark_corner_se.png # Resources/Textures/Decals/minitile.rsi/dark_corner_sw.png # Resources/Textures/Decals/minitile.rsi/dark_end_e.png # Resources/Textures/Decals/minitile.rsi/dark_end_n.png # Resources/Textures/Decals/minitile.rsi/dark_end_s.png # Resources/Textures/Decals/minitile.rsi/dark_end_w.png # Resources/Textures/Decals/minitile.rsi/dark_inner_ne.png # Resources/Textures/Decals/minitile.rsi/dark_inner_nw.png # Resources/Textures/Decals/minitile.rsi/dark_inner_se.png # Resources/Textures/Decals/minitile.rsi/dark_inner_sw.png # Resources/Textures/Decals/minitile.rsi/dark_line_e.png # Resources/Textures/Decals/minitile.rsi/dark_line_n.png # Resources/Textures/Decals/minitile.rsi/dark_line_s.png # Resources/Textures/Decals/minitile.rsi/dark_line_w.png # Resources/Textures/Decals/minitile.rsi/meta.json # Resources/Textures/Decals/minitile.rsi/steel_corner_ne.png # Resources/Textures/Decals/minitile.rsi/steel_corner_nw.png # Resources/Textures/Decals/minitile.rsi/steel_corner_se.png # Resources/Textures/Decals/minitile.rsi/steel_corner_sw.png # Resources/Textures/Decals/minitile.rsi/steel_end_e.png # Resources/Textures/Decals/minitile.rsi/steel_end_n.png # Resources/Textures/Decals/minitile.rsi/steel_end_s.png # Resources/Textures/Decals/minitile.rsi/steel_end_w.png # Resources/Textures/Decals/minitile.rsi/steel_inner_ne.png # Resources/Textures/Decals/minitile.rsi/steel_inner_nw.png # Resources/Textures/Decals/minitile.rsi/steel_inner_se.png # Resources/Textures/Decals/minitile.rsi/steel_inner_sw.png # Resources/Textures/Decals/minitile.rsi/steel_line_e.png # Resources/Textures/Decals/minitile.rsi/steel_line_n.png # Resources/Textures/Decals/minitile.rsi/steel_line_s.png # Resources/Textures/Decals/minitile.rsi/steel_line_w.png # Resources/Textures/Decals/minitile.rsi/white_box.png # Resources/Textures/Decals/minitile.rsi/white_corner_ne.png # Resources/Textures/Decals/minitile.rsi/white_corner_nw.png # Resources/Textures/Decals/minitile.rsi/white_corner_se.png # Resources/Textures/Decals/minitile.rsi/white_corner_sw.png # Resources/Textures/Decals/minitile.rsi/white_end_e.png # Resources/Textures/Decals/minitile.rsi/white_end_n.png # Resources/Textures/Decals/minitile.rsi/white_end_s.png # Resources/Textures/Decals/minitile.rsi/white_end_w.png # Resources/Textures/Decals/minitile.rsi/white_inner_ne.png # Resources/Textures/Decals/minitile.rsi/white_inner_nw.png # Resources/Textures/Decals/minitile.rsi/white_inner_se.png # Resources/Textures/Decals/minitile.rsi/white_inner_sw.png # Resources/Textures/Decals/minitile.rsi/white_line_w.png # Resources/Textures/Tiles/attributions.yml # Resources/Textures/Tiles/bar.png # Resources/Textures/Tiles/clown.png # Resources/Textures/Tiles/dark.png # Resources/Textures/Tiles/dark_diagonal.png # Resources/Textures/Tiles/dark_diagonal_mini.png # Resources/Textures/Tiles/dark_herringbone.png # Resources/Textures/Tiles/dark_mini.png # Resources/Textures/Tiles/dark_mono.png # Resources/Textures/Tiles/dark_offset.png # Resources/Textures/Tiles/dark_pavement.png # Resources/Textures/Tiles/dark_pavement_vertical.png # Resources/Textures/Tiles/hydro.png # Resources/Textures/Tiles/kitchen.png # Resources/Textures/Tiles/laundry.png # Resources/Textures/Tiles/steel.png # Resources/Textures/Tiles/steel_diagonal.png # Resources/Textures/Tiles/steel_diagonal_mini.png # Resources/Textures/Tiles/steel_herringbone.png # Resources/Textures/Tiles/steel_mini.png # Resources/Textures/Tiles/steel_mono.png # Resources/Textures/Tiles/steel_offset.png # Resources/Textures/Tiles/steel_pavement.png # Resources/Textures/Tiles/steel_pavement_vertical.png # Resources/Textures/Tiles/white.png # Resources/Textures/Tiles/white_diagonal.png # Resources/Textures/Tiles/white_diagonal_mini.png # Resources/Textures/Tiles/white_herringbone.png # Resources/Textures/Tiles/white_mini.png # Resources/Textures/Tiles/white_mono.png # Resources/Textures/Tiles/white_offset.png # Resources/Textures/Tiles/white_pavement.png # Resources/Textures/Tiles/white_pavement_vertical.png		2023-08-02 15:13:51 +03:00
..
20200929113117_Init.cs	Holy crap auth works (#2099)	2020-09-29 14:26:00 +02:00
20200929113117_Init.Designer.cs	Holy crap auth works (#2099)	2020-09-29 14:26:00 +02:00
20201006223000_SelectedCharacterSlotFk.cs	Foreign key for selected character slots.	2020-10-07 10:42:53 +02:00
20201028210620_Admins.cs	ConGroups are gone. Long live admin flags in content.	2020-10-30 16:06:48 +01:00
20201028210620_Admins.Designer.cs	ConGroups are gone. Long live admin flags in content.	2020-10-30 16:06:48 +01:00
20201109092921_ExtraIndices.cs	Permissions panel.	2020-11-10 16:50:28 +01:00
20201109092921_ExtraIndices.Designer.cs	Permissions panel.	2020-11-10 16:50:28 +01:00
20201203093409_ClothingAndPronouns.cs	Clothing and pronoun fields (#2689)	2020-12-24 14:42:40 +01:00
20201203093409_ClothingAndPronouns.Designer.cs	Clothing and pronoun fields (#2689)	2020-12-24 14:42:40 +01:00
20210103151756_BackpackPreference.cs	Backpack preferences. (#2864)	2021-01-03 16:22:14 +01:00
20210103151756_BackpackPreference.Designer.cs	Backpack preferences. (#2864)	2021-01-03 16:22:14 +01:00
20210211211033_AdminOOCColor.cs	OOC sent by an admin will have a different color (#3117)	2021-02-14 15:59:56 +01:00
20210211211033_AdminOOCColor.Designer.cs	OOC sent by an admin will have a different color (#3117)	2021-02-14 15:59:56 +01:00
20210321230012_HWID.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00
20210321230012_HWID.Designer.cs	Use HWIDs for bans.	2021-03-22 01:32:09 +01:00
20210915093340_UniqueHighPriorityJob.cs	Add extra unique constraints to DB jobs.	2021-09-15 11:37:05 +02:00
20210915093340_UniqueHighPriorityJob.Designer.cs	Add extra unique constraints to DB jobs.	2021-09-15 11:37:05 +02:00
20211120202701_AdminLogs.cs	THE RETURN OF THE KING	2021-11-22 19:08:27 +01:00
20211120202701_AdminLogs.Designer.cs	THE RETURN OF THE KING	2021-11-22 19:08:27 +01:00
20211121123543_AdminLogsImpact.cs	THE RETURN OF THE KING	2021-11-22 19:08:27 +01:00
20211121123543_AdminLogsImpact.Designer.cs	THE RETURN OF THE KING	2021-11-22 19:08:27 +01:00
20220103235647_whitelist.cs	Rename migrations to fix CS8981 warnings. (#14160)	2023-02-19 10:59:52 +11:00
20220103235647_whitelist.Designer.cs	Rename migrations to fix CS8981 warnings. (#14160)	2023-02-19 10:59:52 +11:00
20220108185749_add-species.cs	Rename migrations to fix CS8981 warnings. (#14160)	2023-02-19 10:59:52 +11:00
20220108185749_add-species.Designer.cs	Rename migrations to fix CS8981 warnings. (#14160)	2023-02-19 10:59:52 +11:00
20220127170845_UnifyMore.cs	Unify remaining DB model classes between SQLite and Postgres.	2022-01-27 18:12:09 +01:00
20220127170845_UnifyMore.Designer.cs	Unify remaining DB model classes between SQLite and Postgres.	2022-01-27 18:12:09 +01:00
20220129005644_ServerBanHit.cs	Revert "Revert "Log ban hits in DB. ( (#6361)	2022-02-02 22:57:11 +01:00
20220129005644_ServerBanHit.Designer.cs	Revert "Revert "Log ban hits in DB. ( (#6361)	2022-02-02 22:57:11 +01:00
20220214061058_RoleBans.cs	Role bans (#6703)	2022-02-21 23:11:39 +01:00
20220214061058_RoleBans.Designer.cs	Role bans (#6703)	2022-02-21 23:11:39 +01:00
20220308222742_Cleanup.cs	Fix database model migrations after role bans.	2022-03-08 23:36:02 +01:00
20220308222742_Cleanup.Designer.cs	Fix database model migrations after role bans.	2022-03-08 23:36:02 +01:00
20220310173734_SpeciesMarkings.cs	Markings (#7072)	2022-05-05 10:07:42 +02:00
20220310173734_SpeciesMarkings.Designer.cs	Markings (#7072)	2022-05-05 10:07:42 +02:00
20220313151800_ServerNameFts.cs	Server names and admin log full-text search (#6327)	2022-03-13 18:36:48 +01:00
20220313151800_ServerNameFts.Designer.cs	Server names and admin log full-text search (#6327)	2022-03-13 18:36:48 +01:00
20220324144654_AdminNotes.cs	Admin notes (#7259)	2022-04-16 20:57:50 +02:00
20220324144654_AdminNotes.Designer.cs	Admin notes (#7259)	2022-04-16 20:57:50 +02:00
20220325170225_PlayerReadRules.cs	Track rule reading in database, don't show popup locally (#7278)	2022-03-26 20:16:57 +01:00
20220325170225_PlayerReadRules.Designer.cs	Track rule reading in database, don't show popup locally (#7278)	2022-03-26 20:16:57 +01:00
20220326104916_UploadedResourcesLog.cs	Adds Network Resource Uploading for admins. (#6904)	2022-03-26 12:46:37 +01:00
20220326104916_UploadedResourcesLog.Designer.cs	Adds Network Resource Uploading for admins. (#6904)	2022-03-26 12:46:37 +01:00
20220503222955_FixIndices.cs	Fix admin log indices. (#7920)	2022-05-04 16:18:55 +02:00
20220503222955_FixIndices.Designer.cs	Fix admin log indices. (#7920)	2022-05-04 16:18:55 +02:00
20220505084828_MarkingsJsonb.cs	Make Profile.Markings db column jsonb (#7947)	2022-05-05 11:23:48 +02:00
20220505084828_MarkingsJsonb.Designer.cs	Make Profile.Markings db column jsonb (#7947)	2022-05-05 11:23:48 +02:00
20220509060724_FlavorText.cs	Flavor text (#8070)	2022-05-13 15:58:45 -07:00
20220509060724_FlavorText.Designer.cs	Flavor text (#8070)	2022-05-13 15:58:45 -07:00
20220724000132_PlayTime.cs	Play time tracking: Job timers 3: more titles: when the (#9978)	2022-08-07 16:00:42 +10:00
20220724000132_PlayTime.Designer.cs	Play time tracking: Job timers 3: more titles: when the (#9978)	2022-08-07 16:00:42 +10:00
20220816163319_Traits.cs	Implement traits system (#10693)	2022-09-10 08:40:06 -07:00
20220816163319_Traits.Designer.cs	Implement traits system (#10693)	2022-09-10 08:40:06 -07:00
20221214230019_TTSVoice.cs	TTS (Text-To-Speech) (#618)	2023-01-10 18:01:20 -08:00
20221214230019_TTSVoice.Designer.cs	TTS (Text-To-Speech) (#618)	2023-01-10 18:01:20 -08:00
20230319110655_ProfileTraitIndexUnique.cs	Server ban exemption system (#15076)	2023-04-03 10:24:55 +10:00
20230319110655_ProfileTraitIndexUnique.Designer.cs	Server ban exemption system (#15076)	2023-04-03 10:24:55 +10:00
20230319112124_ServerBanExemption.cs	Server ban exemption system (#15076)	2023-04-03 10:24:55 +10:00
20230319112124_ServerBanExemption.Designer.cs	Server ban exemption system (#15076)	2023-04-03 10:24:55 +10:00
20230402214647_BanAutoDelete.cs	Server ban exemption system (#15076)	2023-04-03 10:24:55 +10:00
20230402214647_BanAutoDelete.Designer.cs	Server ban exemption system (#15076)	2023-04-03 10:24:55 +10:00
20230503001749_AdminNotesImprovement.cs	Admin notes bugfixes (#18189)	2023-07-21 15:43:47 +02:00
20230503001749_AdminNotesImprovement.Designer.cs	Better notes and bans (#14228)	2023-07-21 13:38:52 +02:00
20230725193102_AdminNotesImprovementsForeignKeys.cs	GDPR stuff update (#18300)	2023-07-26 20:05:51 +02:00
20230725193102_AdminNotesImprovementsForeignKeys.Designer.cs	GDPR stuff update (#18300)	2023-07-26 20:05:51 +02:00
20230727190902_AdminLogCompoundKey.cs	Remove autogenerated from admin log key. (#18377)	2023-07-29 16:44:28 +10:00
20230727190902_AdminLogCompoundKey.Designer.cs	Remove autogenerated from admin log key. (#18377)	2023-07-29 16:44:28 +10:00
PostgresServerDbContextModelSnapshot.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-02 15:13:51 +03:00