Ещё шаттлы

Content.Server/Shuttles/Components/StationCargoShuttleComponent.cs

@@ -15,5 +15,5 @@ public sealed partial class StationCargoShuttleComponent : Component
     // YAML is filled out so mappers don't have to read here.
 
     [DataField(required: true)]
-    public ResPath Path = new("/Maps/Shuttles/cargo.yml");
+    public ResPath Path = new("/Maps/White/Shuttles/cargo.yml"); // WD
 }

Resources/Maps/White/Shuttles/ShuttleEvent/lost_cargo.yml

@@ -326,7 +326,7 @@ entities:
   - uid: 93
     components:
     - type: Transform
-      pos: -3.7203684,7.754469
+      pos: -1.366688,7.6937246
       parent: 1
 - proto: CableApcExtension
   entities:
@@ -604,6 +604,12 @@ entities:
     - type: Transform
       pos: -0.5,-0.5
       parent: 1
+  - uid: 69
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,2.5
+      parent: 1
   - uid: 71
     components:
     - type: Transform
@@ -644,14 +650,14 @@ entities:
     - type: Transform
       pos: -0.5,5.5
       parent: 1
-- proto: ChairPilotSeat
-  entities:
-  - uid: 70
+  - uid: 139
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,2.5
+      rot: 1.5707963267948966 rad
+      pos: -1.5,2.5
       parent: 1
+- proto: ChairPilotSeat
+  entities:
   - uid: 79
     components:
     - type: Transform
@@ -663,8 +669,8 @@ entities:
   - uid: 194
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,7.5
+      rot: 1.5707963267948966 rad
+      pos: -3.5,7.5
       parent: 1
 - proto: ComputerShuttle
   entities:
@@ -810,12 +816,12 @@ entities:
   - uid: 99
     components:
     - type: Transform
-      pos: -3.2915764,7.812316
+      pos: -1.616936,7.547891
       parent: 1
   - uid: 100
     components:
     - type: Transform
-      pos: -3.4715438,7.654894
+      pos: -1.53352,7.422891
       parent: 1
 - proto: GasPipeBend
   entities:
@@ -973,10 +979,10 @@ entities:
       powerLoad: 0
 - proto: RandomCash
   entities:
-  - uid: 195
+  - uid: 126
     components:
     - type: Transform
-      pos: -3.5,7.5
+      pos: -1.5,7.5
       parent: 1
 - proto: RandomPosterAny
   entities:
@@ -1122,16 +1128,10 @@ entities:
       parent: 1
 - proto: TableReinforced
   entities:
-  - uid: 126
+  - uid: 70
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,2.5
-      parent: 1
-  - uid: 139
-    components:
-    - type: Transform
-      pos: -3.5,7.5
+      pos: -1.5,7.5
       parent: 1
 - proto: Thruster
   entities:

Resources/Maps/White/Shuttles/ShuttleEvent/traveling_china_cuisine.yml

@@ -224,6 +224,7 @@ entities:
     - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
+    - type: LoadedMap
 - proto: AirlockShuttle
   entities:
   - uid: 2
@@ -245,6 +246,13 @@ entities:
     - type: Transform
       pos: 2.5,-1.5
       parent: 1
+- proto: ATM
+  entities:
+  - uid: 235
+    components:
+    - type: Transform
+      pos: -1.5,-2.5
+      parent: 1
 - proto: AtmosDeviceFanTiny
   entities:
   - uid: 5
@@ -634,6 +642,15 @@ entities:
       rot: 3.141592653589793 rad
       pos: 1.8425496,-6.086302
       parent: 1
+- proto: Eftpos
+  entities:
+  - uid: 233
+    components:
+    - type: Transform
+      parent: 74
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: EggySeeds
   entities:
   - uid: 89
@@ -1292,19 +1309,21 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 147
-          - 82
-          - 90
-          - 185
-          - 75
-          - 79
-          - 72
-          - 77
-          - 81
-          - 78
-          - 73
-          - 76
+          - 233
+          - 133
           - 80
+          - 76
+          - 73
+          - 78
+          - 81
+          - 77
+          - 72
+          - 79
+          - 75
+          - 185
+          - 90
+          - 82
+          - 147
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -1336,10 +1355,10 @@ entities:
     - type: InsideEntityStorage
 - proto: NoticeBoard
   entities:
