Morb0 5a4438ca85 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml # Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml # Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml # Resources/Prototypes/Roles/Jobs/Science/research_director.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Prototypes/secret_weights.yml # Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET.png # Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET.png # Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET.png # Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET.png # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json		2023-10-05 19:37:38 +03:00
..
RoundEndSystem.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-05 19:37:38 +03:00