Morb0 782d82c0cd Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Connection/ConnectionManager.cs # Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs # Resources/Prototypes/Accents/word_replacements.yml # Resources/Prototypes/Datasets/ion_storm.yml # Resources/Prototypes/Entities/Clothing/Masks/specific.yml # Resources/Prototypes/StatusEffects/health.yml # Resources/Prototypes/StatusEffects/job.yml # Resources/Prototypes/StatusEffects/security.yml # Resources/Textures/Decals/bricktile.rsi/white_box.png		2024-04-12 02:17:14 +03:00
..
HumanoidAppearanceSystem.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-04-12 02:17:14 +03:00
HumanoidAppearanceSystem.Modifier.cs	Code cleanup: Dirty(Comp) (#26238)	2024-03-19 23:27:02 -04:00
RandomHumanoidAppearanceSystem.cs	Remove usages of obsolete MetaDataComponent setters (#19582)	2023-08-28 19:20:31 +10:00
RandomHumanoidSystem.cs	Replace EntityUid parsing with NetEntity (#23474)	2024-01-04 11:04:31 +11:00