Merge 6bd5ff6327 into fd5b16abb3

Resources/Maps/edge.yml

@@ -1,92 +1,92 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 270.1.0
+  engineVersion: 275.2.1
   forkId: ""
   forkVersion: ""
-  time: 06/08/2026 03:11:45
-  entityCount: 20632
+  time: 07/19/2026 18:43:09
+  entityCount: 20633
 maps:
-- 1
+  - 1
 grids:
-- 2
+  - 2
 orphans: []
 nullspace: []
 tilemap:
-  0: Space
-  1: FloorArcadeBlue
-  2: FloorArcadeBlue2
-  20: FloorAstroGrass
-  14: FloorBar
-  17: FloorBlue
-  18: FloorBlueCircuit
-  11: FloorBoxing
-  7: FloorBrassFilled
-  8: FloorBrassReebe
-  13: FloorBrokenWood
-  23: FloorCarpetClown
-  24: FloorCarpetOffice
-  29: FloorConcrete
-  30: FloorConcreteMono
-  32: FloorDark
-  6: FloorDarkDiagonal
-  36: FloorDarkMini
-  37: FloorDarkMono
-  4: FloorDarkPavement
-  40: FloorDarkPavementVertical
-  41: FloorDarkPlastic
-  44: FloorEighties
-  47: FloorFreezer
-  48: FloorGlass
-  50: FloorGrass
-  53: FloorGrassLight
-  55: FloorGrayConcreteMono
-  57: FloorGreenCircuit
-  58: FloorGym
-  59: FloorHull
-  60: FloorHullReinforced
-  25: FloorHullReinforcedDestructible
-  61: FloorHydro
-  63: FloorKitchen
-  64: FloorLaundry
-  67: FloorMetalDiamond
-  22: FloorMetalWhite
-  68: FloorMime
-  21: FloorMiningDark
-  72: FloorMono
-  75: FloorOldConcreteSmooth
-  77: FloorPlanetGrass
-  79: FloorRGlass
-  80: FloorReinforced
-  81: FloorReinforcedHardened
-  83: FloorShowroom
-  87: FloorShuttleOrange
-  89: FloorShuttleRed
-  90: FloorShuttleWhite
-  94: FloorSteel
-  16: FloorSteelBurnt
-  96: FloorSteelCheckerDark
-  10: FloorSteelCheckerLight
-  15: FloorSteelDamaged
-  19: FloorSteelDiagonal
-  5: FloorSteelDiagonalMini
-  102: FloorSteelHerringbone
-  105: FloorSteelMono
-  107: FloorSteelPavement
-  108: FloorSteelPavementVertical
-  109: FloorTechMaint
-  110: FloorTechMaint2
-  111: FloorTechMaint3
-  113: FloorWhite
-  114: FloorWhiteDiagonal
-  122: FloorWhitePlastic
-  123: FloorWood
-  3: FloorWoodLarge
-  125: FloorWoodTile
-  126: Lattice
-  127: Plating
-  9: PlatingBrass
-  12: PlatingBurnt
+    0: Space
+    1: FloorArcadeBlue
+    2: FloorArcadeBlue2
+    20: FloorAstroGrass
+    14: FloorBar
+    17: FloorBlue
+    18: FloorBlueCircuit
+    11: FloorBoxing
+    7: FloorBrassFilled
+    8: FloorBrassReebe
+    13: FloorBrokenWood
+    23: FloorCarpetClown
+    24: FloorCarpetOffice
+    29: FloorConcrete
+    30: FloorConcreteMono
+    32: FloorDark
+    6: FloorDarkDiagonal
+    36: FloorDarkMini
+    37: FloorDarkMono
+    4: FloorDarkPavement
+    40: FloorDarkPavementVertical
+    41: FloorDarkPlastic
+    44: FloorEighties
+    47: FloorFreezer
+    48: FloorGlass
+    50: FloorGrass
+    53: FloorGrassLight
+    55: FloorGrayConcreteMono
+    57: FloorGreenCircuit
+    58: FloorGym
+    59: FloorHull
+    60: FloorHullReinforced
+    25: FloorHullReinforcedDestructible
+    61: FloorHydro
+    63: FloorKitchen
+    64: FloorLaundry
+    67: FloorMetalDiamond
+    22: FloorMetalWhite
+    68: FloorMime
+    21: FloorMiningDark
+    72: FloorMono
+    75: FloorOldConcreteSmooth
+    77: FloorPlanetGrass
+    79: FloorRGlass
+    80: FloorReinforced
+    81: FloorReinforcedHardened
+    83: FloorShowroom
+    87: FloorShuttleOrange
+    89: FloorShuttleRed
+    90: FloorShuttleWhite
+    94: FloorSteel
+    16: FloorSteelBurnt
+    96: FloorSteelCheckerDark
+    10: FloorSteelCheckerLight
+    15: FloorSteelDamaged
+    19: FloorSteelDiagonal
+    5: FloorSteelDiagonalMini
+    102: FloorSteelHerringbone
+    105: FloorSteelMono
+    107: FloorSteelPavement
+    108: FloorSteelPavementVertical
+    109: FloorTechMaint
+    110: FloorTechMaint2
+    111: FloorTechMaint3
+    113: FloorWhite
+    114: FloorWhiteDiagonal
+    122: FloorWhitePlastic
+    123: FloorWood
+    3: FloorWoodLarge
+    125: FloorWoodTile
+    126: Lattice
+    127: Plating
+    9: PlatingBrass
+    12: PlatingBurnt
 entities:
 - proto: ""
   entities:
