VigersRay c705713fb0 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png # Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json # Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json # Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/Equipment/plant_bag.rsi/meta.json # Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json		2024-08-29 16:01:10 +03:00
..
Commands	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
Components	фиксы апстрима	2024-08-05 21:54:07 +03:00
Events	Replace Matrix3 with System.Numerics.Matrix3x2 (#27443)	2024-06-02 14:07:41 +10:00
Systems	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-08-29 16:01:10 +03:00
DockingConfig.cs	Fix some docking configs (#17012)	2023-06-01 10:48:44 +10:00
DroneConsoleComponent.cs	Salvage magnet revamp (#23119)	2024-01-04 14:25:32 +11:00