VigersRay 47cdabdaed Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Shared/StatusEffect/StatusEffectsSystem.cs # Resources/Audio/Effects/attributions.yml # Resources/Locale/en-US/_strings/anomaly/inner_anomaly.ftl # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml # Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml		2024-09-19 16:09:00 +03:00
..
Commands	Extend shuttle dock time if the shuttle doesn't dock at evac. (#31496)	2024-09-09 20:10:28 +02:00
Components	upstream	2024-09-16 12:40:23 +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-09-19 16:09:00 +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