Morb0 3e015c6f67 Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync ... # Conflicts: # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml # Resources/Prototypes/Entities/Clothing/Masks/specific.yml # Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml # Resources/Prototypes/GameRules/midround.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/Prototypes/StatusEffects/health.yml # Resources/Prototypes/StatusIcon/antag.yml # Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml # Resources/ServerInfo/Guidebook/Engineering/AME.xml # Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml # Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml # Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml # Resources/ServerInfo/Guidebook/Engineering/Construction.xml # Resources/ServerInfo/Guidebook/Engineering/Engineering.xml # Resources/ServerInfo/Guidebook/Engineering/Fires.xml # Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml # Resources/ServerInfo/Guidebook/Engineering/Networking.xml # Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml # Resources/ServerInfo/Guidebook/Engineering/Power.xml # Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/ServerInfo/Guidebook/Engineering/TEG.xml # Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml # Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml # Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml # Resources/ServerInfo/Guidebook/Security/Forensics.xml # Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png		2024-04-26 11:19:50 +03:00
..
Loadouts	Make remaining IPrototypes partial (#27157)	2024-04-20 17:48:38 +10:00
GameSettings.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00
HumanoidCharacterProfile.cs	Fix upstream	2024-04-17 12:49:15 +03:00
ICharacterProfile.cs	Fix upstream	2024-04-17 12:49:15 +03:00
JobPriority.cs
MsgDeleteCharacter.cs	Pass IRobustSerializer to NetMessage (#11021)	2022-09-14 17:25:25 +10:00
MsgPreferencesAndSettings.cs	Update NetMessage to pass in MemoryStream (#21796)	2023-11-28 19:11:16 +11:00
MsgSelectCharacter.cs	Pass IRobustSerializer to NetMessage (#11021)	2022-09-14 17:25:25 +10:00
MsgUpdateCharacter.cs	Update NetMessage to pass in MemoryStream (#21796)	2023-11-28 19:11:16 +11:00
PlayerPreferences.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00
PreferenceUnavailableMode.cs
SpawnPriorityPreference.cs	Client customization late-join spawner priority for arrivals/cryostorage (#24586)	2024-02-01 21:12:09 +11:00