merge fixes + arrivals fix

Prison-Station-14 · Dec 15, 2024 · bab4407 · bab4407
1 parent 5a23148
commit bab4407
Show file tree

Hide file tree

Showing 6 changed files with 3,427 additions and 10 deletions.
diff --git a/Content.Server/Shuttles/Components/StationArrivalsComponent.cs b/Content.Server/Shuttles/Components/StationArrivalsComponent.cs
@@ -12,5 +12,5 @@ public sealed partial class StationArrivalsComponent : Component
     [DataField("shuttle")]
     public EntityUid Shuttle;
 
-    [DataField("shuttlePath")] public ResPath ShuttlePath = new("/Maps/Shuttles/SP14/arrivals.yml");
+    [DataField("shuttlePath")] public ResPath ShuttlePath = new("/Maps/Shuttles/SP14/SP14arrivals.yml");
 }
diff --git a/Resources/Maps/Shuttles/SP14/arrivals.yml → ...urces/Maps/Shuttles/SP14/SP14arrivals.yml b/Resources/Maps/Shuttles/SP14/arrivals.yml → ...urces/Maps/Shuttles/SP14/SP14arrivals.yml