фикс спавнпоинтов старшаков и нулевые айди

AdventureTimeSS14 · Sep 5, 2024 · 26e5980 · 26e5980
1 parent ddde4a1
commit 26e5980
Show file tree

Hide file tree

Showing 18 changed files with 1,592 additions and 729 deletions.
diff --git a/Resources/Maps/ADTMaps/ADTStations/adt_aspid.yml b/Resources/Maps/ADTMaps/ADTStations/adt_aspid.yml
diff --git a/Resources/Maps/ADTMaps/ADTStations/adt_astra.yml b/Resources/Maps/ADTMaps/ADTStations/adt_astra.yml
@@ -79256,8 +79256,7 @@ entities:
   - uid: 11352
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 94.5,-88.5
+      pos: 94.386314,-88.27456
       parent: 2
   - uid: 11353
     components:
@@ -98672,18 +98671,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -59.5,-19.5
       parent: 2
-  - uid: 14614
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 102.5,-86.5
-      parent: 2
-  - uid: 14615
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 94.5,-86.5
-      parent: 2
 - proto: ComputerId
   entities:
   - uid: 14616
@@ -98919,14 +98906,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 15.5,-98.5
       parent: 2
-- proto: ComputerShuttleSalvage
-  entities:
-  - uid: 14650
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -11.5,-101.5
-      parent: 2
 - proto: ComputerSolarControl
   entities:
   - uid: 14651
@@ -115304,7 +115283,7 @@ entities:
       pos: 29.5,-30.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -620.5549
+      secondsUntilStateChange: -1696.3945
       state: Closing
   - uid: 17086
     components:
@@ -118384,6 +118363,28 @@ entities:
     - type: Transform
       pos: 70.61918,-36.66392
       parent: 2
+- proto: FoodKebabSkewer
+  entities:
+  - uid: 17564
+    components:
+    - type: Transform
+      pos: 30.501423,33.74996
+      parent: 2
+  - uid: 17565
+    components:
+    - type: Transform
+      pos: 30.688923,33.40621
+      parent: 2
+  - uid: 17566
+    components:
+    - type: Transform
+      pos: 10.46987,-32.211178
+      parent: 2
+  - uid: 17570
+    components:
+    - type: Transform
+      pos: 10.481251,-15.347561
+      parent: 2
 - proto: FoodMealEggsbenedict
   entities:
   - uid: 17557
@@ -118442,25 +118443,6 @@ entities:
     - type: Transform
       pos: -19.483137,6.4599166
       parent: 2
-- proto: FoodMeatLizardtailKebab
-  entities:
-  - uid: 17564
-    components:
-    - type: Transform
-      pos: 30.501423,33.74996
-      parent: 2
-  - uid: 17565
-    components:
-    - type: Transform
-      pos: 30.688923,33.40621
-      parent: 2
-- proto: FoodMeatRatdoubleKebab
-  entities:
-  - uid: 17566
-    components:
-    - type: Transform
-      pos: 10.46987,-32.211178
-      parent: 2
 - proto: FoodMeatRotten
   entities:
   - uid: 11327
@@ -118490,13 +118472,6 @@ entities:
     - type: Transform
       pos: 11.662539,-32.669094
       parent: 2
-- proto: FoodMeatSnakeKebab
-  entities:
-  - uid: 17570
-    components:
-    - type: Transform
-      pos: 10.481251,-15.347561
-      parent: 2
 - proto: FoodMeatSpiderLeg
   entities:
   - uid: 17571
@@ -162971,18 +162946,6 @@ entities:
     - type: Transform
       pos: -3.2773886,11.447169
       parent: 2
-- proto: MaterialReclaimer
-  entities:
-  - uid: 23626
-    components:
-    - type: Transform
-      pos: -8.5,-93.5
-      parent: 2
-  - uid: 23627
-    components:
-    - type: Transform
-      pos: 9.5,-86.5
-      parent: 2
 - proto: MaterialWebSilk25
   entities:
   - uid: 11329
@@ -166348,6 +166311,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: -28.5,-98.5
       parent: 2
+- proto: PlayerStationAi
+  entities:
+  - uid: 23627
+    components:
+    - type: Transform
+      pos: 98.5,-91.5
+      parent: 2
 - proto: Plunger
   entities:
   - uid: 24104
@@ -189243,6 +189213,34 @@ entities:
     - type: Transform
       pos: 59.5,4.5
       parent: 2
+- proto: SpawnPointSeniorEngineer
+  entities:
+  - uid: 37752
+    components:
+    - type: Transform
+      pos: 49.5,-51.5
+      parent: 2
+- proto: SpawnPointSeniorOfficer
+  entities:
+  - uid: 23626
+    components:
+    - type: Transform
+      pos: 59.5,5.5
+      parent: 2
+- proto: SpawnPointSeniorPhysician
+  entities:
+  - uid: 14650
+    components:
+    - type: Transform
+      pos: -47.5,-12.5
+      parent: 2
+- proto: SpawnPointSeniorResearcher
+  entities:
+  - uid: 29235
+    components:
+    - type: Transform
+      pos: -37.5,-47.5
+      parent: 2
 - proto: SpawnPointServiceWorker
   entities:
   - uid: 27882
