Ed cd736e4fd4 Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Maps/oasis.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/audio.yml

2024-12-11 14:49:02 +03:00

..

ArrivalsSystem.cs

Fix imports

2024-11-19 21:16:49 -08:00

DockingSignalControlSystem.cs

Dock device link port (#27646)

2024-05-06 13:59:01 +10:00

DockingSystem.cs

Replace obsolete code in shuttle systems. (#31408)

2024-08-26 17:48:37 +02:00

DockingSystem.Shuttle.cs

Extend shuttle dock time if the shuttle doesn't dock at evac. (#31496)

2024-09-09 20:10:28 +02:00

EmergencyShuttleSystem.Console.cs

Replace obsolete code in shuttle systems. (#31408)

2024-08-26 17:48:37 +02:00

EmergencyShuttleSystem.cs

Extend shuttle dock time if the shuttle doesn't dock at evac. (#31496)

2024-09-09 20:10:28 +02:00

RadarConsoleSystem.cs

fix and buff the handheld mass scanner (#31284)

2024-08-21 12:33:01 -06:00

ShuttleConsoleSystem.cs

Replace obsolete code in shuttle systems. (#31408)

2024-08-26 17:48:37 +02:00

ShuttleConsoleSystem.Drone.cs

Fix replayghost spawning location (#30252)

2024-07-22 20:32:30 +01:00

ShuttleConsoleSystem.FTL.cs

Two additional checks to prevent FTLing stations (#32558)

2024-10-04 12:55:36 +10:00

ShuttleSystem.cs

Merge remote-tracking branch 'upstream/master' into ed-20-11-2024-upstream-sync

2024-11-23 01:48:24 +03:00

ShuttleSystem.FasterThanLight.cs

Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream

2024-12-11 14:49:02 +03:00

ShuttleSystem.GridFill.cs

Localize planet dataset names (#33398)

2024-11-20 11:57:43 +11:00

ShuttleSystem.IFF.cs

Fix VGRoid grid spam (#29946)

2024-07-27 11:54:38 +10:00

ShuttleSystem.Impact.cs

Replace obsolete code in shuttle systems. (#31408)

2024-08-26 17:48:37 +02:00

SpaceGarbageSystem.cs

Salvage magnet revamp (#23119)

2024-01-04 14:25:32 +11:00

StationAnchorSystem.cs

Station Anchor (#26098)

2024-08-31 10:40:28 -04:00

ThrusterSystem.cs

Replace obsolete code in shuttle systems. (#31408)

2024-08-26 17:48:37 +02:00