seperated

Prison-Station-14 · Dec 14, 2024 · 6d049cd · 6d049cd
1 parent 5a6beaf
commit 6d049cd
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 38 deletions.
diff --git a/Resources/Prototypes/Entities/Mobs/Corpses/SP14/corpses.yml b/Resources/Prototypes/Entities/Mobs/Corpses/SP14/corpses.yml
@@ -0,0 +1,8 @@
+- type: entity
+  parent: SalvageHumanCorpse
+  id: MobRandomPrisonOfficerCorpse
+  suffix: Dead, Security
+  components:
+  - type: Loadout
+    prototypes:
+    - DeadShuttlePrisonOfficerGear
diff --git a/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml b/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml
@@ -86,12 +86,3 @@
     - CMOGear
     - ChiefEngineerGear
     - QuartermasterGear
-
-- type: entity
-  parent: SalvageHumanCorpse
-  id: MobRandomPrisonOfficerCorpse
-  suffix: Dead, Security
-  components:
-  - type: Loadout
-    prototypes:
-    - DeadShuttlePrisonOfficerGear
diff --git a/Resources/Prototypes/GameRules/SP14/unknown_shuttles.yml b/Resources/Prototypes/GameRules/SP14/unknown_shuttles.yml
@@ -0,0 +1,18 @@
+# SP14 Shuttle events
+- type: entity
+  parent: BaseUnknownShuttleRule
+  id: UnknownShuttleSP14Transfer
+  components:
+  - type: StationEvent
+    weight: 5
+  - type: LoadMapRule
+    preloadedGrid: ShuttleTransfer
+
+- type: entity
+  parent: BaseUnknownShuttleRule
+  id: UnknownShuttleSP14TransferMutiny
+  components:
+  - type: StationEvent
+    weight: 5
+  - type: LoadMapRule
+    preloadedGrid: ShuttleTransferMutinied
diff --git a/Resources/Prototypes/GameRules/unknown_shuttles.yml b/Resources/Prototypes/GameRules/unknown_shuttles.yml
@@ -60,21 +60,3 @@
     weight: 2
   - type: LoadMapRule
     preloadedGrid: Honki
-
-- type: entity
-  parent: BaseUnknownShuttleRule
-  id: UnknownShuttleSP14Transfer
-  components:
-  - type: StationEvent
-    weight: 5
-  - type: LoadMapRule
-    preloadedGrid: ShuttleTransfer
-
-- type: entity
-  parent: BaseUnknownShuttleRule
-  id: UnknownShuttleSP14TransferMutiny
-  components:
-  - type: StationEvent
-    weight: 5
-  - type: LoadMapRule
-    preloadedGrid: ShuttleTransferMutinied
diff --git a/Resources/Prototypes/Shuttles/SP14/shuttle_incoming_event.yml b/Resources/Prototypes/Shuttles/SP14/shuttle_incoming_event.yml
@@ -0,0 +1,10 @@
+- type: preloadedGrid
+  id: ShuttleTransfer
+  path: /Maps/Shuttles/ShuttleEvent/SP14/transfer_shuttle.yml
+  copies: 1
+
+- type: preloadedGrid
+  id: ShuttleTransferMutinied
+  path: /Maps/Shuttles/ShuttleEvent/SP14/mutinied_transfer_shuttle.yml
+  copies: 1
+
diff --git a/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml b/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
@@ -17,14 +17,3 @@
   id: Honki
   path: /Maps/Shuttles/ShuttleEvent/honki.yml
   copies: 1
-
-- type: preloadedGrid
-  id: ShuttleTransfer
-  path: /Maps/Shuttles/ShuttleEvent/SP14/transfer_shuttle.yml
-  copies: 1
-
-- type: preloadedGrid
-  id: ShuttleTransferMutinied
-  path: /Maps/Shuttles/ShuttleEvent/SP14/mutinied_transfer_shuttle.yml
-  copies: 1
-