fixed transfer spawns, fixed build errors and fixed arrival path

Prison-Station-14 · Aug 19, 2024 · 3c07491 · 3c07491
1 parent 782dc2d
commit 3c07491
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 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/arrivals.yml");
+    [DataField("shuttlePath")] public ResPath ShuttlePath = new("/Maps/Shuttles/SP14/arrivals.yml");
 }
diff --git a/Resources/Maps/Shuttles/arrivals.yml → Resources/Maps/Shuttles/SP14/arrivals.yml b/Resources/Maps/Shuttles/arrivals.yml → Resources/Maps/Shuttles/SP14/arrivals.yml
diff --git a/Resources/Maps/Shuttles/ShuttleEvent/SP14/transfer_shuttle.yml b/Resources/Maps/Shuttles/ShuttleEvent/SP14/transfer_shuttle.yml
@@ -1025,17 +1025,17 @@ entities:
     - type: Transform
       pos: 3.5,-2.5
       parent: 2
-- proto: SpawnPointPrisonOfficer
+- proto: SpawnMobShuttlePrisonOfficer
   entities:
   - uid: 188
     components:
     - type: Transform
-      pos: 4.5,2.5
+      pos: 1.5,1.5
       parent: 2
   - uid: 189
     components:
     - type: Transform
-      pos: 1.5,1.5
+      pos: 4.5,2.5
       parent: 2
 - proto: SubstationWallBasic
   entities:

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/SP14/human.yml b/Resources/Prototypes/Entities/Markers/Spawners/SP14/human.yml
@@ -6,8 +6,6 @@
   - type: Sprite
     layers:
     - state: green
-    - sprite: /Textures/Interface/Misc/SP14/job_icons.rsi
-    - state: SPPrisoner
   - type: RandomSpawner
     prototypes:
     - RandomHumanoidShuttlePrisoner
@@ -20,8 +18,6 @@
   - type: Sprite
     layers:
     - state: green
-    - sprite: /Textures/Interface/Misc/SP14/job_icons.rsi
-    - state: SPPrisoner
   - type: RandomSpawner
     prototypes:
     - RandomHumanoidShuttlePrisonerOfficer