Morbo 5a14c570aa Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml # Resources/Prototypes/typing_indicator.yml # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Structures/Machines/fax_machine.rsi/icon.png # Resources/Textures/Structures/Machines/fax_machine.rsi/idle.png # Resources/Textures/Structures/Machines/fax_machine.rsi/inserting.png # Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png # Resources/Textures/Structures/Storage/Crates/livestock.rsi/base.png # Resources/Textures/Structures/Storage/Crates/livestock.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/livestock.rsi/open.png		2023-04-15 19:12:31 +03:00
..
UI	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-04-15 19:12:31 +03:00