Morbo 892634065a Merge remote-tracking branch 'upstream/master' into master-syndie ... # Conflicts: # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml # Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml # Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json		2023-03-14 05:18:41 +03:00
..
UI	Merge remote-tracking branch 'upstream/master' into master-syndie	2023-03-14 05:18:41 +03:00
ClientPreferencesManager.cs	Repository cleanup (#631)	2022-12-10 12:10:27 -08:00
IClientPreferencesManager.cs	Re-organize all projects (#4166)	2021-06-09 22:19:39 +02:00