Morb0 34a8740819 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/workflows/build-test-release.yml # Content.Client/Humanoid/HumanoidAppearanceSystem.cs # Content.Shared/Humanoid/HumanoidAppearanceComponent.cs # Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs # Resources/Prototypes/Entities/Clothing/Shoes/boots.yml		2023-10-02 02:18:19 +03:00
..
base_objectives.yml	Objectives ecs rework (#19967)	2023-09-16 16:18:10 +10:00
dragon.yml	dragon refactor, objectives and use GenericAntag (#20201)	2023-09-30 13:18:01 -07:00
ninja.yml	Decrease doorjack count for ninja (#1439)	2023-09-22 17:49:19 +03:00
objectiveGroups.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync2	2023-09-19 11:41:15 +03:00
traitor.yml	hopefully fix no objectives (#20246)	2023-09-16 22:10:05 +10:00