Morb0 70e63172f7 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Shared/Preferences/HumanoidCharacterProfile.cs # README.md # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/ServerInfo/Guidebook/Cargo/Cargo.xml # Resources/ServerInfo/Guidebook/Medical/Cloning.xml # Resources/ServerInfo/Guidebook/Survival.xml # Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json # Resources/Textures/Objects/Tools/t-ray.rsi/meta.json # Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png # Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png # Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open.png		2024-02-12 12:53:34 +03:00
..
Cargo.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-02-12 12:53:34 +03:00
CargoBounties.xml	Bounties, antags general, minor antags guidebook translate (#1677)	2023-12-29 16:45:28 +03:00
Salvage.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-02-03 03:38:29 +03:00
TradeStation.xml	Fix guidebook (#24947)	2024-02-04 14:34:32 -08:00