Morbo 1b79af1fc2 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Changelog/ChangelogManager.cs # Content.Client/Doors/AirlockVisualizer.cs # Content.Client/Humanoid/SingleMarkingPicker.xaml.cs # Resources/Prototypes/Entities/Clothing/Shoes/boots.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml # Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml		2023-04-23 16:02:09 +03:00
..
objectiveGroups.yml	Add hijack traitor objective (#854)	2023-03-02 09:37:04 -08:00
traitorObjectives.yml	Portals & hand teleporter (#13266)	2023-01-02 19:58:25 -06:00