Morb0 8daf4b3f32 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/StatusIcon/antag.yml # Resources/ServerInfo/Guidebook/Engineering/TEG.xml # Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml # Resources/Textures/Structures/Furniture/chairs.rsi/meta.json # Resources/Textures/Structures/stairs.rsi/meta.json		2024-03-21 01:15:13 +03:00
..
HumanoidAppearanceSystem.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-03-21 01:15:13 +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