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
..
BanList	Admin notes bugfixes (#18189)	2023-07-21 15:43:47 +02:00
Commands	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-02 15:13:51 +03:00
Components	Cuffable/Handcuff ECS (#14382)	2023-03-13 19:34:26 -04:00
Logs	(Probably) fix random integration test failures. (#18270)	2023-07-25 11:10:50 +10:00
Managers	Adds a cvar to hide PII information in ban message (#18428)	2023-07-29 20:14:56 +03:00
Notes	Better notes and bans (#14228)	2023-07-21 13:38:52 +02:00
Systems	Zombie Mode 𝓡𝓮𝓭𝓾𝔁 (#18199)	2023-07-25 15:31:35 -06:00
UI	Ensure EUIs close themselves (#15860)	2023-04-29 13:16:24 +10:00
AdminCommandAttribute.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00
AdminPermsChangedEventArgs.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00
AdminRank.cs	Remove redundant #nullable enable (#4275)	2021-07-16 17:37:09 -07:00
BanPanelEui.cs	Better notes and bans (#14228)	2023-07-21 13:38:52 +02:00
ContentNetworkResourceManager.cs	Move upload commands to engine (#16582)	2023-05-20 11:53:09 +10:00
PlayerLocator.cs	Cache HTTP client in player locator (#12555)	2022-11-11 19:56:47 -06:00
QuickDialogSystem.cs	Fixes quick dialog exception (#13189)	2023-01-05 06:27:25 +11:00
QuickDialogSystem.OpenDialog.cs	Adds even more smites and a bunch of tools. (#9825)	2022-07-21 17:30:00 -05:00