@@ -189689,6 +189687,20 @@ entities:
     - type: Transform
       pos: -4.5,-8.5
       parent: 36616
+- proto: StationAiUploadComputer
+  entities:
+  - uid: 14614
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 102.5,-86.5
+      parent: 2
+  - uid: 14615
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 94.5,-86.5
+      parent: 2
 - proto: StationMap
   entities:
   - uid: 27958
@@ -198114,13 +198126,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -73.056595,0.33326006
       parent: 2
-- proto: ToyAi
-  entities:
-  - uid: 29235
-    components:
-    - type: Transform
-      pos: 98.55087,-91.527596
-      parent: 2
 - proto: ToyAmongPequeno
   entities:
   - uid: 29236

diff --git a/Resources/Maps/ADTMaps/ADTStations/adt_avrite.yml b/Resources/Maps/ADTMaps/ADTStations/adt_avrite.yml
@@ -155692,7 +155692,7 @@ entities:
       pos: -12.5,61.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -378759.38
+      secondsUntilStateChange: -378933.62
       state: Closing
 - proto: CurtainsPurple
   entities:
@@ -313814,6 +313814,34 @@ entities:
     - type: Transform
       pos: -5.5,-38.5
       parent: 2
+- proto: SpawnPointSeniorEngineer
+  entities:
+  - uid: 60807
+    components:
+    - type: Transform
+      pos: 33.5,21.5
+      parent: 2
+- proto: SpawnPointSeniorOfficer
+  entities:
+  - uid: 34808
+    components:
+    - type: Transform
+      pos: -34.5,-33.5
+      parent: 2
+- proto: SpawnPointSeniorPhysician
+  entities:
+  - uid: 34807
+    components:
+    - type: Transform
+      pos: -28.5,-76.5
+      parent: 2
+- proto: SpawnPointSeniorResearcher
+  entities:
+  - uid: 44840
+    components:
+    - type: Transform
+      pos: 53.5,-26.5
+      parent: 2
 - proto: SpawnPointServiceWorker
   entities:
   - uid: 42357
@@ -392610,7 +392638,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -139829.55
+      secondsUntilStateChange: -140003.8
       state: Opening
   - uid: 53257
     components:

diff --git a/Resources/Maps/ADTMaps/ADTStations/adt_bagel.yml b/Resources/Maps/ADTMaps/ADTStations/adt_bagel.yml
@@ -129285,6 +129285,34 @@ entities:
     - type: Transform
       pos: -33.5,-16.5
       parent: 2
+- proto: SpawnPointSeniorEngineer
+  entities:
+  - uid: 24523
+    components:
+    - type: Transform
+      pos: 0.5,18.5
+      parent: 2
+- proto: SpawnPointSeniorOfficer
+  entities:
+  - uid: 16247
+    components:
+    - type: Transform
+      pos: -32.5,-16.5
+      parent: 2
+- proto: SpawnPointSeniorPhysician
+  entities:
+  - uid: 24524
+    components:
+    - type: Transform
+      pos: 47.5,-10.5
+      parent: 2
+- proto: SpawnPointSeniorResearcher
+  entities:
+  - uid: 20347
+    components:
+    - type: Transform
+      pos: -43.5,-7.5
+      parent: 2
 - proto: SpawnPointServiceWorker
   entities:
   - uid: 19512

diff --git a/Resources/Maps/ADTMaps/ADTStations/adt_box.yml b/Resources/Maps/ADTMaps/ADTStations/adt_box.yml
@@ -492,7 +492,7 @@ entities:
     - type: Fixtures
       fixtures: {}
     - type: BecomesStation
-      id: Boxstation
+      id: ADT_Boxstation
     - type: Gravity
       gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg
@@ -11766,7 +11766,7 @@ entities:
       pos: 24.5,16.5
       parent: 8364
     - type: Door
-      secondsUntilStateChange: -4275.7197
+      secondsUntilStateChange: -4392.436
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -84675,7 +84675,7 @@ entities:
       pos: 41.5,-13.5
       parent: 8364
     - type: Door
-      secondsUntilStateChange: -888.1849
+      secondsUntilStateChange: -1004.901
       state: Closing
     - type: Firelock
       emergencyCloseCooldown: 53864.6889944
@@ -144617,6 +144617,34 @@ entities:
     - type: Transform
       pos: 9.5,37.5
       parent: 8364
+- proto: SpawnPointSeniorEngineer
+  entities:
+  - uid: 22454
+    components:
+    - type: Transform
+      pos: 5.5,-60.5
+      parent: 8364
+- proto: SpawnPointSeniorOfficer
+  entities:
+  - uid: 22455
+    components:
+    - type: Transform
+      pos: 9.5,36.5
+      parent: 8364
+- proto: SpawnPointSeniorPhysician
+  entities:
+  - uid: 22452
+    components:
+    - type: Transform
+      pos: 41.5,-27.5
+      parent: 8364
+- proto: SpawnPointSeniorResearcher
+  entities:
+  - uid: 22453
+    components:
+    - type: Transform
+      pos: 73.5,-26.5
+      parent: 8364
 - proto: SpawnPointServiceWorker
   entities:
   - uid: 6948