-  - uid: 133
+  - uid: 234
     components:
     - type: Transform
-      pos: -1.5,-2.5
+      pos: -0.5,-2.5
       parent: 1
 - proto: Pen
   entities:
@@ -1595,6 +1614,17 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,-6.5
       parent: 1
+- proto: SpaceCash2500
+  entities:
+  - uid: 133
+    components:
+    - type: Transform
+      parent: 74
+    - type: Stack
+      count: 7500
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: StoolBar
   entities:
   - uid: 165

Resources/Maps/White/Shuttles/wizard.yml

@@ -28,7 +28,7 @@ entities:
     - type: MetaData
     - type: Transform
       pos: 0.3842575,0.4217209
-      parent: invalid
+      parent: 451
     - type: MapGrid
       chunks:
         -1,-1:
@@ -602,6 +602,18 @@ entities:
     - type: RadiationGridResistance
     - type: SpreaderGrid
     - type: GridPathfinding
+  - uid: 451
+    components:
+    - type: MetaData
+      name: Map Entity
+    - type: Transform
+    - type: Map
+      mapPaused: True
+    - type: PhysicsMap
+    - type: GridTree
+    - type: MovedGrids
+    - type: Broadphase
+    - type: OccluderTree
 - proto: AirlockExternalGlass
   entities:
   - uid: 3
@@ -2134,6 +2146,14 @@ entities:
     - type: Transform
       pos: -3.6894722,2.437179
       parent: 2
+- proto: DeepSpaceComWallMount
+  entities:
+  - uid: 774
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,10.5
+      parent: 2
 - proto: DiceBag
   entities:
   - uid: 285
@@ -2155,6 +2175,8 @@ entities:
     - type: Transform
       pos: -4.5,2.5
       parent: 2
+    - type: FaxMachine
+      name: Неизвестный
 - proto: FigureSpawner
   entities:
   - uid: 288
@@ -2772,6 +2794,18 @@ entities:
     - type: Transform
       pos: 0.5,-15.5
       parent: 2
+- proto: GeraldiyRubberStamp
+  entities:
+  - uid: 775
+    components:
+    - type: MetaData
+      desc: Старая и потёртая печать. На ней почти высохли чернила, но она все ещё может послужить убедительным аргументом в руках нужных людей.
+      name: печать федерации волшебников
+    - type: Transform
+      pos: -4.0507927,2.3569171
+      parent: 2
+    - type: Stamp
+      stampedName: Федерация Волшебников
 - proto: GravityGeneratorMini
   entities:
   - uid: 390

Resources/Prototypes/Entities/Stations/base.yml

@@ -49,7 +49,7 @@
   abstract: true
   components:
     - type: StationCargoShuttle
-      path: /Maps/Shuttles/cargo.yml
+      path: /Maps/White/Shuttles/cargo.yml
     - type: GridSpawn
       groups:
 #        trade:
@@ -60,7 +60,7 @@
 #            - /Maps/Shuttles/trading_outpost.yml
         mining:
           paths:
-          - /Maps/Shuttles/mining.yml
+          - /Maps/White/Shuttles/mining.yml
         # Spawn last
         ruins:
           hide: true

Resources/Prototypes/Shuttles/shuttle_incoming_event.yml

@@ -1,6 +1,6 @@
 - type: preloadedGrid
   id: ShuttleStriker
-  path: /Maps/Shuttles/ShuttleEvent/striker.yml
+  path: /Maps/White/Shuttles/ShuttleEvent/striker.yml
   copies: 2
 
 - type: preloadedGrid
@@ -20,10 +20,10 @@
 
 - type: preloadedGrid
   id: Honki
-  path: /Maps/Shuttles/ShuttleEvent/honki.yml
+  path: /Maps/White/Shuttles/ShuttleEvent/honki.yml
   copies: 1
 
 - type: preloadedGrid
   id: SyndieEvacPod
-  path: /Maps/Shuttles/ShuttleEvent/syndie_evacpod.yml
+  path: /Maps/White/Shuttles/ShuttleEvent/syndie_evacpod.yml
   copies: 1 # WD from 2 to 1