@@ -8983,7 +8983,7 @@ entities:
       pos: -18.5,-26.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -109886.18
+      secondsUntilStateChange: -109999.93
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -15049,7 +15049,7 @@ entities:
     - type: Transform
       pos: 7.42894,12.590589
       parent: 2
-- proto: BoxPerformer
+- proto: BoxPerformerDV
   entities:
   - uid: 7618
     components:
@@ -41202,6 +41202,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -32.5,27.5
       parent: 2
+  - uid: 20633
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -33.5,38.5
+      parent: 2
 - proto: CarpetGreen
   entities:
   - uid: 5961
@@ -61595,6 +61601,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -8.5,43.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 11279
     components:
     - type: Transform
@@ -83148,6 +83156,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -7.5,43.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 7756
     components:
     - type: Transform
@@ -90641,13 +90651,6 @@ entities:
     - type: Transform
       pos: -53.451313,7.6062937
       parent: 2
-- proto: HatSpawner
-  entities:
-  - uid: 11636
-    components:
-    - type: Transform
-      pos: -38.5,17.5
-      parent: 2
 - proto: HighSecArmoryLocked
   entities:
   - uid: 1374
@@ -91491,8 +91494,8 @@ entities:
   - uid: 11699
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -9.5,40.5
+      rot: -1.5707963267948966 rad
+      pos: -5.5,41.5
       parent: 2
     - type: Fixtures
       fixtures: {}
@@ -91520,6 +91523,8 @@ entities:
     - type: Transform
       pos: -2.5,28.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: IntercomCommon
   entities:
   - uid: 7682
@@ -100273,6 +100278,13 @@ entities:
     - type: Transform
       pos: -6.5,22.5
       parent: 2
+- proto: RandomHatSpawner
+  entities:
+  - uid: 11636
+    components:
+    - type: Transform
+      pos: -38.5,17.5
+      parent: 2
 - proto: RandomItem
   entities:
   - uid: 12828

Resources/Prototypes/Maps/edge.yml

@@ -74,5 +74,4 @@
             ChiefJustice: [ 1, 1 ]
             Lawyer: [ 1, 1 ]
             Prosecutor: [ 1, 1 ]
-            Clerk: [ 1, 1 ]
-
+            Clerk: [ 1, 1 ]