Morb0 782d82c0cd Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Connection/ConnectionManager.cs # Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs # Resources/Prototypes/Accents/word_replacements.yml # Resources/Prototypes/Datasets/ion_storm.yml # Resources/Prototypes/Entities/Clothing/Masks/specific.yml # Resources/Prototypes/StatusEffects/health.yml # Resources/Prototypes/StatusEffects/job.yml # Resources/Prototypes/StatusEffects/security.yml # Resources/Textures/Decals/bricktile.rsi/white_box.png		2024-04-12 02:17:14 +03:00
..
ArrivalsSystem.cs	Reduced Warning Count By 130 For Full Rebuilds (#26518)	2024-03-29 16:28:16 +11:00
DockingSystem.cs	Fix drone console docking (#25822)	2024-03-04 16:46:45 +11:00
DockingSystem.Shuttle.cs	Fix arrivals not docking on spinning stations (#26033)	2024-03-12 23:57:35 +11:00
EmergencyShuttleSystem.Console.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-03-13 17:02:47 +03:00
EmergencyShuttleSystem.cs	Coordinates Disks & Shuttle FTL Travel (#23240)	2024-04-01 15:50:00 +11:00
RadarConsoleSystem.cs	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
ShuttleConsoleSystem.cs	Refactor FTL time tracking code to fix a UI bug (#26538)	2024-03-30 12:40:55 +11:00
ShuttleConsoleSystem.Drone.cs	Fix drone console docking (#25822)	2024-03-04 16:46:45 +11:00
ShuttleConsoleSystem.FTL.cs	Coordinates Disks & Shuttle FTL Travel (#23240)	2024-04-01 15:50:00 +11:00
ShuttleSystem.cs	Refactor FTL time tracking code to fix a UI bug (#26538)	2024-03-30 12:40:55 +11:00
ShuttleSystem.FasterThanLight.cs	Refactor FTL time tracking code to fix a UI bug (#26538)	2024-03-30 12:40:55 +11:00
ShuttleSystem.GridFill.cs	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
ShuttleSystem.IFF.cs	Remove 700 usages of Component.Owner (#21100)	2023-10-19 12:34:31 -07:00
ShuttleSystem.Impact.cs	Revert "Fix chat bubbles (#25643)" (#25645)	2024-02-28 00:51:20 +11:00
SpaceGarbageSystem.cs	Salvage magnet revamp (#23119)	2024-01-04 14:25:32 +11:00
ThrusterSystem.cs	Fix turned off thrusters consume power (#26690)	2024-04-04 17:28:33 +11:00