weh (#452)

weh
2024-10-03 22:00:08 +03:00 · 2024-10-03 22:00:08 +03:00 · aa0639664c
commit aa0639664c
parent f47ba89a2f
1 changed files with 394 additions and 111 deletions
--- a/Resources/Maps/_Sunrise/Station/delta.yml
+++ b/Resources/Maps/_Sunrise/Station/delta.yml
@ -54,6 +54,7 @@ tilemap:
  78: FloorPlanetDirt
  80: FloorPlastic
  81: FloorRGlass
+  34: FloorRedCircuit
  82: FloorReinforced
  84: FloorRockVault
  85: FloorShowroom
@ -108,6 +109,7 @@ entities:
  - uid: 2
    components:
    - type: MetaData
+      name: Delta Station
    - type: Transform
      rot: -1.0182609457842773E-06 rad
      pos: 0.102573395,0.85894775
@ -624,7 +626,7 @@ entities:
          version: 6
        -8,1:
          ind: -8,1
-          tiles: AAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAEgAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAEgAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAEgAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAA
+          tiles: AAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAEgAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAEgAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAEgAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAEgAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAA
          version: 6
        -8,0:
          ind: -8,0
@ -30919,6 +30921,15 @@ entities:
    - type: Transform
      pos: -26.5,81.5
      parent: 2
+- proto: ArtistCircuitBoard
+  entities:
+  - uid: 24241
+    components:
+    - type: Transform
+      parent: 24236
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: Ashtray
  entities:
  - uid: 1039
@ -30937,6 +30948,14 @@ entities:
    - type: Transform
      pos: 59.481647,27.637602
      parent: 2
+- proto: AsimovCircuitBoard
+  entities:
+  - uid: 24261
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.579023,-38.098583
+      parent: 2
 - proto: AtmosDeviceFanTiny
  entities:
  - uid: 1043
@ -31669,11 +31688,6 @@ entities:
    - type: Transform
      pos: -20.5,-53.5
      parent: 2
-  - uid: 1161
-    components:
-    - type: Transform
-      pos: -19.5,-53.5
-      parent: 2
  - uid: 1162
    components:
    - type: Transform
@ -31684,6 +31698,11 @@ entities:
    - type: Transform
      pos: -20.5,-52.5
      parent: 2
+  - uid: 24235
+    components:
+    - type: Transform
+      pos: -19.5,-53.5
+      parent: 2
 - proto: AtmosFixNitrogenMarker
  entities:
  - uid: 4161
@ -32507,11 +32526,6 @@ entities:
      rot: 1.5707963267948966 rad
      pos: -122.5,19.5
      parent: 2
-  - uid: 1328
-    components:
-    - type: Transform
-      pos: -118.5,46.5
-      parent: 2
  - uid: 23757
    components:
    - type: Transform
@ -68872,6 +68886,16 @@ entities:
    - type: Transform
      pos: 12.5,7.5
      parent: 2
+  - uid: 24252
+    components:
+    - type: Transform
+      pos: -122.5,49.5
+      parent: 2
+  - uid: 24253
+    components:
+    - type: Transform
+      pos: -114.5,49.5
+      parent: 2
 - proto: CableApcStack
  entities:
  - uid: 7721
@ -110998,11 +111022,6 @@ entities:
    - type: Transform
      pos: 71.65119,-17.641798
      parent: 2
-  - uid: 14934
-    components:
-    - type: Transform
-      pos: -2.5151298,0.75684786
-      parent: 2
 - proto: ClothingHeadHatHardhatBlue
  entities:
  - uid: 14935
@ -112908,6 +112927,15 @@ entities:
      rot: 1.5707963267948966 rad
      pos: -13.5,9.5
      parent: 2
+- proto: CommandmentCircuitBoard
+  entities:
+  - uid: 24244
+    components:
+    - type: Transform
+      parent: 24236
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: CommsComputerCircuitboard
  entities:
  - uid: 15210
@ -113284,23 +113312,11 @@ entities:
      rot: 3.141592653589793 rad
      pos: -13.5,-1.5
      parent: 2
-  - uid: 15271
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -122.5,45.5
-      parent: 2
  - uid: 15272
    components:
    - type: Transform
      pos: 47.5,-33.5
      parent: 2
-  - uid: 15273
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -114.5,45.5
-      parent: 2
 - proto: ComputerId
  entities:
  - uid: 15274
@ -113478,6 +113494,12 @@ entities:
      parent: 2
 - proto: ComputerRoboticsControl
  entities:
+  - uid: 15271
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -122.5,45.5
+      parent: 2
  - uid: 15302
    components:
    - type: Transform
@ -113980,6 +114002,14 @@ entities:
      rot: -1.5707963267948966 rad
      pos: 27.5,46.5
      parent: 2
+- proto: CorporateCircuitBoard
+  entities:
+  - uid: 24262
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.468489,-38.378002
+      parent: 2
 - proto: CounterWoodFrame
  entities:
  - uid: 4497
@ -115123,6 +115153,49 @@ entities:
    - type: Transform
      pos: 9.5,43.5
      parent: 2
+- proto: CrateScienceSecure
+  entities:
+  - uid: 24236
+    components:
+    - type: Transform
+      pos: -118.5,50.5
+      parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 24237
+          - 24238
+          - 24239
+          - 24240
+          - 24241
+          - 24242
+          - 24243
+          - 24244
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
 - proto: CrateSecurityRiot
  entities:
  - uid: 15495
@ -115373,14 +115446,11 @@ entities:
      parent: 2
 - proto: CrewMonitoringServer
  entities:
-  - uid: 15522
+  - uid: 15374
    components:
    - type: Transform
-      pos: -4.5,7.5
+      pos: -20.5,-53.5
      parent: 2
-    - type: SingletonDeviceNetServer
-      active: False
-      available: False
 - proto: Crowbar
  entities:
  - uid: 15523
@ -125759,6 +125829,15 @@ entities:
    - type: Transform
      pos: -34.520683,47.5052
      parent: 2
+- proto: DungeonMasterCircuitBoard
+  entities:
+  - uid: 24243
+    components:
+    - type: Transform
+      parent: 24236
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: Eggshells
  entities:
  - uid: 23883
@ -127710,10 +127789,10 @@ entities:
      parent: 2
 - proto: EncryptionKeyCommand
  entities:
-  - uid: 8665
+  - uid: 23809
    components:
    - type: Transform
-      parent: 33942
+      parent: 14934
    - type: Physics
      canCollide: False
 - proto: EpinephrineChemistryBottle
@ -176306,6 +176385,12 @@ entities:
      parent: 2
 - proto: IntercomService
  entities:
+  - uid: 24265
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,31.5
+      parent: 2
  - uid: 27044
    components:
    - type: Transform
@ -176318,12 +176403,6 @@ entities:
      rot: 3.141592653589793 rad
      pos: -11.5,35.5
      parent: 2
-  - uid: 27046
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -7.5,32.5
-      parent: 2
 - proto: IntercomSupply
  entities:
  - uid: 27047
@ -177300,6 +177379,15 @@ entities:
    - type: Transform
      pos: -45.5,25.5
      parent: 2
+- proto: LiveLetLiveCircuitBoard
+  entities:
+  - uid: 24238
+    components:
+    - type: Transform
+      parent: 24236
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: LockableButtonArmory
  entities:
  - uid: 27196
@ -181207,6 +181295,14 @@ entities:
      rot: -1.5707963267948966 rad
      pos: -30.5,-39.5
      parent: 2
+- proto: NTDefaultCircuitBoard
+  entities:
+  - uid: 24263
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.343672,-38.593395
+      parent: 2
 - proto: NTFlag
  entities:
  - uid: 27558
@ -181231,6 +181327,15 @@ entities:
    - type: Transform
      pos: -3.5,38.5
      parent: 2
+- proto: NutimovCircuitBoard
+  entities:
+  - uid: 24242
+    components:
+    - type: Transform
+      parent: 24236
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: Ointment
  entities:
  - uid: 27561
@ -181479,6 +181584,15 @@ entities:
    - type: Transform
      pos: 14.5,-2.5
      parent: 2
+- proto: PaladinCircuitBoard
+  entities:
+  - uid: 24240
+    components:
+    - type: Transform
+      parent: 24236
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: Paper
  entities:
  - uid: 13
@ -186550,6 +186664,18 @@ entities:
      rot: 1.5707963267948966 rad
      pos: -64.5,57.5
      parent: 2
+  - uid: 24246
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -122.5,48.5
+      parent: 2
+  - uid: 24247
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -114.5,48.5
+      parent: 2
  - uid: 28318
    components:
    - type: Transform
@ -201966,10 +202092,10 @@ entities:
      parent: 2
 - proto: ResearchAndDevelopmentServer
  entities:
-  - uid: 31026
+  - uid: 15522
    components:
    - type: Transform
-      pos: -19.5,-53.5
+      pos: -18.5,-53.5
      parent: 2
 - proto: ResearchDisk
  entities:
@ -202030,6 +202156,15 @@ entities:
    - type: Transform
      pos: 71.30472,-4.411479
      parent: 2
+- proto: RobocopCircuitBoard
+  entities:
+  - uid: 24237
+    components:
+    - type: Transform
+      parent: 24236
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: RockGuitarInstrument
  entities:
  - uid: 6287
@ -206441,6 +206576,13 @@ entities:
      rot: 3.141592653589793 rad
      pos: 48.5,20.5
      parent: 2
+- proto: SignServer
+  entities:
+  - uid: 1161
+    components:
+    - type: Transform
+      pos: -17.5,-49.5
+      parent: 2
 - proto: SignShipDock
  entities:
  - uid: 31676
@ -209278,6 +209420,13 @@ entities:
    - type: Transform
      pos: 7.5,-29.5
      parent: 2
+- proto: SpawnPointAdjutant
+  entities:
+  - uid: 23810
+    components:
+    - type: Transform
+      pos: -0.5,13.5
+      parent: 2
 - proto: SpawnPointAtmos
  entities:
  - uid: 32190
@ -209586,10 +209735,10 @@ entities:
    - type: Transform
      pos: -25.5,-14.5
      parent: 2
-  - uid: 32239
+  - uid: 24264
    components:
    - type: Transform
-      pos: -8.5,32.5
+      pos: -9.5,29.5
      parent: 2
 - proto: SpawnPointObserver
  entities:
@ -210593,12 +210742,20 @@ entities:
    - type: Transform
      pos: 25.5,-30.5
      parent: 2
- proto: StationAiUploadComputer
+- proto: StationAiUploadCircuitboard
  entities:
-  - uid: 23809
+  - uid: 8665
    components:
    - type: Transform
-      pos: -118.5,50.5
+      pos: -2.509299,0.6991937
+      parent: 2
+- proto: StationAiUploadComputer
+  entities:
+  - uid: 15273
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -114.5,45.5
      parent: 2
 - proto: StationBeaconPart
  entities:
@ -210607,6 +210764,15 @@ entities:
    - type: Transform
      pos: 6.838708,-16.288786
      parent: 2
+- proto: StationEfficiencyCircuitBoard
+  entities:
+  - uid: 24239
+    components:
+    - type: Transform
+      parent: 24236
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: StationGoalPaper
  entities:
  - uid: 1654
@ -212188,6 +212354,23 @@ entities:
    - type: Transform
      pos: -118.5,17.5
      parent: 2
+  - uid: 24245
+    components:
+    - type: Transform
+      pos: -118.5,28.5
+      parent: 2
+  - uid: 24254
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -118.5,26.5
+      parent: 2
+  - uid: 24255
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -118.5,43.5
+      parent: 2
  - uid: 32668
    components:
    - type: Transform
@ -212300,6 +212483,28 @@ entities:
      rot: 1.5707963267948966 rad
      pos: -45.5,53.5
      parent: 2
+  - uid: 24260
+    components:
+    - type: Transform
+      pos: -47.5,17.5
+      parent: 2
+  - uid: 24266
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -70.5,2.5
+      parent: 2
+  - uid: 24267
+    components:
+    - type: Transform
+      pos: -77.5,-9.5
+      parent: 2
+  - uid: 24268
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -46.5,2.5
+      parent: 2
  - uid: 32680
    components:
    - type: Transform
@ -212525,6 +212730,12 @@ entities:
      rot: 1.5707963267948966 rad
      pos: 45.5,-12.5
      parent: 2
+  - uid: 24270
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-7.5
+      parent: 2
  - uid: 32700
    components:
    - type: Transform
@ -212994,6 +213205,12 @@ entities:
      id: Коридор (восток)
 - proto: SurveillanceCameraMedical
  entities:
+  - uid: 24271
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 27.5,-28.5
+      parent: 2
  - uid: 32748
    components:
    - type: Transform
@ -213815,6 +214032,11 @@ entities:
      rot: 3.141592653589793 rad
      pos: 23.5,54.5
      parent: 2
+  - uid: 24269
+    components:
+    - type: Transform
+      pos: 13.5,26.5
+      parent: 2
  - uid: 32826
    components:
    - type: Transform
@ -219730,28 +219952,6 @@ entities:
    - type: Transform
      pos: -4.5,4.5
      parent: 2
- proto: TelecomServerFilledCommand
-  entities:
-  - uid: 33942
-    components:
-    - type: Transform
-      pos: -2.5,10.5
-      parent: 2
-    - type: ContainerContainer
-      containers:
-        key_slots: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 8665
-        machine_board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        machine_parts: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
 - proto: TelecomServerFilledCommon
  entities:
  - uid: 33943
@ -219766,6 +219966,28 @@ entities:
    - type: Transform
      pos: -4.5,10.5
      parent: 2
+- proto: TelecomServerFilledLaw
+  entities:
+  - uid: 14934
+    components:
+    - type: Transform
+      pos: -2.5,10.5
+      parent: 2
+    - type: ContainerContainer
+      containers:
+        key_slots: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 23809
+        machine_board: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        machine_parts: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
 - proto: TelecomServerFilledMedical
  entities:
  - uid: 33945
@ -219782,7 +220004,7 @@ entities:
      parent: 2
 - proto: TelecomServerFilledSecurity
  entities:
-  - uid: 33947
+  - uid: 24256
    components:
    - type: Transform
      pos: -2.5,4.5
@ -221259,6 +221481,13 @@ entities:
    - type: Transform
      pos: -9.5,34.5
      parent: 2
+- proto: VendingMachineClown
+  entities:
+  - uid: 24257
+    components:
+    - type: Transform
+      pos: -8.5,34.5
+      parent: 2
 - proto: VendingMachineCoffee
  entities:
  - uid: 34170
@ -221684,16 +221913,16 @@ entities:
    - type: Transform
      pos: 35.5,-16.5
      parent: 2
+  - uid: 23812
+    components:
+    - type: Transform
+      pos: -8.5,32.5
+      parent: 2
  - uid: 34235
    components:
    - type: Transform
      pos: 40.5,-49.5
      parent: 2
-  - uid: 34236
-    components:
-    - type: Transform
-      pos: -8.5,34.5
-      parent: 2
  - uid: 34238
    components:
    - type: Transform
@ -222965,6 +223194,12 @@ entities:
      rot: 1.5707963267948966 rad
      pos: 30.5,46.5
      parent: 2
+  - uid: 22916
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -112.5,26.5
+      parent: 2
  - uid: 23281
    components:
    - type: Transform
@ -237058,11 +237293,6 @@ entities:
    - type: Transform
      pos: -113.5,27.5
      parent: 2
-  - uid: 37130
-    components:
-    - type: Transform
-      pos: -112.5,26.5
-      parent: 2
  - uid: 37131
    components:
    - type: Transform
@ -248714,33 +248944,70 @@ entities:
    - type: Transform
      pos: 65.5,7.5
      parent: 2
- proto: WeaponTurretNanoTrasen
+- proto: WeaponTurretHostile
  entities:
-  - uid: 23810
+  - uid: 1328
    components:
    - type: Transform
-      pos: -114.5,50.5
+      pos: -121.5,40.5
      parent: 2
+    - type: Gun
+      fireRate: 3
+    - type: BallisticAmmoProvider
+      proto: BulletDisabler
  - uid: 23811
+    components:
+    - type: Transform
+      pos: -113.5,26.5
+      parent: 2
+    - type: Gun
+      fireRate: 3
+    - type: BallisticAmmoProvider
+      proto: BulletDisabler
+  - uid: 24232
+    components:
+    - type: Transform
+      pos: -115.5,40.5
+      parent: 2
+    - type: Gun
+      fireRate: 3
+    - type: BallisticAmmoProvider
+      proto: BulletDisabler
+  - uid: 24233
+    components:
+    - type: Transform
+      pos: -115.5,36.5
+      parent: 2
+    - type: Gun
+      fireRate: 3
+    - type: BallisticAmmoProvider
+      proto: BulletDisabler
+  - uid: 24234
+    components:
+    - type: Transform
+      pos: -121.5,36.5
+      parent: 2
+    - type: Gun
+      fireRate: 3
+    - type: BallisticAmmoProvider
+      proto: BulletDisabler
+  - uid: 24258
    components:
    - type: Transform
      pos: -122.5,50.5
      parent: 2
-  - uid: 23812
+  - uid: 24259
    components:
    - type: Transform
-      pos: -118.5,26.5
+      pos: -114.5,50.5
      parent: 2
+- proto: WeaponTurretNanoTrasen
+  entities:
  - uid: 23813
    components:
    - type: Transform
      pos: -120.5,19.5
      parent: 2
-  - uid: 23814
-    components:
-    - type: Transform
-      pos: -113.5,26.5
-      parent: 2
  - uid: 23815
    components:
    - type: Transform
@ -248753,36 +249020,16 @@ entities:
    - type: Transform
      pos: -47.5,-37.5
      parent: 2
-  - uid: 39281
-    components:
-    - type: Transform
-      pos: -115.5,40.5
-      parent: 2
  - uid: 39282
    components:
    - type: Transform
      pos: -37.5,-27.5
      parent: 2
-  - uid: 39283
-    components:
-    - type: Transform
-      pos: -121.5,40.5
-      parent: 2
-  - uid: 39284
-    components:
-    - type: Transform
-      pos: -121.5,36.5
-      parent: 2
  - uid: 39286
    components:
    - type: Transform
      pos: -43.5,-38.5
      parent: 2
-  - uid: 39287
-    components:
-    - type: Transform
-      pos: -115.5,36.5
-      parent: 2
  - uid: 39291
    components:
    - type: Transform
@ -249355,6 +249602,42 @@ entities:
      parent: 2
 - proto: WindoorSecureCommandLocked
  entities:
+  - uid: 22913
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -114.5,26.5
+      parent: 2
+  - uid: 23814
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -113.5,25.5
+      parent: 2
+  - uid: 24248
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -122.5,49.5
+      parent: 2
+  - uid: 24249
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -121.5,50.5
+      parent: 2
+  - uid: 24250
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -114.5,49.5
+      parent: 2
+  - uid: 24251
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -115.5,50.5
+      parent: 2
  - uid: 39392
    components:
    - type: Transform