diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/lockers/security.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/lockers/security.ftl
index 0dc8880635..b01f04c32a 100644
--- a/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/lockers/security.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/lockers/security.ftl
@@ -28,9 +28,6 @@ ent-GunSafeShotgunSPAS12 = safe
 ent-GunSafeEnergyGunPistolSecurity = safe
     .suffix = Energy Pistol «Judge»
     .desc = { ent-GunSafe.desc }
-ent-GunSafeCombineSmallArms = safe
-    .suffix = Energy Pistol/Glock22
-    .desc = { ent-GunSafe.desc }
 ent-GunSafeEnergyGun = safe
     .suffix = Tactical Energy guns
     .desc = { ent-GunSafe.desc }
diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/smgs/smgs.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/smgs/smgs.ftl
index 113bbd3b39..70c3165e6b 100644
--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/smgs/smgs.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/smgs/smgs.ftl
@@ -1,5 +1,3 @@
-ent-BaseWeaponSMGSunrise = BaseWeaponSMGSunrise
-    .desc = A rooty tooty point and shooty.
 ent-WeaponSubMachineGunP90 = P-90
     .desc = { ent-BaseWeaponSubMachineGun.desc }
 ent-WeaponSubMachineGunMP38 = MP-38
diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/lockers/security.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/lockers/security.ftl
index 5cadb5993b..ddf2782269 100644
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/lockers/security.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/lockers/security.ftl
@@ -28,9 +28,6 @@ ent-GunSafeShotgunSPAS12 = сейф LAW-12
 ent-GunSafeEnergyGunPistolSecurity = сейф энергетических пистолетов "Судья"
     .suffix = Санрайз
     .desc = { ent-GunSafe.desc }
-ent-GunSafeCombineSmallArms = сейф вторичное вооружение
-    .suffix = Энергетический пистолет/Glock22
-    .desc = { ent-GunSafe.desc }
 ent-GunSafeEnergyGun = сейф Тактических энергетических пушек
     .suffix = Санрайз
     .desc = { ent-GunSafe.desc }
diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/smgs/smgs.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/smgs/smgs.ftl
index 37fad885cc..bc759c3e14 100644
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/smgs/smgs.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/smgs/smgs.ftl
@@ -1,5 +1,3 @@
-ent-BaseWeaponSMGSunrise = пистолет-пулемёт
-    .desc = Компактный и мощный.
 ent-WeaponSubMachineGunP90 = P-90
     .desc = P-90 - это SMG стандартного выпуска EarthGov. Он известен своими компактными размерами и простотой использования в полевых условиях. Использует патрон калибра .35 авто.
 ent-WeaponSubMachineGunMP38 = MP-38
diff --git a/Resources/Maps/_Sunrise/Station/delta.yml b/Resources/Maps/_Sunrise/Station/delta.yml
index 05699be580..d90cb7d3ed 100644
--- a/Resources/Maps/_Sunrise/Station/delta.yml
+++ b/Resources/Maps/_Sunrise/Station/delta.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 262.0.0
+  engineVersion: 266.0.0
   forkId: sunrise_station
   forkVersion: 7faaefa7a5eef1f24aca57740e61243a82607f41
-  time: 08/13/2025 05:42:49
-  entityCount: 42932
+  time: 08/14/2025 12:38:24
+  entityCount: 42911
 maps:
 - 1
 grids:
@@ -28557,7 +28557,8 @@ entities:
           17,6:
             0: 65532
           17,3:
-            0: 56729
+            0: 56457
+            9: 272
           18,4:
             0: 47629
           18,5:
@@ -29347,6 +29348,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.6852
+          - 81.57766
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         chunkSize: 4
     - type: OccluderTree
     - type: Shuttle
@@ -29540,6 +29556,8 @@ entities:
       - 25689
       - 25690
       - 25691
+    - type: Fixtures
+      fixtures: {}
   - uid: 41
     components:
     - type: Transform
@@ -29560,6 +29578,8 @@ entities:
       - 20464
       - 25751
       - 25542
+    - type: Fixtures
+      fixtures: {}
   - uid: 42
     components:
     - type: Transform
@@ -29576,6 +29596,8 @@ entities:
       - 20350
       - 20223
       - 20224
+    - type: Fixtures
+      fixtures: {}
   - uid: 43
     components:
     - type: Transform
@@ -29594,6 +29616,8 @@ entities:
       - 20404
       - 20531
       - 20454
+    - type: Fixtures
+      fixtures: {}
   - uid: 44
     components:
     - type: Transform
@@ -29613,6 +29637,8 @@ entities:
       - 839
       - 20363
       - 20491
+    - type: Fixtures
+      fixtures: {}
   - uid: 45
     components:
     - type: Transform
@@ -29626,6 +29652,8 @@ entities:
       - 20532
       - 20368
       - 20422
+    - type: Fixtures
+      fixtures: {}
   - uid: 46
     components:
     - type: Transform
@@ -29647,6 +29675,8 @@ entities:
       - 859
       - 20424
       - 20570
+    - type: Fixtures
+      fixtures: {}
   - uid: 47
     components:
     - type: Transform
@@ -29657,6 +29687,8 @@ entities:
       devices:
       - 25609
       - 849
+    - type: Fixtures
+      fixtures: {}
   - uid: 48
     components:
     - type: Transform
@@ -29669,6 +29701,8 @@ entities:
       - 25602
       - 25604
       - 945
+    - type: Fixtures
+      fixtures: {}
   - uid: 49
     components:
     - type: Transform
@@ -29689,6 +29723,8 @@ entities:
       - 20414
       - 20418
       - 20483
+    - type: Fixtures
+      fixtures: {}
   - uid: 50
     components:
     - type: Transform
@@ -29703,6 +29739,8 @@ entities:
       - 25766
       - 25765
       - 25551
+    - type: Fixtures
+      fixtures: {}
   - uid: 51
     components:
     - type: Transform
@@ -29714,6 +29752,8 @@ entities:
       - 25606
       - 20474
       - 20532
+    - type: Fixtures
+      fixtures: {}
   - uid: 52
     components:
     - type: Transform
@@ -29728,6 +29768,8 @@ entities:
       - 25586
       - 20485
       - 20450
+    - type: Fixtures
+      fixtures: {}
   - uid: 53
     components:
     - type: Transform
@@ -29746,6 +29788,8 @@ entities:
       - 20387
       - 20373
       - 20391
+    - type: Fixtures
+      fixtures: {}
   - uid: 54
     components:
     - type: Transform
@@ -29760,6 +29804,8 @@ entities:
       - 20491
       - 20417
       - 20546
+    - type: Fixtures
+      fixtures: {}
   - uid: 55
     components:
     - type: Transform
@@ -29772,6 +29818,8 @@ entities:
       - 852
       - 20657
       - 20659
+    - type: Fixtures
+      fixtures: {}
   - uid: 56
     components:
     - type: Transform
@@ -29783,12 +29831,16 @@ entities:
       - 25826
       - 20369
       - 20368
+    - type: Fixtures
+      fixtures: {}
   - uid: 57
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 33.5,-42.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 58
     components:
     - type: Transform
@@ -29807,6 +29859,8 @@ entities:
       - 20521
       - 20412
       - 20409
+    - type: Fixtures
+      fixtures: {}
   - uid: 59
     components:
     - type: Transform
@@ -29819,6 +29873,8 @@ entities:
       - 20370
       - 20474
       - 20371
+    - type: Fixtures
+      fixtures: {}
   - uid: 60
     components:
     - type: Transform
@@ -29829,6 +29885,8 @@ entities:
       - 25625
       - 25841
       - 869
+    - type: Fixtures
+      fixtures: {}
   - uid: 61
     components:
     - type: Transform
@@ -29849,6 +29907,8 @@ entities:
       - 831
       - 25545
       - 25756
+    - type: Fixtures
+      fixtures: {}
   - uid: 62
     components:
     - type: Transform
@@ -29864,6 +29924,8 @@ entities:
       - 25603
       - 25821
       - 25599
+    - type: Fixtures
+      fixtures: {}
   - uid: 63
     components:
     - type: Transform
@@ -29887,6 +29949,8 @@ entities:
       - 20439
       - 20572
       - 20527
+    - type: Fixtures
+      fixtures: {}
   - uid: 64
     components:
     - type: Transform
@@ -29902,6 +29966,8 @@ entities:
       - 20357
       - 20354
       - 846
+    - type: Fixtures
+      fixtures: {}
   - uid: 65
     components:
     - type: Transform
@@ -29918,6 +29984,8 @@ entities:
       - 20390
       - 20537
       - 20541
+    - type: Fixtures
+      fixtures: {}
   - uid: 66
     components:
     - type: Transform
@@ -29933,6 +30001,8 @@ entities:
       - 20405
       - 25807
       - 25556
+    - type: Fixtures
+      fixtures: {}
   - uid: 67
     components:
     - type: Transform
@@ -29945,6 +30015,8 @@ entities:
       - 850
       - 20656
       - 20658
+    - type: Fixtures
+      fixtures: {}
   - uid: 68
     components:
     - type: Transform
@@ -29957,6 +30029,8 @@ entities:
       - 20506
       - 20554
       - 25812
+    - type: Fixtures
+      fixtures: {}
   - uid: 69
     components:
     - type: Transform
@@ -29977,6 +30051,8 @@ entities:
       - 25503
       - 25505
       - 947
+    - type: Fixtures
+      fixtures: {}
   - uid: 70
     components:
     - type: Transform
@@ -29999,6 +30075,8 @@ entities:
       - 20655
       - 25908
       - 25909
+    - type: Fixtures
+      fixtures: {}
   - uid: 71
     components:
     - type: Transform
@@ -30011,6 +30089,8 @@ entities:
       - 25627
       - 25909
       - 25908
+    - type: Fixtures
+      fixtures: {}
   - uid: 72
     components:
     - type: Transform
@@ -30019,6 +30099,8 @@ entities:
     - type: DeviceList
       devices:
       - 25626
+    - type: Fixtures
+      fixtures: {}
   - uid: 73
     components:
     - type: Transform
@@ -30027,6 +30109,8 @@ entities:
     - type: DeviceList
       devices:
       - 25619
+    - type: Fixtures
+      fixtures: {}
   - uid: 74
     components:
     - type: Transform
@@ -30041,6 +30125,8 @@ entities:
       - 20546
       - 20417
       - 20570
+    - type: Fixtures
+      fixtures: {}
   - uid: 75
     components:
     - type: Transform
@@ -30051,6 +30137,8 @@ entities:
       devices:
       - 25623
       - 25838
+    - type: Fixtures
+      fixtures: {}
   - uid: 76
     components:
     - type: Transform
@@ -30062,6 +30150,8 @@ entities:
       - 25840
       - 25624
       - 868
+    - type: Fixtures
+      fixtures: {}
   - uid: 77
     components:
     - type: Transform
@@ -30079,6 +30169,8 @@ entities:
       - 20548
       - 20443
       - 20442
+    - type: Fixtures
+      fixtures: {}
   - uid: 78
     components:
     - type: Transform
@@ -30090,6 +30182,8 @@ entities:
       - 25622
       - 865
       - 25910
+    - type: Fixtures
+      fixtures: {}
   - uid: 79
     components:
     - type: Transform
@@ -30101,6 +30195,8 @@ entities:
       - 25839
       - 25621
       - 866
+    - type: Fixtures
+      fixtures: {}
   - uid: 80
     components:
     - type: Transform
@@ -30109,6 +30205,8 @@ entities:
     - type: DeviceList
       devices:
       - 25842
+    - type: Fixtures
+      fixtures: {}
   - uid: 81
     components:
     - type: Transform
@@ -30126,6 +30224,8 @@ entities:
       - 20493
       - 20436
       - 20438
+    - type: Fixtures
+      fixtures: {}
   - uid: 82
     components:
     - type: Transform
@@ -30139,6 +30239,8 @@ entities:
       - 20438
       - 25745
       - 25536
+    - type: Fixtures
+      fixtures: {}
   - uid: 83
     components:
     - type: Transform
@@ -30162,6 +30264,8 @@ entities:
       - 20526
       - 855
       - 856
+    - type: Fixtures
+      fixtures: {}
   - uid: 84
     components:
     - type: Transform
@@ -30181,6 +30285,8 @@ entities:
       - 823
       - 25744
       - 25534
+    - type: Fixtures
+      fixtures: {}
   - uid: 85
     components:
     - type: Transform
@@ -30193,6 +30299,8 @@ entities:
       - 25620
       - 867
       - 25894
+    - type: Fixtures
+      fixtures: {}
   - uid: 86
     components:
     - type: Transform
@@ -30213,6 +30321,8 @@ entities:
       - 20552
       - 20497
       - 20514
+    - type: Fixtures
+      fixtures: {}
   - uid: 87
     components:
     - type: Transform
@@ -30239,6 +30349,8 @@ entities:
       - 25882
       - 902
       - 25870
+    - type: Fixtures
+      fixtures: {}
   - uid: 88
     components:
     - type: Transform
@@ -30259,6 +30371,8 @@ entities:
       - 20489
       - 20510
       - 20460
+    - type: Fixtures
+      fixtures: {}
   - uid: 89
     components:
     - type: Transform
@@ -30280,6 +30394,8 @@ entities:
       - 25777
       - 854
       - 853
+    - type: Fixtures
+      fixtures: {}
   - uid: 90
     components:
     - type: Transform
@@ -30297,6 +30413,8 @@ entities:
       - 20557
       - 20370
       - 845
+    - type: Fixtures
+      fixtures: {}
   - uid: 91
     components:
     - type: Transform
@@ -30321,6 +30439,8 @@ entities:
       - 20708
       - 20706
       - 20296
+    - type: Fixtures
+      fixtures: {}
   - uid: 92
     components:
     - type: Transform
@@ -30344,6 +30464,8 @@ entities:
       - 20351
       - 25544
       - 870
+    - type: Fixtures
+      fixtures: {}
   - uid: 93
     components:
     - type: Transform
@@ -30358,6 +30480,8 @@ entities:
       - 20399
       - 25605
       - 25825
+    - type: Fixtures
+      fixtures: {}
   - uid: 94
     components:
     - type: Transform
@@ -30374,6 +30498,8 @@ entities:
       - 20515
       - 20393
       - 20498
+    - type: Fixtures
+      fixtures: {}
   - uid: 95
     components:
     - type: Transform
@@ -30394,6 +30520,8 @@ entities:
       - 20498
       - 20393
       - 20515
+    - type: Fixtures
+      fixtures: {}
   - uid: 96
     components:
     - type: Transform
@@ -30410,6 +30538,8 @@ entities:
       - 25848
       - 25632
       - 25633
+    - type: Fixtures
+      fixtures: {}
   - uid: 97
     components:
     - type: Transform
@@ -30423,6 +30553,8 @@ entities:
       - 20347
       - 25567
       - 25779
+    - type: Fixtures
+      fixtures: {}
   - uid: 98
     components:
     - type: Transform
@@ -30442,6 +30574,8 @@ entities:
       - 20639
       - 20643
       - 916
+    - type: Fixtures
+      fixtures: {}
   - uid: 99
     components:
     - type: Transform
@@ -30455,6 +30589,8 @@ entities:
       - 880
       - 25737
       - 20218
+    - type: Fixtures
+      fixtures: {}
   - uid: 100
     components:
     - type: Transform
@@ -30468,11 +30604,15 @@ entities:
       - 25518
       - 873
       - 25856
+    - type: Fixtures
+      fixtures: {}
   - uid: 101
     components:
     - type: Transform
       pos: 58.5,13.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 102
     components:
     - type: Transform
@@ -30484,6 +30624,8 @@ entities:
       - 25857
       - 25641
       - 879
+    - type: Fixtures
+      fixtures: {}
   - uid: 103
     components:
     - type: Transform
@@ -30493,12 +30635,16 @@ entities:
       devices:
       - 25730
       - 20331
+    - type: Fixtures
+      fixtures: {}
   - uid: 104
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 49.5,34.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 105
     components:
     - type: Transform
@@ -30516,6 +30662,8 @@ entities:
       - 25520
       - 20221
       - 20220
+    - type: Fixtures
+      fixtures: {}
   - uid: 106
     components:
     - type: Transform
@@ -30532,6 +30680,8 @@ entities:
       - 20608
       - 20605
       - 20607
+    - type: Fixtures
+      fixtures: {}
   - uid: 107
     components:
     - type: Transform
@@ -30544,6 +30694,8 @@ entities:
       - 25522
       - 25859
       - 884
+    - type: Fixtures
+      fixtures: {}
   - uid: 108
     components:
     - type: Transform
@@ -30563,6 +30715,8 @@ entities:
       - 20577
       - 20338
       - 20576
+    - type: Fixtures
+      fixtures: {}
   - uid: 109
     components:
     - type: Transform
@@ -30572,6 +30726,8 @@ entities:
       devices:
       - 25644
       - 889
+    - type: Fixtures
+      fixtures: {}
   - uid: 110
     components:
     - type: Transform
@@ -30585,6 +30741,8 @@ entities:
       - 20343
       - 20221
       - 20219
+    - type: Fixtures
+      fixtures: {}
   - uid: 111
     components:
     - type: Transform
@@ -30594,6 +30752,8 @@ entities:
       devices:
       - 25861
       - 25643
+    - type: Fixtures
+      fixtures: {}
   - uid: 112
     components:
     - type: Transform
@@ -30608,6 +30768,8 @@ entities:
       - 944
       - 25935
       - 25711
+    - type: Fixtures
+      fixtures: {}
   - uid: 113
     components:
     - type: Transform
@@ -30619,6 +30781,8 @@ entities:
       - 25519
       - 20574
       - 20337
+    - type: Fixtures
+      fixtures: {}
   - uid: 114
     components:
     - type: Transform
@@ -30630,6 +30794,8 @@ entities:
       - 20340
       - 25638
       - 25517
+    - type: Fixtures
+      fixtures: {}
   - uid: 115
     components:
     - type: Transform
@@ -30640,6 +30806,8 @@ entities:
       devices:
       - 20342
       - 20341
+    - type: Fixtures
+      fixtures: {}
   - uid: 116
     components:
     - type: Transform
@@ -30653,11 +30821,15 @@ entities:
       - 25564
       - 25775
       - 25776
+    - type: Fixtures
+      fixtures: {}
   - uid: 117
     components:
     - type: Transform
       pos: -28.5,56.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 118
     components:
     - type: Transform
@@ -30676,6 +30848,8 @@ entities:
       - 25733
       - 25512
       - 892
+    - type: Fixtures
+      fixtures: {}
   - uid: 119
     components:
     - type: Transform
@@ -30690,6 +30864,8 @@ entities:
       - 20596
       - 20590
       - 20593
+    - type: Fixtures
+      fixtures: {}
   - uid: 120
     components:
     - type: Transform
@@ -30704,6 +30880,8 @@ entities:
       - 20591
       - 20592
       - 20590
+    - type: Fixtures
+      fixtures: {}
   - uid: 121
     components:
     - type: Transform
@@ -30717,6 +30895,8 @@ entities:
       - 894
       - 20595
       - 20594
+    - type: Fixtures
+      fixtures: {}
   - uid: 122
     components:
     - type: Transform
@@ -30731,6 +30911,8 @@ entities:
       - 25731
       - 898
       - 20592
+    - type: Fixtures
+      fixtures: {}
   - uid: 123
     components:
     - type: Transform
@@ -30743,6 +30925,8 @@ entities:
       - 25513
       - 20598
       - 897
+    - type: Fixtures
+      fixtures: {}
   - uid: 124
     components:
     - type: Transform
@@ -30758,6 +30942,8 @@ entities:
       - 25869
       - 25581
       - 900
+    - type: Fixtures
+      fixtures: {}
   - uid: 125
     components:
     - type: Transform
@@ -30784,12 +30970,16 @@ entities:
       - 20545
       - 20528
       - 20527
+    - type: Fixtures
+      fixtures: {}
   - uid: 126
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -119.5,11.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 127
     components:
     - type: Transform
@@ -30806,6 +30996,8 @@ entities:
       - 906
       - 909
       - 903
+    - type: Fixtures
+      fixtures: {}
   - uid: 128
     components:
     - type: Transform
@@ -30816,12 +31008,16 @@ entities:
       - 25862
       - 25653
       - 904
+    - type: Fixtures
+      fixtures: {}
   - uid: 129
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -124.5,23.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 130
     components:
     - type: Transform
@@ -30833,6 +31029,8 @@ entities:
       - 25869
       - 25868
       - 25881
+    - type: Fixtures
+      fixtures: {}
   - uid: 131
     components:
     - type: Transform
@@ -30845,6 +31043,8 @@ entities:
       - 25876
       - 911
       - 905
+    - type: Fixtures
+      fixtures: {}
   - uid: 132
     components:
     - type: Transform
@@ -30858,6 +31058,8 @@ entities:
       - 910
       - 25905
       - 25904
+    - type: Fixtures
+      fixtures: {}
   - uid: 133
     components:
     - type: Transform
@@ -30871,6 +31073,8 @@ entities:
       - 20626
       - 20632
       - 20633
+    - type: Fixtures
+      fixtures: {}
   - uid: 134
     components:
     - type: Transform
@@ -30884,12 +31088,16 @@ entities:
       - 20634
       - 20630
       - 913
+    - type: Fixtures
+      fixtures: {}
   - uid: 135
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -126.5,3.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 136
     components:
     - type: Transform
@@ -30905,6 +31113,8 @@ entities:
       - 25885
       - 25667
       - 912
+    - type: Fixtures
+      fixtures: {}
   - uid: 137
     components:
     - type: Transform
@@ -30917,6 +31127,8 @@ entities:
       - 20645
       - 20644
       - 915
+    - type: Fixtures
+      fixtures: {}
   - uid: 138
     components:
     - type: Transform
@@ -30929,6 +31141,8 @@ entities:
       - 919
       - 917
       - 25899
+    - type: Fixtures
+      fixtures: {}
   - uid: 139
     components:
     - type: Transform
@@ -30940,6 +31154,8 @@ entities:
       - 25748
       - 25528
       - 925
+    - type: Fixtures
+      fixtures: {}
   - uid: 140
     components:
     - type: Transform
@@ -30960,6 +31176,8 @@ entities:
       - 25594
       - 25695
       - 25694
+    - type: Fixtures
+      fixtures: {}
   - uid: 141
     components:
     - type: Transform
@@ -30981,6 +31199,8 @@ entities:
       - 25813
       - 25725
       - 923
+    - type: Fixtures
+      fixtures: {}
   - uid: 142
     components:
     - type: Transform
@@ -31011,6 +31231,8 @@ entities:
       - 20685
       - 20664
       - 20322
+    - type: Fixtures
+      fixtures: {}
   - uid: 143
     components:
     - type: Transform
@@ -31029,6 +31251,8 @@ entities:
       - 25706
       - 25697
       - 25698
+    - type: Fixtures
+      fixtures: {}
   - uid: 144
     components:
     - type: Transform
@@ -31054,6 +31278,8 @@ entities:
       - 25702
       - 25703
       - 25704
+    - type: Fixtures
+      fixtures: {}
   - uid: 145
     components:
     - type: Transform
@@ -31068,6 +31294,8 @@ entities:
       - 20681
       - 20679
       - 25696
+    - type: Fixtures
+      fixtures: {}
   - uid: 146
     components:
     - type: Transform
@@ -31085,6 +31313,8 @@ entities:
       - 937
       - 20689
       - 20690
+    - type: Fixtures
+      fixtures: {}
   - uid: 147
     components:
     - type: Transform
@@ -31096,6 +31326,8 @@ entities:
       - 25757
       - 25546
       - 950
+    - type: Fixtures
+      fixtures: {}
   - uid: 148
     components:
     - type: Transform
@@ -31126,6 +31358,8 @@ entities:
       - 25499
       - 942
       - 939
+    - type: Fixtures
+      fixtures: {}
   - uid: 149
     components:
     - type: Transform
@@ -31138,6 +31372,8 @@ entities:
       - 25937
       - 946
       - 25533
+    - type: Fixtures
+      fixtures: {}
   - uid: 150
     components:
     - type: Transform
@@ -31149,6 +31385,8 @@ entities:
       - 25527
       - 948
       - 25939
+    - type: Fixtures
+      fixtures: {}
   - uid: 151
     components:
     - type: Transform
@@ -31160,11 +31398,15 @@ entities:
       - 25497
       - 951
       - 25938
+    - type: Fixtures
+      fixtures: {}
   - uid: 152
     components:
     - type: Transform
       pos: -62.5,19.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 153
     components:
     - type: Transform
@@ -31176,11 +31418,15 @@ entities:
       - 25710
       - 25717
       - 949
+    - type: Fixtures
+      fixtures: {}
   - uid: 154
     components:
     - type: Transform
       pos: -70.5,49.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: AirAlarmElectronics
   entities:
   - uid: 155
@@ -31582,6 +31828,7 @@ entities:
   - uid: 222
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 58.5,15.5
       parent: 2
 - proto: AirlockAssemblyMaintenance
@@ -31776,7 +32023,7 @@ entities:
       pos: 8.5,4.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -474447.28
+      secondsUntilStateChange: -474656.03
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -32275,7 +32522,7 @@ entities:
       pos: -35.5,7.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -213650.7
+      secondsUntilStateChange: -213859.45
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -33593,7 +33840,7 @@ entities:
       pos: -26.5,47.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -1278.1481
+      secondsUntilStateChange: -1486.8938
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -35129,7 +35376,7 @@ entities:
       pos: 81.5,16.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -319323.7
+      secondsUntilStateChange: -319532.44
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -36575,12 +36822,16 @@ entities:
       rot: 3.141592653589793 rad
       pos: -55.5,8.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 972
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 69.5,16.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 973
     components:
     - type: MetaData
@@ -36589,6 +36840,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: 43.5,-36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 974
     components:
     - type: MetaData
@@ -36597,6 +36850,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-47.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 975
     components:
     - type: MetaData
@@ -36605,6 +36860,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -45.5,30.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 976
     components:
     - type: MetaData
@@ -36612,11 +36869,15 @@ entities:
     - type: Transform
       pos: -21.5,-78.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 977
     components:
     - type: Transform
       pos: -31.5,-54.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 978
     components:
     - type: MetaData
@@ -36624,6 +36885,8 @@ entities:
     - type: Transform
       pos: 6.5,-53.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 979
     components:
     - type: MetaData
@@ -36632,6 +36895,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: 12.5,7.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 980
     components:
     - type: MetaData
@@ -36640,6 +36905,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -8.5,1.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 981
     components:
     - type: MetaData
@@ -36648,6 +36915,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: -7.5,12.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 982
     components:
     - type: MetaData
@@ -36656,11 +36925,15 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -20.5,-27.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 983
     components:
     - type: Transform
       pos: 23.5,-18.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 984
     components:
     - type: MetaData
@@ -36668,11 +36941,15 @@ entities:
     - type: Transform
       pos: -20.5,-13.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 985
     components:
     - type: Transform
       pos: -62.5,-21.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 986
     components:
     - type: MetaData
@@ -36683,6 +36960,8 @@ entities:
     - type: PowerNetworkBattery
       loadingNetworkDemand: 75
       supplyRampPosition: 0.047621023
+    - type: Fixtures
+      fixtures: {}
   - uid: 987
     components:
     - type: MetaData
@@ -36691,6 +36970,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 19.5,-28.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 988
     components:
     - type: MetaData
@@ -36698,6 +36979,8 @@ entities:
     - type: Transform
       pos: -13.5,70.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 989
     components:
     - type: MetaData
@@ -36706,6 +36989,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -21.5,-40.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 990
     components:
     - type: MetaData
@@ -36714,11 +36999,15 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 25.5,-37.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 991
     components:
     - type: Transform
       pos: -66.5,-29.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 992
     components:
     - type: MetaData
@@ -36727,6 +37016,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,56.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 993
     components:
     - type: MetaData
@@ -36735,6 +37026,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,53.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 994
     components:
     - type: MetaData
@@ -36745,6 +37038,8 @@ entities:
     - type: PowerNetworkBattery
       loadingNetworkDemand: 20
       supplyRampPosition: 0.13917412
+    - type: Fixtures
+      fixtures: {}
   - uid: 995
     components:
     - type: MetaData
@@ -36753,6 +37048,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 15.5,-41.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 996
     components:
     - type: MetaData
@@ -36761,18 +37058,24 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 12.5,38.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 997
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 42.5,-12.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 998
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -37.5,-12.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 999
     components:
     - type: MetaData
@@ -36780,11 +37083,15 @@ entities:
     - type: Transform
       pos: 8.5,38.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1000
     components:
     - type: Transform
       pos: -11.5,63.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1001
     components:
     - type: MetaData
@@ -36792,6 +37099,8 @@ entities:
     - type: Transform
       pos: -0.5,28.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1002
     components:
     - type: MetaData
@@ -36800,11 +37109,15 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -8.5,-59.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1003
     components:
     - type: Transform
       pos: -62.5,-32.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1004
     components:
     - type: MetaData
@@ -36813,6 +37126,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 27.5,-22.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1005
     components:
     - type: MetaData
@@ -36823,6 +37138,8 @@ entities:
     - type: PowerNetworkBattery
       loadingNetworkDemand: 20
       supplyRampPosition: 17.270588
+    - type: Fixtures
+      fixtures: {}
   - uid: 1006
     components:
     - type: MetaData
@@ -36831,6 +37148,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -21.5,-71.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1007
     components:
     - type: MetaData
@@ -36839,6 +37158,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 12.5,3.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1008
     components:
     - type: MetaData
@@ -36846,6 +37167,8 @@ entities:
     - type: Transform
       pos: 36.5,-42.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1009
     components:
     - type: MetaData
@@ -36854,12 +37177,16 @@ entities:
       rot: 3.141592653589793 rad
       pos: 46.5,-21.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1010
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 54.5,-17.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1011
     components:
     - type: MetaData
@@ -36868,6 +37195,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 48.5,-51.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1012
     components:
     - type: MetaData
@@ -36876,12 +37205,16 @@ entities:
       rot: 3.141592653589793 rad
       pos: -32.5,-79.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1013
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 8.5,55.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1014
     components:
     - type: MetaData
@@ -36892,6 +37225,8 @@ entities:
     - type: PowerNetworkBattery
       loadingNetworkDemand: 5
       supplyRampPosition: 1.7944434
+    - type: Fixtures
+      fixtures: {}
   - uid: 1015
     components:
     - type: MetaData
@@ -36900,6 +37235,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -39.5,12.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1016
     components:
     - type: MetaData
@@ -36908,6 +37245,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: -26.5,59.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1017
     components:
     - type: MetaData
@@ -36916,6 +37255,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -39.5,26.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1018
     components:
     - type: MetaData
@@ -36924,12 +37265,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -29.5,14.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1019
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -32.5,61.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1020
     components:
     - type: MetaData
@@ -36938,6 +37283,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -39.5,21.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1021
     components:
     - type: MetaData
@@ -36946,6 +37293,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -72.5,-25.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1022
     components:
     - type: MetaData
@@ -36954,6 +37303,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 29.5,-37.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1023
     components:
     - type: MetaData
@@ -36962,6 +37313,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: 31.5,3.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1024
     components:
     - type: MetaData
@@ -36970,6 +37323,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 8.5,53.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1025
     components:
     - type: MetaData
@@ -36978,6 +37333,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -50.5,39.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1026
     components:
     - type: MetaData
@@ -36986,6 +37343,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -44.5,-15.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1027
     components:
     - type: MetaData
@@ -36993,6 +37352,8 @@ entities:
     - type: Transform
       pos: 12.5,33.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1028
     components:
     - type: MetaData
@@ -37001,6 +37362,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: 16.5,-22.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1029
     components:
     - type: MetaData
@@ -37009,11 +37372,15 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,-43.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1030
     components:
     - type: Transform
       pos: 41.5,-48.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1031
     components:
     - type: MetaData
@@ -37021,12 +37388,16 @@ entities:
     - type: Transform
       pos: -27.5,22.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1032
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -9.5,-80.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1033
     components:
     - type: MetaData
@@ -37035,6 +37406,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -35.5,-5.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1034
     components:
     - type: MetaData
@@ -37043,6 +37416,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 54.5,-26.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1035
     components:
     - type: MetaData
@@ -37051,11 +37426,15 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -74.5,5.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1036
     components:
     - type: Transform
       pos: -45.5,-45.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1037
     components:
     - type: MetaData
@@ -37064,11 +37443,15 @@ entities:
       rot: 3.141592653589793 rad
       pos: -44.5,-10.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1038
     components:
     - type: Transform
       pos: 17.5,64.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1039
     components:
     - type: MetaData
@@ -37077,6 +37460,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 32.5,-5.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1040
     components:
     - type: MetaData
@@ -37085,6 +37470,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -40.5,56.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1041
     components:
     - type: MetaData
@@ -37093,6 +37480,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -47.5,-2.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1042
     components:
     - type: MetaData
@@ -37101,17 +37490,23 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 25.5,-45.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1043
     components:
     - type: Transform
       pos: 38.5,-2.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1044
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -26.5,-16.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1045
     components:
     - type: MetaData
@@ -37120,6 +37515,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -10.5,-32.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1046
     components:
     - type: MetaData
@@ -37128,6 +37525,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: 31.5,55.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1047
     components:
     - type: MetaData
@@ -37135,12 +37534,16 @@ entities:
     - type: Transform
       pos: 25.5,-23.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1048
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 42.5,-44.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1049
     components:
     - type: MetaData
@@ -37151,6 +37554,8 @@ entities:
     - type: PowerNetworkBattery
       loadingNetworkDemand: 15
       supplyRampPosition: 3.5009959
+    - type: Fixtures
+      fixtures: {}
   - uid: 1050
     components:
     - type: MetaData
@@ -37159,6 +37564,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 37.5,-64.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1051
     components:
     - type: MetaData
@@ -37169,6 +37576,8 @@ entities:
     - type: PowerNetworkBattery
       loadingNetworkDemand: 50
       supplyRampPosition: 6.759501
+    - type: Fixtures
+      fixtures: {}
   - uid: 1052
     components:
     - type: MetaData
@@ -37176,6 +37585,8 @@ entities:
     - type: Transform
       pos: 25.5,-8.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1053
     components:
     - type: MetaData
@@ -37184,6 +37595,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -41.5,-63.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1054
     components:
     - type: MetaData
@@ -37191,11 +37604,15 @@ entities:
     - type: Transform
       pos: -25.5,-48.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1055
     components:
     - type: Transform
       pos: 46.5,-45.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1056
     components:
     - type: MetaData
@@ -37204,6 +37621,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -21.5,-50.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1057
     components:
     - type: MetaData
@@ -37211,6 +37630,8 @@ entities:
     - type: Transform
       pos: 6.5,-72.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1058
     components:
     - type: MetaData
@@ -37218,6 +37639,8 @@ entities:
     - type: Transform
       pos: -16.5,-54.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1059
     components:
     - type: MetaData
@@ -37225,6 +37648,8 @@ entities:
     - type: Transform
       pos: -66.5,-4.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1060
     components:
     - type: MetaData
@@ -37232,136 +37657,184 @@ entities:
     - type: Transform
       pos: 77.5,-41.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1061
     components:
     - type: Transform
       pos: 61.5,-23.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1062
     components:
     - type: Transform
       pos: -60.5,43.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1063
     components:
     - type: Transform
       pos: 71.5,-40.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1064
     components:
     - type: Transform
       pos: 7.5,-10.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1065
     components:
     - type: Transform
       pos: -11.5,-10.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1066
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 30.5,46.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1067
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 18.5,-53.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1068
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -43.5,23.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1069
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 11.5,-79.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1070
     components:
     - type: Transform
       pos: 41.5,38.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1071
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 28.5,12.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1072
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 41.5,1.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1073
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 51.5,-7.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1074
     components:
     - type: Transform
       pos: -0.5,-13.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1075
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 39.5,7.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1076
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 77.5,-3.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1077
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 32.5,-0.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1078
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 25.5,18.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1079
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 25.5,20.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1080
     components:
     - type: Transform
       pos: -2.5,11.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1081
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -2.5,-3.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1082
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -14.5,6.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1083
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -12.5,9.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1084
     components:
     - type: MetaData
@@ -37369,311 +37842,423 @@ entities:
     - type: Transform
       pos: -30.5,70.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1085
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 41.5,69.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1086
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -124.5,15.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1087
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 9.5,-2.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1088
     components:
     - type: Transform
       pos: 19.5,70.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1089
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 64.5,25.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1090
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -116.5,15.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1091
     components:
     - type: Transform
       pos: -118.5,17.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1092
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -54.5,97.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1093
     components:
     - type: Transform
       pos: -25.5,101.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1094
     components:
     - type: Transform
       pos: 22.5,100.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1095
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -49.5,87.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1096
     components:
     - type: Transform
       pos: -49.5,70.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1097
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 77.5,13.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1098
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 64.5,29.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1099
     components:
     - type: Transform
       pos: 57.5,21.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1100
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 48.5,22.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1101
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 44.5,16.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1102
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 35.5,27.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1103
     components:
     - type: Transform
       pos: 54.5,36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1104
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 47.5,24.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1105
     components:
     - type: Transform
       pos: 70.5,39.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1106
     components:
     - type: Transform
       pos: -8.5,-42.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1107
     components:
     - type: Transform
       pos: -3.5,-49.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1108
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -25.5,-29.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1109
     components:
     - type: Transform
       pos: -8.5,-36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1110
     components:
     - type: Transform
       pos: -4.5,41.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1111
     components:
     - type: Transform
       pos: -51.5,23.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1112
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -66.5,14.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1113
     components:
     - type: Transform
       pos: -30.5,29.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1114
     components:
     - type: Transform
       pos: -38.5,48.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1115
     components:
     - type: Transform
       pos: 26.5,45.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1116
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -66.5,10.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1117
     components:
     - type: Transform
       pos: 27.5,33.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1118
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -29.5,41.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1119
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -36.5,53.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1120
     components:
     - type: Transform
       pos: -13.5,55.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1121
     components:
     - type: Transform
       pos: -3.5,55.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1122
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -21.5,27.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1123
     components:
     - type: Transform
       pos: -16.5,50.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1124
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -20.5,31.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1125
     components:
     - type: Transform
       pos: -56.5,39.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1126
     components:
     - type: Transform
       pos: -27.5,-80.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1127
     components:
     - type: Transform
       pos: -21.5,-82.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1128
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -2.5,-82.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1129
     components:
     - type: Transform
       pos: 10.5,-82.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1130
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 12.5,-12.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1131
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -27.5,-76.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1132
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -29.5,-16.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1133
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -15.5,21.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1134
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 14.5,21.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1135
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 53.5,-42.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1136
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 61.5,-38.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1137
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 2.5,-55.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1138
     components:
     - type: Transform
       pos: -12.5,-63.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1139
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -43.5,65.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: APCElectronics
   entities:
   - uid: 1140
@@ -37693,66 +38278,88 @@ entities:
     - type: Transform
       pos: -3.5,-62.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1143
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 18.5,26.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1144
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -39.5,39.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1145
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 4.5,62.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1146
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 69.5,14.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1147
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 52.5,-1.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1148
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 49.5,35.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1149
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 48.5,8.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1150
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 58.5,14.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1151
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 70.5,9.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1152
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -124.5,29.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1153
     components:
     - type: MetaData
@@ -37761,36 +38368,48 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 13.5,-49.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1154
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 26.5,77.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1155
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -130.5,3.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1156
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -132.5,10.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1157
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -127.5,40.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1158
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -11.5,-76.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: APCSuperCapacity
   entities:
   - uid: 1159
@@ -37801,6 +38420,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: -32.5,-47.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1160
     components:
     - type: MetaData
@@ -37809,6 +38430,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -30.5,-40.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: AppraisalTool
   entities:
   - uid: 1161
@@ -37823,11 +38446,15 @@ entities:
     - type: Transform
       pos: 5.5,70.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1163
     components:
     - type: Transform
       pos: -21.5,56.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: ArtistCircuitBoard
   entities:
   - uid: 1164
@@ -39510,6 +40137,8 @@ entities:
     - type: Transform
       pos: -8.5,44.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: BarSignMaidCafe
   entities:
   - uid: 1474
@@ -39517,6 +40146,8 @@ entities:
     - type: Transform
       pos: -70.5,-38.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: BarSpoon
   entities:
   - uid: 1475
@@ -41429,13 +42060,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 1814
-    components:
-    - type: Transform
-      parent: 1813
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: BoxBodyBag
   entities:
   - uid: 1821
@@ -41580,32 +42204,8 @@ entities:
     - type: Transform
       pos: 44.799637,2.7746153
       parent: 2
-    - type: Storage
-      storedItems:
-        1846:
-          position: 0,0
-          _rotation: South
-        1847:
-          position: 1,0
-          _rotation: South
-        1848:
-          position: 2,0
-          _rotation: South
-        1849:
-          position: 0,2
-          _rotation: East
     - type: EmitSoundOnCollide
       nextSound: -1718.4316149
-    - type: ContainerContainer
-      containers:
-        storagebase: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 1846
-          - 1847
-          - 1848
-          - 1849
     - type: UseDelay
       delays:
         default:
@@ -42323,6 +42923,8 @@ entities:
     - type: Transform
       pos: 59.5,-16.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: BoxLatexGloves
   entities:
   - uid: 1980
@@ -42335,15 +42937,6 @@ entities:
     - type: Transform
       pos: 31.186247,-26.34189
       parent: 2
-- proto: BoxLethalshot
-  entities:
-  - uid: 1815
-    components:
-    - type: Transform
-      parent: 1813
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: BoxLightbulbColorfulMixed
   entities:
   - uid: 1982
@@ -42415,15 +43008,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: BoxMagazineMagnumSubMachineGunPractice
-  entities:
-  - uid: 1994
-    components:
-    - type: Transform
-      parent: 1992
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: BoxMagazinePistolPractice
   entities:
   - uid: 1995
@@ -42538,15 +43122,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: BoxShotgunSlug
-  entities:
-  - uid: 1816
-    components:
-    - type: Transform
-      parent: 1813
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: BoxSterileMask
   entities:
   - uid: 2013
@@ -42717,59 +43292,79 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -11.5,66.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 2039
     components:
     - type: Transform
       pos: 72.5,18.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 2040
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 39.5,21.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 2041
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 31.5,21.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 2042
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 43.5,23.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 2043
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 35.5,21.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 2044
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 39.5,26.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 2045
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 31.5,18.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 2046
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 35.5,18.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 2047
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 39.5,18.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: BrokenBottle
   entities:
   - uid: 2048
@@ -118156,6 +118751,8 @@ entities:
     - type: Transform
       pos: 1.5,55.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: ClosetBombFilled
   entities:
   - uid: 16796
@@ -121073,6 +121670,8 @@ entities:
         - 0
         - 0
         - 0
+    - type: Fixtures
+      fixtures: {}
 - proto: ClosetWallEmergencyFilledRandom
   entities:
   - uid: 17035
@@ -121098,12 +121697,16 @@ entities:
         - 0
         - 0
         - 0
+    - type: Fixtures
+      fixtures: {}
   - uid: 17036
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -2.5,45.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: ClosetWallFireFilledRandom
   entities:
   - uid: 17037
@@ -121112,22 +121715,30 @@ entities:
       rot: 3.141592653589793 rad
       pos: -20.5,27.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 17038
     components:
     - type: Transform
       pos: -16.5,55.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 17039
     components:
     - type: Transform
       pos: -20.5,55.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 17040
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -16.5,27.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: ClothingBackpackDuffelSurgeryFilled
   entities:
   - uid: 13
@@ -121714,13 +122325,6 @@ entities:
       parent: 2
 - proto: ClothingHandsGlovesCombat
   entities:
-  - uid: 17145
-    components:
-    - type: Transform
-      parent: 17144
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
   - uid: 17149
     components:
     - type: Transform
@@ -122477,13 +123081,6 @@ entities:
       inSlot: head
     - type: Physics
       canCollide: False
-  - uid: 17146
-    components:
-    - type: Transform
-      parent: 17144
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingHeadHelmetTemplar
   entities:
   - uid: 17257
@@ -122786,6 +123383,33 @@ entities:
     - type: Transform
       pos: 8.514957,-39.274185
       parent: 2
+- proto: ClothingMultipleHeadphones
+  entities:
+  - uid: 17314
+    components:
+    - type: Transform
+      pos: 52.55161,-4.390796
+      parent: 2
+  - uid: 17315
+    components:
+    - type: Transform
+      pos: 52.55161,-4.250171
+      parent: 2
+  - uid: 17316
+    components:
+    - type: Transform
+      pos: -58.5,-49.5
+      parent: 2
+  - uid: 17317
+    components:
+    - type: Transform
+      pos: 8.7021475,-79.90786
+      parent: 2
+  - uid: 17318
+    components:
+    - type: Transform
+      pos: 52.55161,-4.125171
+      parent: 2
 - proto: ClothingNeckBling
   entities:
   - uid: 16775
@@ -122839,33 +123463,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5970864,-38.505775
       parent: 2
-- proto: ClothingNeckHeadphones
-  entities:
-  - uid: 17314
-    components:
-    - type: Transform
-      pos: 52.55161,-4.390796
-      parent: 2
-  - uid: 17315
-    components:
-    - type: Transform
-      pos: 52.55161,-4.250171
-      parent: 2
-  - uid: 17316
-    components:
-    - type: Transform
-      pos: -58.5,-49.5
-      parent: 2
-  - uid: 17317
-    components:
-    - type: Transform
-      pos: 8.7021475,-79.90786
-      parent: 2
-  - uid: 17318
-    components:
-    - type: Transform
-      pos: 52.55161,-4.125171
-      parent: 2
 - proto: ClothingNeckMantleCap
   entities:
   - uid: 17319
@@ -126711,7 +127308,6 @@ entities:
           occludes: True
           ents:
           - 1998
-          - 1994
           - 1995
           - 1997
           - 1996
@@ -127411,7 +128007,7 @@ entities:
       pos: 38.5,12.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -218915.95
+      secondsUntilStateChange: -219124.7
       state: Closing
   - uid: 17880
     components:
@@ -128330,56 +128926,76 @@ entities:
     - type: Transform
       pos: 27.5,-27.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 17981
     components:
     - type: Transform
       pos: 37.5,-36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 17982
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 37.5,-63.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 17983
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 23.5,-53.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 17984
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 8.5,64.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 17985
     components:
     - type: Transform
       pos: -4.5,-56.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 17986
     components:
     - type: Transform
       pos: 13.5,-41.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 17987
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 49.5,34.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 17988
     components:
     - type: Transform
       pos: 31.5,-36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 17989
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 32.5,-42.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: DefibrillatorCompact
   entities:
   - uid: 17990
@@ -137678,7 +138294,7 @@ entities:
       pos: 39.5,20.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -213535.89
+      secondsUntilStateChange: -213744.64
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -140580,438 +141196,608 @@ entities:
     - type: Transform
       pos: -15.5,55.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 19986
     components:
     - type: Transform
       pos: -4.5,38.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 19987
     components:
     - type: Transform
       pos: -32.5,30.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 19988
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 54.5,29.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 19989
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -126.5,32.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 19990
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -130.5,20.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 19991
     components:
     - type: Transform
       pos: 51.5,-2.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 19992
     components:
     - type: Transform
       pos: 52.5,7.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 19993
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 18.5,27.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 19994
     components:
     - type: Transform
       pos: 74.5,-47.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 19995
     components:
     - type: Transform
       pos: 12.5,25.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 19996
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 25.5,-59.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 19997
     components:
     - type: Transform
       pos: -35.5,-7.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 19998
     components:
     - type: Transform
       pos: -13.5,-3.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 19999
     components:
     - type: Transform
       pos: -20.5,-31.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20000
     components:
     - type: Transform
       pos: -11.5,-36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20001
     components:
     - type: Transform
       pos: -24.5,-81.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20002
     components:
     - type: Transform
       pos: -27.5,-78.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20003
     components:
     - type: Transform
       pos: -35.5,-13.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20004
     components:
     - type: Transform
       pos: -43.5,49.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20005
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 3.5,-41.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20006
     components:
     - type: Transform
       pos: -43.5,1.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20007
     components:
     - type: Transform
       pos: -18.5,-48.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20008
     components:
     - type: Transform
       pos: 15.5,-32.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20009
     components:
     - type: Transform
       pos: -66.5,-22.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20010
     components:
     - type: Transform
       pos: -16.5,-15.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20011
     components:
     - type: Transform
       pos: -11.5,-45.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20012
     components:
     - type: Transform
       pos: 33.5,-63.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20013
     components:
     - type: Transform
       pos: 21.5,64.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20014
     components:
     - type: Transform
       pos: -24.5,60.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20015
     components:
     - type: Transform
       pos: -43.5,-30.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20016
     components:
     - type: Transform
       pos: 12.5,37.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20017
     components:
     - type: Transform
       pos: -67.5,17.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20018
     components:
     - type: Transform
       pos: 19.5,-13.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20019
     components:
     - type: Transform
       pos: -29.5,12.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20020
     components:
     - type: Transform
       pos: -55.5,-9.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20021
     components:
     - type: Transform
       pos: 77.5,-20.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20022
     components:
     - type: Transform
       pos: -42.5,-15.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20023
     components:
     - type: Transform
       pos: 32.5,-70.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20024
     components:
     - type: Transform
       pos: -64.5,12.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20025
     components:
     - type: Transform
       pos: 29.5,-38.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20026
     components:
     - type: Transform
       pos: -30.5,-37.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20027
     components:
     - type: Transform
       pos: 39.5,-30.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20028
     components:
     - type: Transform
       pos: 65.5,-19.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20029
     components:
     - type: Transform
       pos: -32.5,17.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20030
     components:
     - type: Transform
       pos: -21.5,-74.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20031
     components:
     - type: Transform
       pos: -23.5,66.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20032
     components:
     - type: Transform
       pos: -27.5,23.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20033
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -31.5,-51.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20034
     components:
     - type: Transform
       pos: 1.5,-28.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20035
     components:
     - type: Transform
       pos: 10.5,-47.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20036
     components:
     - type: Transform
       pos: 1.5,-48.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20037
     components:
     - type: Transform
       pos: 8.5,50.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20038
     components:
     - type: Transform
       pos: -11.5,-43.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20039
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -30.5,-24.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20040
     components:
     - type: Transform
       pos: -20.5,18.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20041
     components:
     - type: Transform
       pos: 33.5,-29.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20042
     components:
     - type: Transform
       pos: 32.5,3.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20043
     components:
     - type: Transform
       pos: 42.5,-59.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20044
     components:
     - type: Transform
       pos: -44.5,-12.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20045
     components:
     - type: Transform
       pos: -20.5,-22.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20046
     components:
     - type: Transform
       pos: -66.5,-28.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20047
     components:
     - type: Transform
       pos: -30.5,-46.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20048
     components:
     - type: Transform
       pos: 32.5,-7.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20049
     components:
     - type: Transform
       pos: -6.5,-17.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20050
     components:
     - type: Transform
       pos: 19.5,2.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20051
     components:
     - type: Transform
       pos: 54.5,-23.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20052
     components:
     - type: Transform
       pos: -35.5,3.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20053
     components:
     - type: Transform
       pos: -30.5,56.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20054
     components:
     - type: Transform
       pos: 15.5,9.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20055
     components:
     - type: Transform
       pos: 3.5,-36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20056
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -39.5,8.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20057
     components:
     - type: Transform
       pos: 4.5,9.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20058
     components:
     - type: Transform
       pos: -2.5,0.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20059
     components:
     - type: Transform
       pos: -5.5,9.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20060
     components:
     - type: Transform
       pos: 28.5,73.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20061
     components:
     - type: Transform
       pos: -129.5,39.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20062
     components:
     - type: Transform
       pos: -4.5,6.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20063
     components:
     - type: Transform
       pos: -117.5,16.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20064
     components:
     - type: Transform
       pos: 10.5,-2.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20065
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -140.5,15.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20066
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -124.5,16.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20067
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 64.5,26.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20068
     components:
     - type: Transform
       pos: -60.5,19.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20069
     components:
     - type: Transform
       pos: -8.5,52.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: FaxMachineBase
   entities:
   - uid: 20070
@@ -141414,18 +142200,24 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 54.5,23.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20136
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -131.5,8.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20137
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -121.5,11.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20138
     components:
     - type: Transform
@@ -141435,6 +142227,8 @@ entities:
     - type: DeviceList
       devices:
       - 20350
+    - type: Fixtures
+      fixtures: {}
   - uid: 20139
     components:
     - type: Transform
@@ -141444,6 +142238,8 @@ entities:
     - type: DeviceList
       devices:
       - 20222
+    - type: Fixtures
+      fixtures: {}
   - uid: 20140
     components:
     - type: Transform
@@ -141453,6 +142249,8 @@ entities:
     - type: DeviceList
       devices:
       - 20269
+    - type: Fixtures
+      fixtures: {}
   - uid: 20141
     components:
     - type: Transform
@@ -141463,6 +142261,8 @@ entities:
       - 20428
       - 20403
       - 20352
+    - type: Fixtures
+      fixtures: {}
   - uid: 20142
     components:
     - type: Transform
@@ -141475,6 +142275,8 @@ entities:
       - 20426
       - 20548
       - 20522
+    - type: Fixtures
+      fixtures: {}
   - uid: 20143
     components:
     - type: Transform
@@ -141490,6 +142292,8 @@ entities:
       - 20472
       - 20507
       - 831
+    - type: Fixtures
+      fixtures: {}
   - uid: 20144
     components:
     - type: Transform
@@ -141501,6 +142305,8 @@ entities:
       - 20389
       - 20405
       - 830
+    - type: Fixtures
+      fixtures: {}
   - uid: 20145
     components:
     - type: Transform
@@ -141512,6 +142318,8 @@ entities:
       - 20493
       - 20436
       - 20438
+    - type: Fixtures
+      fixtures: {}
   - uid: 20146
     components:
     - type: Transform
@@ -141523,6 +142331,8 @@ entities:
       - 20496
       - 20461
       - 824
+    - type: Fixtures
+      fixtures: {}
   - uid: 20147
     components:
     - type: Transform
@@ -141538,6 +142348,8 @@ entities:
       - 832
       - 833
       - 20527
+    - type: Fixtures
+      fixtures: {}
   - uid: 20148
     components:
     - type: Transform
@@ -141553,6 +142365,8 @@ entities:
       - 20429
       - 20409
       - 20412
+    - type: Fixtures
+      fixtures: {}
   - uid: 20149
     components:
     - type: Transform
@@ -141565,6 +142379,8 @@ entities:
       - 20539
       - 20542
       - 831
+    - type: Fixtures
+      fixtures: {}
   - uid: 20150
     components:
     - type: Transform
@@ -141575,6 +142391,8 @@ entities:
       - 20500
       - 20402
       - 20351
+    - type: Fixtures
+      fixtures: {}
   - uid: 20151
     components:
     - type: Transform
@@ -141588,6 +142406,8 @@ entities:
       - 20519
       - 20419
       - 20468
+    - type: Fixtures
+      fixtures: {}
   - uid: 20152
     components:
     - type: Transform
@@ -141602,6 +142422,8 @@ entities:
       - 20457
       - 20370
       - 20369
+    - type: Fixtures
+      fixtures: {}
   - uid: 20153
     components:
     - type: Transform
@@ -141619,6 +142441,8 @@ entities:
       - 20545
       - 20434
       - 20353
+    - type: Fixtures
+      fixtures: {}
   - uid: 20154
     components:
     - type: Transform
@@ -141638,6 +142462,8 @@ entities:
       - 20495
       - 25869
       - 25868
+    - type: Fixtures
+      fixtures: {}
   - uid: 20155
     components:
     - type: Transform
@@ -141651,6 +142477,8 @@ entities:
       - 20572
       - 833
       - 832
+    - type: Fixtures
+      fixtures: {}
   - uid: 20156
     components:
     - type: Transform
@@ -141662,6 +142490,8 @@ entities:
       - 20531
       - 20454
       - 827
+    - type: Fixtures
+      fixtures: {}
   - uid: 20157
     components:
     - type: Transform
@@ -141675,6 +142505,8 @@ entities:
       - 20400
       - 20389
       - 20405
+    - type: Fixtures
+      fixtures: {}
   - uid: 20158
     components:
     - type: Transform
@@ -141688,6 +142520,8 @@ entities:
       - 20477
       - 20478
       - 20540
+    - type: Fixtures
+      fixtures: {}
   - uid: 20159
     components:
     - type: Transform
@@ -141699,6 +142533,8 @@ entities:
       - 20361
       - 20506
       - 20554
+    - type: Fixtures
+      fixtures: {}
   - uid: 20160
     components:
     - type: Transform
@@ -141715,12 +142551,16 @@ entities:
       - 20364
       - 20388
       - 20473
+    - type: Fixtures
+      fixtures: {}
   - uid: 20161
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 18.5,32.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20162
     components:
     - type: Transform
@@ -141736,6 +142576,8 @@ entities:
       - 20413
       - 20431
       - 20464
+    - type: Fixtures
+      fixtures: {}
   - uid: 20163
     components:
     - type: Transform
@@ -141753,6 +142595,8 @@ entities:
       - 20410
       - 20520
       - 20396
+    - type: Fixtures
+      fixtures: {}
   - uid: 20164
     components:
     - type: Transform
@@ -141770,6 +142614,8 @@ entities:
       - 20484
       - 20398
       - 20360
+    - type: Fixtures
+      fixtures: {}
   - uid: 20165
     components:
     - type: Transform
@@ -141781,6 +142627,8 @@ entities:
       - 20472
       - 20507
       - 20553
+    - type: Fixtures
+      fixtures: {}
   - uid: 20166
     components:
     - type: Transform
@@ -141793,6 +142641,8 @@ entities:
       - 20415
       - 20443
       - 20442
+    - type: Fixtures
+      fixtures: {}
   - uid: 20167
     components:
     - type: Transform
@@ -141811,6 +142661,8 @@ entities:
       - 20398
       - 20484
       - 20424
+    - type: Fixtures
+      fixtures: {}
   - uid: 20168
     components:
     - type: Transform
@@ -141822,6 +142674,8 @@ entities:
       - 20493
       - 20436
       - 20438
+    - type: Fixtures
+      fixtures: {}
   - uid: 20169
     components:
     - type: Transform
@@ -141833,6 +142687,8 @@ entities:
       - 20462
       - 20451
       - 20490
+    - type: Fixtures
+      fixtures: {}
   - uid: 20170
     components:
     - type: Transform
@@ -141845,6 +142701,8 @@ entities:
       - 20451
       - 20490
       - 823
+    - type: Fixtures
+      fixtures: {}
   - uid: 20171
     components:
     - type: Transform
@@ -141857,6 +142715,8 @@ entities:
       - 20516
       - 20555
       - 823
+    - type: Fixtures
+      fixtures: {}
   - uid: 20172
     components:
     - type: Transform
@@ -141869,6 +142729,8 @@ entities:
       - 20544
       - 20452
       - 820
+    - type: Fixtures
+      fixtures: {}
   - uid: 20173
     components:
     - type: Transform
@@ -141889,6 +142751,8 @@ entities:
       - 20487
       - 20512
       - 20558
+    - type: Fixtures
+      fixtures: {}
   - uid: 20174
     components:
     - type: Transform
@@ -141901,6 +142765,8 @@ entities:
       - 20481
       - 844
       - 843
+    - type: Fixtures
+      fixtures: {}
   - uid: 20175
     components:
     - type: Transform
@@ -141911,6 +142777,8 @@ entities:
       - 20349
       - 20348
       - 20347
+    - type: Fixtures
+      fixtures: {}
   - uid: 20176
     components:
     - type: Transform
@@ -141923,12 +142791,16 @@ entities:
       - 20233
       - 872
       - 871
+    - type: Fixtures
+      fixtures: {}
   - uid: 20177
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 15.5,-13.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20178
     components:
     - type: Transform
@@ -141941,6 +142813,8 @@ entities:
       - 20333
       - 20334
       - 902
+    - type: Fixtures
+      fixtures: {}
   - uid: 20179
     components:
     - type: Transform
@@ -141952,6 +142826,8 @@ entities:
       - 20613
       - 20622
       - 20623
+    - type: Fixtures
+      fixtures: {}
   - uid: 20180
     components:
     - type: Transform
@@ -141963,6 +142839,8 @@ entities:
       - 20611
       - 20614
       - 20615
+    - type: Fixtures
+      fixtures: {}
   - uid: 20181
     components:
     - type: Transform
@@ -141974,6 +142852,8 @@ entities:
       - 20619
       - 20620
       - 20621
+    - type: Fixtures
+      fixtures: {}
   - uid: 20182
     components:
     - type: Transform
@@ -141985,6 +142865,8 @@ entities:
       - 20609
       - 20612
       - 20610
+    - type: Fixtures
+      fixtures: {}
   - uid: 20183
     components:
     - type: Transform
@@ -141999,12 +142881,16 @@ entities:
       - 25885
       - 25667
       - 912
+    - type: Fixtures
+      fixtures: {}
   - uid: 20184
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -132.5,23.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20185
     components:
     - type: Transform
@@ -142016,6 +142902,8 @@ entities:
       - 20616
       - 20617
       - 20618
+    - type: Fixtures
+      fixtures: {}
   - uid: 20186
     components:
     - type: Transform
@@ -142027,6 +142915,8 @@ entities:
       - 20599
       - 20600
       - 20606
+    - type: Fixtures
+      fixtures: {}
   - uid: 20187
     components:
     - type: Transform
@@ -142038,6 +142928,8 @@ entities:
       - 20330
       - 20602
       - 20603
+    - type: Fixtures
+      fixtures: {}
   - uid: 20188
     components:
     - type: Transform
@@ -142049,6 +142941,8 @@ entities:
       - 20334
       - 20333
       - 20332
+    - type: Fixtures
+      fixtures: {}
   - uid: 20189
     components:
     - type: Transform
@@ -142062,6 +142956,8 @@ entities:
       - 20634
       - 20630
       - 913
+    - type: Fixtures
+      fixtures: {}
   - uid: 20190
     components:
     - type: Transform
@@ -142071,6 +142967,8 @@ entities:
       devices:
       - 20647
       - 20648
+    - type: Fixtures
+      fixtures: {}
   - uid: 20191
     components:
     - type: Transform
@@ -142081,6 +142979,8 @@ entities:
       devices:
       - 20652
       - 20653
+    - type: Fixtures
+      fixtures: {}
   - uid: 20192
     components:
     - type: Transform
@@ -142090,6 +142990,8 @@ entities:
       devices:
       - 20654
       - 20262
+    - type: Fixtures
+      fixtures: {}
 - proto: FireAxeCabinetFilled
   entities:
   - uid: 20193
@@ -142098,23 +143000,31 @@ entities:
       rot: 3.141592653589793 rad
       pos: -6.5,12.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20194
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -60.5,56.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20195
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,0.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 20196
     components:
     - type: Transform
       pos: -57.5,39.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: FireAxeCabinetOpen
   entities:
   - uid: 20197
@@ -142123,6 +143033,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -72.5,-26.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: FireExtinguisher
   entities:
   - uid: 20198
@@ -143184,7 +144096,7 @@ entities:
       pos: 15.5,-9.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -33365.227
+      secondsUntilStateChange: -33573.973
       state: Closing
     - type: DeviceNetwork
       deviceLists:
@@ -143396,7 +144308,7 @@ entities:
       pos: -39.5,-73.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -341131.7
+      secondsUntilStateChange: -341340.44
       state: Closing
   - uid: 20377
     components:
@@ -148004,6 +148916,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: 8.5,-36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: Garland
   entities:
   - uid: 20991
@@ -200272,129 +201186,6 @@ entities:
           ent: null
 - proto: GunSafeBaseSecure
   entities:
-  - uid: 1813
-    components:
-    - type: MetaData
-      name: сейф двухстволок
-    - type: Transform
-      pos: 64.5,13.5
-      parent: 2
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14023
-        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:
-          - 1816
-          - 1815
-          - 1817
-          - 1818
-          - 1819
-          - 1814
-          - 1820
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-  - uid: 17144
-    components:
-    - type: MetaData
-      name: сейф BR-64
-    - type: Transform
-      pos: 68.699,14.401675
-      parent: 2
-    - type: DamageOnHighSpeedImpact
-      lastHit: 0
-    - type: Pullable
-      prevFixedRotation: True
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        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:
-          - 17145
-          - 17147
-          - 17148
-          - 17146
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-  - uid: 28396
-    components:
-    - type: MetaData
-      name: сейф лазерного вооружения
-    - type: Transform
-      pos: 68.71751,13.655852
-      parent: 2
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        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:
-          - 28398
-          - 28399
-          - 28397
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
   - uid: 28400
     components:
     - type: Transform
@@ -200429,41 +201220,13 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-- proto: GunSafePistolMk58
+- proto: GunSafeEnergyGun
   entities:
-  - uid: 28402
-    components:
-    - type: Transform
-      pos: 64.5,16.5
-      parent: 2
-- proto: GunSafeRifleM16A4
-  entities:
-  - uid: 28403
-    components:
-    - type: Transform
-      pos: 68.5,16.5
-      parent: 2
-- proto: GunSafeShotgunTrenchgun4034
-  entities:
-  - uid: 28404
-    components:
-    - type: Transform
-      pos: 64.5,14.5
-      parent: 2
-- proto: GunSafeSubMachineGunSkorpion
-  entities:
-  - uid: 28405
+  - uid: 1817
     components:
     - type: Transform
       pos: 65.5,16.5
       parent: 2
-- proto: GunSafeSubMachineGunVector
-  entities:
-  - uid: 28406
-    components:
-    - type: Transform
-      pos: 67.5,16.5
-      parent: 2
 - proto: Handcuffs
   entities:
   - uid: 28407
@@ -200520,92 +201283,6 @@ entities:
     - type: Transform
       pos: -36.5,-35.5
       parent: 2
-- proto: HandheldCamera
-  entities:
-  - uid: 1846
-    mapInit: true
-    paused: true
-    components:
-    - type: Transform
-      parent: 1845
-    - type: DeviceNetwork
-      address: 1A6D-838E
-      transmitFrequency: 1926
-      receiveFrequency: 1940
-    - type: SpamEmitSound
-      nextSound: 43.9264351
-    - type: EmitSoundOnCollide
-      nextSound: -1718.4316149
-    - type: Physics
-      canCollide: False
-  - uid: 1847
-    mapInit: true
-    paused: true
-    components:
-    - type: Transform
-      parent: 1845
-    - type: DeviceNetwork
-      address: 50B3-4269
-      transmitFrequency: 1926
-      receiveFrequency: 1940
-    - type: SpamEmitSound
-      nextSound: 242.8240933
-    - type: EmitSoundOnCollide
-      nextSound: -1718.4316149
-    - type: Physics
-      canCollide: False
-  - uid: 1848
-    mapInit: true
-    paused: true
-    components:
-    - type: Transform
-      parent: 1845
-    - type: DeviceNetwork
-      address: 6869-846D
-      transmitFrequency: 1926
-      receiveFrequency: 1940
-    - type: SpamEmitSound
-      nextSound: 275.5002351
-    - type: EmitSoundOnCollide
-      nextSound: -1718.4316149
-    - type: Physics
-      canCollide: False
-  - uid: 1849
-    mapInit: true
-    paused: true
-    components:
-    - type: Transform
-      parent: 1845
-    - type: DeviceNetwork
-      address: 4655-6144
-      transmitFrequency: 1926
-      receiveFrequency: 1940
-    - type: SpamEmitSound
-      nextSound: 134.498504
-    - type: EmitSoundOnCollide
-      nextSound: -1718.4316149
-    - type: Physics
-      canCollide: False
-  - uid: 28417
-    components:
-    - type: Transform
-      pos: 74.401115,5.129039
-      parent: 2
-  - uid: 28418
-    components:
-    - type: Transform
-      pos: 74.50535,4.9623723
-      parent: 2
-  - uid: 28419
-    components:
-    - type: Transform
-      pos: 74.60958,4.858206
-      parent: 2
-  - uid: 28420
-    components:
-    - type: Transform
-      pos: 74.69297,4.629039
-      parent: 2
 - proto: HandheldGPSBasic
   entities:
   - uid: 1851
@@ -202047,11 +202724,15 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,11.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 28639
     components:
     - type: Transform
       pos: -6.5,17.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: IntercomAssembly
   entities:
   - uid: 28640
@@ -202067,23 +202748,31 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -125.5,8.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 28642
     components:
     - type: Transform
       pos: 5.5,17.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 28643
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -127.5,40.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 28644
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -135.5,40.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: IntercomCommon
   entities:
   - uid: 28645
@@ -202092,16 +202781,22 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -132.5,29.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 28646
     components:
     - type: Transform
       pos: -120.5,17.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 28647
     components:
     - type: Transform
       pos: -1.5,9.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: IntercomEngineering
   entities:
   - uid: 28648
@@ -202110,22 +202805,30 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -50.5,-4.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 28649
     components:
     - type: Transform
       pos: -44.5,14.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 28650
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -128.5,39.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 28651
     components:
     - type: Transform
       pos: -134.5,41.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: IntercomMedical
   entities:
   - uid: 28652
@@ -202133,47 +202836,63 @@ entities:
     - type: Transform
       pos: 24.5,-13.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 28653
     components:
     - type: Transform
       pos: 27.5,-13.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 28654
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 39.5,-39.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 28655
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 37.5,-65.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 28656
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 29.5,-42.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 28657
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 15.5,-26.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 28658
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 19.5,-37.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 28659
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -134.5,39.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: IntercomScience
   entities:
   - uid: 28660
@@ -202182,18 +202901,24 @@ entities:
       rot: 3.141592653589793 rad
       pos: -4.5,-28.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 28661
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -11.5,-41.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 28662
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -122.5,39.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: IntercomSecurity
   entities:
   - uid: 28663
@@ -202202,12 +202927,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -129.5,40.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 28664
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -121.5,40.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: IntercomSupply
   entities:
   - uid: 28665
@@ -202216,11 +202945,15 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 11.5,27.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 28666
     components:
     - type: Transform
       pos: -122.5,41.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: JanitorialTrolley
   entities:
   - uid: 28667
@@ -203117,6 +203850,8 @@ entities:
         33226:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
 - proto: LockableButtonBar
   entities:
   - uid: 28792
@@ -203133,6 +203868,8 @@ entities:
         238:
         - - Pressed
           - DoorBolt
+    - type: Fixtures
+      fixtures: {}
   - uid: 28793
     components:
     - type: Transform
@@ -203146,6 +203883,8 @@ entities:
         237:
         - - Pressed
           - DoorBolt
+    - type: Fixtures
+      fixtures: {}
   - uid: 28794
     components:
     - type: Transform
@@ -203169,6 +203908,8 @@ entities:
         33172:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
 - proto: LockableButtonChiefMedicalOfficer
   entities:
   - uid: 28795
@@ -203245,6 +203986,8 @@ entities:
         693:
         - - Pressed
           - DoorBolt
+    - type: Fixtures
+      fixtures: {}
 - proto: LockableButtonHydroponics
   entities:
   - uid: 28796
@@ -203261,6 +204004,8 @@ entities:
         33169:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
 - proto: LockableButtonKitchen
   entities:
   - uid: 28797
@@ -203285,6 +204030,8 @@ entities:
         33190:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
 - proto: LockableButtonLawyer
   entities:
   - uid: 28798
@@ -203310,6 +204057,8 @@ entities:
         33229:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 28799
     components:
     - type: Transform
@@ -203330,6 +204079,8 @@ entities:
         42065:
         - - Pressed
           - DoorBolt
+    - type: Fixtures
+      fixtures: {}
 - proto: LockableButtonMedical
   entities:
   - uid: 28800
@@ -203349,6 +204100,8 @@ entities:
         33228:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 28801
     components:
     - type: Transform
@@ -203372,6 +204125,8 @@ entities:
         33223:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
 - proto: LockableButtonSecurity
   entities:
   - uid: 28802
@@ -203421,6 +204176,8 @@ entities:
         33350:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 28803
     components:
     - type: Transform
@@ -203438,6 +204195,8 @@ entities:
         1638:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
 - proto: LockableButtonTheatre
   entities:
   - uid: 28804
@@ -203451,6 +204210,8 @@ entities:
         807:
         - - Pressed
           - DoorBolt
+    - type: Fixtures
+      fixtures: {}
   - uid: 28805
     components:
     - type: Transform
@@ -203462,6 +204223,8 @@ entities:
         808:
         - - Pressed
           - DoorBolt
+    - type: Fixtures
+      fixtures: {}
 - proto: LockerAtmosphericsFilled
   entities:
   - uid: 28806
@@ -204688,6 +205451,8 @@ entities:
         - 0
         - 0
         - 0
+    - type: Fixtures
+      fixtures: {}
 - proto: LockerWardenFilledHardsuit
   entities:
   - uid: 28912
@@ -204947,15 +205712,6 @@ entities:
     - type: Transform
       pos: -9.5,-31.5
       parent: 2
-- proto: MagazineBoxAntiMateriel
-  entities:
-  - uid: 17147
-    components:
-    - type: Transform
-      parent: 17144
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: MagazineBoxMagnumPractice
   entities:
   - uid: 1998
@@ -205976,63 +206732,87 @@ entities:
     - type: Transform
       pos: 69.5,-47.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29047
     components:
     - type: Transform
       pos: 13.5,6.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29048
     components:
     - type: Transform
       pos: -50.5,-34.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29049
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 25.5,-60.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29050
     components:
     - type: Transform
       pos: 7.5,-38.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29051
     components:
     - type: Transform
       pos: 39.5,-25.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29052
     components:
     - type: Transform
       pos: 25.5,-50.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29053
     components:
     - type: Transform
       pos: -51.5,-34.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29054
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 1.5,-51.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29055
     components:
     - type: Transform
       pos: -26.5,66.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29056
     components:
     - type: Transform
       pos: -27.5,66.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29057
     components:
     - type: Transform
       pos: -25.5,66.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: MMI
   entities:
   - uid: 29058
@@ -206763,16 +207543,22 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -14.5,2.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29130
     components:
     - type: Transform
       pos: 10.5,-32.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29131
     components:
     - type: Transform
       pos: 50.5,32.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: NTDefaultCircuitBoard
   entities:
   - uid: 29132
@@ -206794,11 +207580,15 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -33.5,-9.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29135
     components:
     - type: Transform
       pos: 35.5,12.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: NuclearBomb
   entities:
   - uid: 29136
@@ -207068,6 +207858,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: 13.5,-50.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PaintingSaturn
   entities:
   - uid: 29175
@@ -207075,6 +207867,8 @@ entities:
     - type: Transform
       pos: 18.5,70.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PaintingSkeletonCigarette
   entities:
   - uid: 29176
@@ -207082,6 +207876,8 @@ entities:
     - type: Transform
       pos: 36.5,73.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PaintingTheGreatWave
   entities:
   - uid: 29177
@@ -207089,6 +207885,8 @@ entities:
     - type: Transform
       pos: -54.5,-47.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PaintingTheKiss
   entities:
   - uid: 29178
@@ -207096,6 +207894,8 @@ entities:
     - type: Transform
       pos: 14.5,-2.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PaintVend
   entities:
   - uid: 29179
@@ -209092,6 +209892,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -36.5,48.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandAtmosiaDeclarationIndependence
   entities:
   - uid: 29475
@@ -209099,16 +209901,22 @@ entities:
     - type: Transform
       pos: -71.5,31.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29476
     components:
     - type: Transform
       pos: -66.5,-26.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29477
     components:
     - type: Transform
       pos: -50.5,35.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandBeachStarYamamoto
   entities:
   - uid: 29478
@@ -209118,6 +209926,8 @@ entities:
     - type: Transform
       pos: -29.5,21.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandBreadLies
   entities:
   - uid: 29479
@@ -209125,6 +209935,8 @@ entities:
     - type: Transform
       pos: -34.5,39.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandClown
   entities:
   - uid: 29480
@@ -209132,11 +209944,15 @@ entities:
     - type: Transform
       pos: -10.5,25.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29481
     components:
     - type: Transform
       pos: -6.5,48.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandCybersun600
   entities:
   - uid: 29482
@@ -209144,6 +209960,8 @@ entities:
     - type: Transform
       pos: -47.5,-45.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandEAT
   entities:
   - uid: 29483
@@ -209151,6 +209969,8 @@ entities:
     - type: Transform
       pos: -26.5,38.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandGreyTide
   entities:
   - uid: 29484
@@ -209158,6 +209978,8 @@ entities:
     - type: Transform
       pos: -22.5,24.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandHaveaPuff
   entities:
   - uid: 29485
@@ -209166,6 +209988,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -39.5,50.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandKudzu
   entities:
   - uid: 29486
@@ -209174,11 +209998,15 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -23.5,50.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29487
     components:
     - type: Transform
       pos: -38.5,30.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandLamarr
   entities:
   - uid: 29488
@@ -209186,6 +210014,8 @@ entities:
     - type: Transform
       pos: -53.5,-26.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandMissingSpacepen
   entities:
   - uid: 29489
@@ -209193,6 +210023,8 @@ entities:
     - type: Transform
       pos: 6.5,66.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandRealExomorph
   entities:
   - uid: 29490
@@ -209201,11 +210033,15 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -65.5,-44.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29491
     components:
     - type: Transform
       pos: -29.5,-9.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandRebelsUnite
   entities:
   - uid: 29492
@@ -209213,6 +210049,8 @@ entities:
     - type: Transform
       pos: 13.5,-2.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandRevolt
   entities:
   - uid: 29493
@@ -209220,17 +210058,23 @@ entities:
     - type: Transform
       pos: -31.5,-58.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29494
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 34.5,73.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29495
     components:
     - type: Transform
       pos: 65.5,39.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandRIPBadger
   entities:
   - uid: 29496
@@ -209238,6 +210082,8 @@ entities:
     - type: Transform
       pos: 39.5,13.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandRouny
   entities:
   - uid: 29497
@@ -209246,6 +210092,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -64.5,-39.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandShamblersJuice
   entities:
   - uid: 29498
@@ -209253,6 +210101,8 @@ entities:
     - type: Transform
       pos: -53.5,-41.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandSyndicateRecruitment
   entities:
   - uid: 29499
@@ -209260,6 +210110,8 @@ entities:
     - type: Transform
       pos: -30.5,-64.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterContrabandVoteWeh
   entities:
   - uid: 29500
@@ -209268,6 +210120,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -31.5,55.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegit12Gauge
   entities:
   - uid: 29501
@@ -209276,6 +210130,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -21.5,-37.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegit50thAnniversaryVintageReprint
   entities:
   - uid: 29502
@@ -209283,6 +210139,8 @@ entities:
     - type: Transform
       pos: 7.5,-39.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitBlessThisSpess
   entities:
   - uid: 29503
@@ -209290,6 +210148,8 @@ entities:
     - type: Transform
       pos: 7.5,-53.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitBotanyFood
   entities:
   - uid: 29504
@@ -209297,6 +210157,8 @@ entities:
     - type: Transform
       pos: -34.5,37.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitBuild
   entities:
   - uid: 29505
@@ -209304,6 +210166,8 @@ entities:
     - type: Transform
       pos: -57.5,43.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitCarbonDioxide
   entities:
   - uid: 29506
@@ -209311,6 +210175,8 @@ entities:
     - type: Transform
       pos: -56.5,23.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitCarpMount
   entities:
   - uid: 29507
@@ -209318,11 +210184,15 @@ entities:
     - type: Transform
       pos: 76.5,3.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29508
     components:
     - type: Transform
       pos: -10.5,36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitCleanliness
   entities:
   - uid: 29509
@@ -209330,21 +210200,29 @@ entities:
     - type: Transform
       pos: 42.5,-60.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29510
     components:
     - type: Transform
       pos: -21.5,-41.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29511
     components:
     - type: Transform
       pos: 33.5,-28.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29512
     components:
     - type: Transform
       pos: -31.5,-36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitCohibaRobustoAd
   entities:
   - uid: 29513
@@ -209352,6 +210230,8 @@ entities:
     - type: Transform
       pos: -10.5,33.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitDoNotQuestion
   entities:
   - uid: 29514
@@ -209359,21 +210239,29 @@ entities:
     - type: Transform
       pos: -11.5,21.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29515
     components:
     - type: Transform
       pos: -7.5,-62.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29516
     components:
     - type: Transform
       pos: 54.5,-52.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29517
     components:
     - type: Transform
       pos: -47.5,-3.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitHelpOthers
   entities:
   - uid: 29518
@@ -209381,26 +210269,36 @@ entities:
     - type: Transform
       pos: 29.5,-40.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29519
     components:
     - type: Transform
       pos: 33.5,-31.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29520
     components:
     - type: Transform
       pos: 23.5,-29.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29521
     components:
     - type: Transform
       pos: 2.5,-61.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29522
     components:
     - type: Transform
       pos: 32.5,-6.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitHighClassMartini
   entities:
   - uid: 29523
@@ -209408,11 +210306,15 @@ entities:
     - type: Transform
       pos: -6.5,37.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29524
     components:
     - type: Transform
       pos: -6.5,37.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitIan
   entities:
   - uid: 29525
@@ -209420,11 +210322,15 @@ entities:
     - type: Transform
       pos: -24.5,-70.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29526
     components:
     - type: Transform
       pos: -15.5,-2.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitLoveIan
   entities:
   - uid: 29527
@@ -209432,6 +210338,8 @@ entities:
     - type: Transform
       pos: -14.5,-2.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitMime
   entities:
   - uid: 29528
@@ -209439,6 +210347,8 @@ entities:
     - type: Transform
       pos: -11.5,52.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitMoreBread
   entities:
   - uid: 29529
@@ -209446,6 +210356,8 @@ entities:
     - type: Transform
       pos: -26.5,33.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitNanomichiAd
   entities:
   - uid: 29530
@@ -209454,6 +210366,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -34.5,65.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitNanotrasenLogo
   entities:
   - uid: 29531
@@ -209462,194 +210376,270 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 24.5,-6.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29532
     components:
     - type: Transform
       pos: -82.5,16.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29533
     components:
     - type: Transform
       pos: -82.5,12.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29534
     components:
     - type: Transform
       pos: -14.5,17.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29535
     components:
     - type: Transform
       pos: -21.5,59.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29536
     components:
     - type: Transform
       pos: 54.5,-24.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29537
     components:
     - type: Transform
       pos: -20.5,-32.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29538
     components:
     - type: Transform
       pos: -15.5,-44.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29539
     components:
     - type: Transform
       pos: -21.5,-36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29540
     components:
     - type: Transform
       pos: -16.5,-13.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29541
     components:
     - type: Transform
       pos: 32.5,-1.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29542
     components:
     - type: Transform
       pos: 1.5,26.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29543
     components:
     - type: Transform
       pos: 42.5,-25.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29544
     components:
     - type: Transform
       pos: 34.5,-72.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29545
     components:
     - type: Transform
       pos: -7.5,25.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29546
     components:
     - type: Transform
       pos: -16.5,-6.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29547
     components:
     - type: Transform
       pos: -2.5,-28.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29548
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 23.5,-32.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29549
     components:
     - type: Transform
       pos: -31.5,-34.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29550
     components:
     - type: Transform
       pos: 25.5,-52.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29551
     components:
     - type: Transform
       pos: -16.5,-28.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29552
     components:
     - type: Transform
       pos: 42.5,-58.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29553
     components:
     - type: Transform
       pos: -21.5,66.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29554
     components:
     - type: Transform
       pos: 40.5,-72.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29555
     components:
     - type: Transform
       pos: 46.5,-24.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29556
     components:
     - type: Transform
       pos: 11.5,4.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29557
     components:
     - type: Transform
       pos: -4.5,-62.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29558
     components:
     - type: Transform
       pos: 13.5,12.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29559
     components:
     - type: Transform
       pos: -39.5,7.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29560
     components:
     - type: Transform
       pos: 15.5,-6.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29561
     components:
     - type: Transform
       pos: -28.5,-73.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29562
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 19.5,-32.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29563
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 66.5,-8.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29564
     components:
     - type: Transform
       pos: 21.5,100.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29565
     components:
     - type: Transform
       pos: -8.5,101.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29566
     components:
     - type: Transform
       pos: -22.5,101.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29567
     components:
     - type: Transform
       pos: -53.5,95.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29568
     components:
     - type: Transform
       pos: -44.5,70.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitNoERP
   entities:
   - uid: 29569
@@ -209657,31 +210647,43 @@ entities:
     - type: Transform
       pos: -75.5,-36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29570
     components:
     - type: Transform
       pos: -73.5,-36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29571
     components:
     - type: Transform
       pos: -74.5,-36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29572
     components:
     - type: Transform
       pos: -75.5,-35.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29573
     components:
     - type: Transform
       pos: -75.5,-34.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29574
     components:
     - type: Transform
       pos: -75.5,-33.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitPDAAd
   entities:
   - uid: 29575
@@ -209690,6 +210692,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -38.5,65.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitPeriodicTable
   entities:
   - uid: 29576
@@ -209698,6 +210702,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 9.5,-32.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitPieSlice
   entities:
   - uid: 29577
@@ -209705,6 +210711,8 @@ entities:
     - type: Transform
       pos: -34.5,32.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitReportCrimes
   entities:
   - uid: 29578
@@ -209712,26 +210720,36 @@ entities:
     - type: Transform
       pos: 52.5,-48.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29579
     components:
     - type: Transform
       pos: 34.5,-32.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29580
     components:
     - type: Transform
       pos: -27.5,16.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29581
     components:
     - type: Transform
       pos: 10.5,21.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29582
     components:
     - type: Transform
       pos: 35.5,-2.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitSafetyInternals
   entities:
   - uid: 29583
@@ -209739,6 +210757,8 @@ entities:
     - type: Transform
       pos: 21.5,-29.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitSafetyMothEpi
   entities:
   - uid: 29584
@@ -209746,6 +210766,8 @@ entities:
     - type: Transform
       pos: 49.5,36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitSafetyMothPiping
   entities:
   - uid: 29585
@@ -209753,6 +210775,8 @@ entities:
     - type: Transform
       pos: -46.5,35.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitScience
   entities:
   - uid: 29586
@@ -209760,22 +210784,30 @@ entities:
     - type: Transform
       pos: -24.5,-42.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29587
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -26.5,-48.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29588
     components:
     - type: Transform
       pos: -16.5,-22.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29589
     components:
     - type: Transform
       pos: -41.5,-35.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitSecWatch
   entities:
   - uid: 29590
@@ -209783,11 +210815,15 @@ entities:
     - type: Transform
       pos: -26.5,44.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29591
     components:
     - type: Transform
       pos: 46.5,-2.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitShoukou
   entities:
   - uid: 29592
@@ -209795,6 +210831,8 @@ entities:
     - type: Transform
       pos: 36.5,64.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitSoftCapPopArt
   entities:
   - uid: 29593
@@ -209802,6 +210840,8 @@ entities:
     - type: Transform
       pos: -25.5,24.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitWalk
   entities:
   - uid: 29594
@@ -209810,6 +210850,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -33.5,56.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterLegitWorkForAFuture
   entities:
   - uid: 29595
@@ -209817,11 +210859,15 @@ entities:
     - type: Transform
       pos: 19.5,-7.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29596
     components:
     - type: Transform
       pos: -27.5,18.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PosterMapDelta
   entities:
   - uid: 29597
@@ -209829,12 +210875,16 @@ entities:
     - type: Transform
       pos: -3.5,25.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 29598
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -24.5,70.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: PottedPlant0
   entities:
   - uid: 29599
@@ -211520,6 +212570,12 @@ entities:
       parent: 2
 - proto: PowerCageRecharger
   entities:
+  - uid: 1846
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 66.5,13.5
+      parent: 2
   - uid: 29866
     components:
     - type: Transform
@@ -219255,6 +220311,11 @@ entities:
       parent: 2
 - proto: Rack
   entities:
+  - uid: 1819
+    components:
+    - type: Transform
+      pos: 68.5,12.5
+      parent: 2
   - uid: 31008
     components:
     - type: Transform
@@ -219381,11 +220442,6 @@ entities:
     - type: Transform
       pos: 66.5,16.5
       parent: 2
-  - uid: 31032
-    components:
-    - type: Transform
-      pos: 66.5,14.5
-      parent: 2
   - uid: 31033
     components:
     - type: Transform
@@ -230301,66 +231357,92 @@ entities:
       rot: 3.141592653589793 rad
       pos: 3.5,-17.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33029
     components:
     - type: Transform
       pos: 3.5,-6.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33030
     components:
     - type: Transform
       pos: 25.5,-36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33031
     components:
     - type: Transform
       pos: -9.5,16.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33032
     components:
     - type: Transform
       pos: -1.5,-66.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33033
     components:
     - type: Transform
       pos: -2.5,-44.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33034
     components:
     - type: Transform
       pos: 14.5,21.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33035
     components:
     - type: Transform
       pos: 24.5,7.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33036
     components:
     - type: Transform
       pos: -15.5,-17.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33037
     components:
     - type: Transform
       pos: -20.5,-5.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33038
     components:
     - type: Transform
       pos: -20.5,25.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33039
     components:
     - type: Transform
       pos: -4.5,-13.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33040
     components:
     - type: Transform
       pos: -4.5,-6.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: ScreenTimer
   entities:
   - uid: 33041
@@ -230369,6 +231451,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -32.5,62.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: Screwdriver
   entities:
   - uid: 17070
@@ -230391,16 +231475,16 @@ entities:
       canCollide: False
 - proto: SecBreachingHammer
   entities:
-  - uid: 33044
-    components:
-    - type: Transform
-      pos: 66.420746,14.549218
-      parent: 2
-  - uid: 33045
+  - uid: 1818
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 66.420746,14.502343
+      pos: 68.4583,12.435567
+      parent: 2
+  - uid: 33044
+    components:
+    - type: Transform
+      pos: 68.50517,12.474629
       parent: 2
 - proto: SecurityTechFab
   entities:
@@ -230956,22 +232040,30 @@ entities:
     - type: Transform
       pos: -12.5,33.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33130
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -3.5,30.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33131
     components:
     - type: Transform
       pos: -6.5,41.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33132
     components:
     - type: Transform
       pos: -2.5,55.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: ShelfStoreKitchen
   entities:
   - uid: 33133
@@ -232393,33 +233485,45 @@ entities:
     - type: Transform
       pos: 59.5,21.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33392
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -120.5,11.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33393
     components:
     - type: Transform
       pos: -124.5,6.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33394
     components:
     - type: Transform
       pos: -128.5,44.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33395
     components:
     - type: Transform
       pos: -132.5,6.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33396
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -136.5,11.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: ShuttleWindow
   entities:
   - uid: 33397
@@ -232436,6 +233540,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -127.5,10.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignalButton
   entities:
   - uid: 33399
@@ -232452,6 +233558,8 @@ entities:
         33371:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33400
     components:
     - type: Transform
@@ -232493,6 +233601,8 @@ entities:
         33241:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33401
     components:
     - type: Transform
@@ -232525,6 +233635,8 @@ entities:
         33253:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33402
     components:
     - type: Transform
@@ -232538,6 +233650,8 @@ entities:
         1618:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33403
     components:
     - type: Transform
@@ -232552,6 +233666,8 @@ entities:
         33211:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33404
     components:
     - type: Transform
@@ -232566,6 +233682,8 @@ entities:
         33220:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33405
     components:
     - type: Transform
@@ -232585,6 +233703,8 @@ entities:
         358:
         - - Pressed
           - DoorBolt
+    - type: Fixtures
+      fixtures: {}
   - uid: 33406
     components:
     - type: Transform
@@ -232596,6 +233716,8 @@ entities:
         1636:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33407
     components:
     - type: Transform
@@ -232612,6 +233734,8 @@ entities:
         33231:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33408
     components:
     - type: Transform
@@ -232629,6 +233753,8 @@ entities:
         33234:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33409
     components:
     - type: MetaData
@@ -232648,6 +233774,8 @@ entities:
         33230:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33410
     components:
     - type: MetaData
@@ -232661,12 +233789,16 @@ entities:
         208:
         - - Pressed
           - DoorBolt
+    - type: Fixtures
+      fixtures: {}
   - uid: 33411
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -25.5,-16.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33412
     components:
     - type: Transform
@@ -232693,6 +233825,8 @@ entities:
         199:
         - - Pressed
           - DoorBolt
+    - type: Fixtures
+      fixtures: {}
   - uid: 33413
     components:
     - type: Transform
@@ -232706,6 +233840,8 @@ entities:
         33156:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33414
     components:
     - type: Transform
@@ -232723,6 +233859,8 @@ entities:
         1631:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33415
     components:
     - type: Transform
@@ -232737,12 +233875,16 @@ entities:
         33268:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33416
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 16.5,-52.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33417
     components:
     - type: Transform
@@ -232775,6 +233917,8 @@ entities:
         33303:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33418
     components:
     - type: Transform
@@ -232789,6 +233933,8 @@ entities:
         1648:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33419
     components:
     - type: Transform
@@ -232800,6 +233946,8 @@ entities:
         190:
         - - Pressed
           - DoorBolt
+    - type: Fixtures
+      fixtures: {}
   - uid: 33420
     components:
     - type: Transform
@@ -232811,12 +233959,16 @@ entities:
         1652:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33421
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 6.5,-3.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33422
     components:
     - type: Transform
@@ -232858,6 +234010,8 @@ entities:
         33273:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33423
     components:
     - type: Transform
@@ -232878,12 +234032,16 @@ entities:
         1651:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33424
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 21.495049,-27.106756
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33425
     components:
     - type: Transform
@@ -232897,6 +234055,8 @@ entities:
         33148:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33426
     components:
     - type: Transform
@@ -232907,6 +234067,8 @@ entities:
         33501:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33427
     components:
     - type: Transform
@@ -232927,6 +234089,8 @@ entities:
         1649:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33428
     components:
     - type: Transform
@@ -232938,6 +234102,8 @@ entities:
         33266:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33429
     components:
     - type: Transform
@@ -232954,6 +234120,8 @@ entities:
         33154:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33430
     components:
     - type: Transform
@@ -232971,6 +234139,8 @@ entities:
         33272:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33431
     components:
     - type: Transform
@@ -232982,6 +234152,8 @@ entities:
         33267:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33432
     components:
     - type: Transform
@@ -232998,6 +234170,8 @@ entities:
         1610:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33433
     components:
     - type: Transform
@@ -233008,6 +234182,8 @@ entities:
         1656:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33434
     components:
     - type: Transform
@@ -233019,6 +234195,8 @@ entities:
         33156:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33435
     components:
     - type: Transform
@@ -233030,6 +234208,8 @@ entities:
         1650:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33436
     components:
     - type: Transform
@@ -233041,6 +234221,8 @@ entities:
         198:
         - - Pressed
           - DoorBolt
+    - type: Fixtures
+      fixtures: {}
   - uid: 33437
     components:
     - type: Transform
@@ -233052,12 +234234,16 @@ entities:
         185:
         - - Pressed
           - DoorBolt
+    - type: Fixtures
+      fixtures: {}
   - uid: 33438
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 4.5,61.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33439
     components:
     - type: Transform
@@ -233068,6 +234254,8 @@ entities:
         1663:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33440
     components:
     - type: Transform
@@ -233082,6 +234270,8 @@ entities:
         33153:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33441
     components:
     - type: Transform
@@ -233093,6 +234283,8 @@ entities:
         191:
         - - Pressed
           - DoorBolt
+    - type: Fixtures
+      fixtures: {}
   - uid: 33442
     components:
     - type: Transform
@@ -233104,6 +234296,8 @@ entities:
         170:
         - - Pressed
           - DoorBolt
+    - type: Fixtures
+      fixtures: {}
   - uid: 33443
     components:
     - type: Transform
@@ -233115,6 +234309,8 @@ entities:
         197:
         - - Pressed
           - DoorBolt
+    - type: Fixtures
+      fixtures: {}
   - uid: 33444
     components:
     - type: Transform
@@ -233125,6 +234321,8 @@ entities:
         1655:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33445
     components:
     - type: Transform
@@ -233136,6 +234334,8 @@ entities:
         1653:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33446
     components:
     - type: Transform
@@ -233153,6 +234353,8 @@ entities:
         1622:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33447
     components:
     - type: Transform
@@ -233164,6 +234366,8 @@ entities:
         1660:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33448
     components:
     - type: Transform
@@ -233190,6 +234394,8 @@ entities:
         33265:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33449
     components:
     - type: Transform
@@ -233204,6 +234410,8 @@ entities:
         33269:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33450
     components:
     - type: Transform
@@ -233218,6 +234426,8 @@ entities:
         33276:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33451
     components:
     - type: Transform
@@ -233235,6 +234445,8 @@ entities:
         1626:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33452
     components:
     - type: Transform
@@ -233255,6 +234467,8 @@ entities:
         33309:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33453
     components:
     - type: Transform
@@ -233278,12 +234492,16 @@ entities:
         33281:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33454
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 21.5,-27.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33455
     components:
     - type: Transform
@@ -233301,6 +234519,8 @@ entities:
         33287:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33456
     components:
     - type: Transform
@@ -233324,6 +234544,8 @@ entities:
         33157:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33457
     components:
     - type: Transform
@@ -233335,6 +234557,8 @@ entities:
         195:
         - - Pressed
           - DoorBolt
+    - type: Fixtures
+      fixtures: {}
   - uid: 33458
     components:
     - type: Transform
@@ -233352,6 +234576,8 @@ entities:
         33299:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33459
     components:
     - type: Transform
@@ -233378,6 +234604,8 @@ entities:
         33355:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33460
     components:
     - type: Transform
@@ -233388,6 +234616,8 @@ entities:
         1635:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33461
     components:
     - type: Transform
@@ -233414,6 +234644,8 @@ entities:
         1615:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33462
     components:
     - type: Transform
@@ -233425,6 +234657,8 @@ entities:
         296:
         - - Pressed
           - DoorBolt
+    - type: Fixtures
+      fixtures: {}
   - uid: 33463
     components:
     - type: Transform
@@ -233436,6 +234670,8 @@ entities:
         211:
         - - Pressed
           - DoorBolt
+    - type: Fixtures
+      fixtures: {}
   - uid: 33464
     components:
     - type: Transform
@@ -233447,6 +234683,8 @@ entities:
         651:
         - - Pressed
           - DoorBolt
+    - type: Fixtures
+      fixtures: {}
   - uid: 33465
     components:
     - type: Transform
@@ -233461,6 +234699,8 @@ entities:
         696:
         - - Pressed
           - DoorBolt
+    - type: Fixtures
+      fixtures: {}
   - uid: 33466
     components:
     - type: Transform
@@ -233478,6 +234718,8 @@ entities:
         33195:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33467
     components:
     - type: Transform
@@ -233489,6 +234731,8 @@ entities:
         677:
         - - Pressed
           - DoorBolt
+    - type: Fixtures
+      fixtures: {}
   - uid: 33468
     components:
     - type: Transform
@@ -233500,6 +234744,8 @@ entities:
         678:
         - - Pressed
           - DoorBolt
+    - type: Fixtures
+      fixtures: {}
   - uid: 33469
     components:
     - type: Transform
@@ -233514,6 +234760,8 @@ entities:
         33389:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33470
     components:
     - type: Transform
@@ -233528,6 +234776,8 @@ entities:
         33373:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33471
     components:
     - type: Transform
@@ -233542,6 +234792,8 @@ entities:
         33376:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33472
     components:
     - type: Transform
@@ -233556,6 +234808,8 @@ entities:
         33372:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33473
     components:
     - type: Transform
@@ -233576,6 +234830,8 @@ entities:
         33166:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
 - proto: SignalButtonDirectional
   entities:
   - uid: 33474
@@ -233601,6 +234857,8 @@ entities:
         33328:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33475
     components:
     - type: Transform
@@ -233645,6 +234903,8 @@ entities:
         17634:
         - - Pressed
           - Forward
+    - type: Fixtures
+      fixtures: {}
   - uid: 33476
     components:
     - type: Transform
@@ -233697,11 +234957,15 @@ entities:
         1669:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33477
     components:
     - type: Transform
       pos: 54.29258,-1.3460552
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33478
     components:
     - type: Transform
@@ -233722,6 +234986,8 @@ entities:
         30675:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33479
     components:
     - type: Transform
@@ -233738,6 +235004,8 @@ entities:
         33352:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33480
     components:
     - type: Transform
@@ -233769,6 +235037,8 @@ entities:
         33291:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33481
     components:
     - type: Transform
@@ -233786,6 +235056,8 @@ entities:
         1629:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33482
     components:
     - type: Transform
@@ -233796,6 +235068,8 @@ entities:
         28672:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33483
     components:
     - type: Transform
@@ -233813,6 +235087,8 @@ entities:
         1624:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33484
     components:
     - type: Transform
@@ -233824,6 +235100,8 @@ entities:
         28670:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33485
     components:
     - type: Transform
@@ -233834,18 +235112,24 @@ entities:
         28671:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33486
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -17.5,-82.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33487
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -23.5,-82.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33488
     components:
     - type: Transform
@@ -233859,6 +235143,8 @@ entities:
         33262:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33489
     components:
     - type: Transform
@@ -233870,6 +235156,8 @@ entities:
         28673:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33490
     components:
     - type: Transform
@@ -233892,6 +235180,8 @@ entities:
         30019:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33491
     components:
     - type: Transform
@@ -233918,24 +235208,32 @@ entities:
         33224:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33492
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 47.5,8.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33493
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 45.5,8.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33494
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 46.5,8.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33495
     components:
     - type: Transform
@@ -233956,6 +235254,8 @@ entities:
         33388:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33496
     components:
     - type: Transform
@@ -233976,6 +235276,8 @@ entities:
         33336:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33497
     components:
     - type: Transform
@@ -233987,6 +235289,8 @@ entities:
         33340:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33498
     components:
     - type: Transform
@@ -233998,6 +235302,8 @@ entities:
         33339:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33499
     components:
     - type: Transform
@@ -234030,6 +235336,8 @@ entities:
         33346:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
   - uid: 33500
     components:
     - type: Transform
@@ -234047,6 +235355,8 @@ entities:
         33180:
         - - Pressed
           - Toggle
+    - type: Fixtures
+      fixtures: {}
 - proto: SignalControlledValve
   entities:
   - uid: 33501
@@ -234065,6 +235375,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: 66.5,5.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignBio
   entities:
   - uid: 33503
@@ -234072,16 +235384,22 @@ entities:
     - type: Transform
       pos: -31.5,-29.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33504
     components:
     - type: Transform
       pos: -31.5,-25.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33505
     components:
     - type: Transform
       pos: 26.5,-53.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignBiohazard
   entities:
   - uid: 33506
@@ -234089,11 +235407,15 @@ entities:
     - type: Transform
       pos: 26.5,-62.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33507
     components:
     - type: Transform
       pos: 28.5,-53.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignBiohazardMed
   entities:
   - uid: 33508
@@ -234102,6 +235424,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -26.5,-37.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignBridge
   entities:
   - uid: 33509
@@ -234109,21 +235433,29 @@ entities:
     - type: Transform
       pos: 15.5,17.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33510
     components:
     - type: Transform
       pos: -16.5,12.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33511
     components:
     - type: Transform
       pos: -16.5,17.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33512
     components:
     - type: Transform
       pos: 15.5,12.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignCanisters
   entities:
   - uid: 33513
@@ -234131,6 +235463,8 @@ entities:
     - type: Transform
       pos: -24.5,-48.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignCans
   entities:
   - uid: 33514
@@ -234139,6 +235473,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: -47.5,22.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignChem
   entities:
   - uid: 33515
@@ -234146,11 +235482,15 @@ entities:
     - type: Transform
       pos: 9.5,-28.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33516
     components:
     - type: Transform
       pos: 1.5,-32.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignCloning
   entities:
   - uid: 33517
@@ -234159,6 +235499,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 15.5,-36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignConference
   entities:
   - uid: 33518
@@ -234166,6 +235508,8 @@ entities:
     - type: Transform
       pos: 1.5,11.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignCryo
   entities:
   - uid: 33519
@@ -234173,11 +235517,15 @@ entities:
     - type: Transform
       pos: 24.5,-12.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33520
     components:
     - type: Transform
       pos: 27.5,-12.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignCryogenicsMed
   entities:
   - uid: 33521
@@ -234185,6 +235533,8 @@ entities:
     - type: Transform
       pos: 19.5,-36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignDetective
   entities:
   - uid: 33522
@@ -234192,6 +235542,8 @@ entities:
     - type: Transform
       pos: 37.5,7.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignDirectionalBridge
   entities:
   - uid: 33523
@@ -234200,24 +235552,32 @@ entities:
       rot: 3.141592653589793 rad
       pos: 15.5,-10.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33524
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -16.5,-10.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33525
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -20.508827,7.2060776
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33526
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 19.514046,7.536875
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignDirectionalEng
   entities:
   - uid: 33527
@@ -234226,23 +235586,31 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -20.508827,7.7060776
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33528
     components:
     - type: Transform
       pos: -20.53457,21.45121
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33529
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -2.4954174,-21.28422
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33530
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -2.5399108,-62.245914
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignDirectionalEscapePod
   entities:
   - uid: 33531
@@ -234251,12 +235619,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -15.5,59.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33532
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -16.5,25.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignDirectionalEvac
   entities:
   - uid: 33533
@@ -234264,36 +235636,50 @@ entities:
     - type: Transform
       pos: -20.465418,3.2079785
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33534
     components:
     - type: Transform
       pos: -20.53457,21.185585
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33535
     components:
     - type: Transform
       pos: 1.4544559,-21.818363
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33536
     components:
     - type: Transform
       pos: -2.5215883,-62.742023
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33537
     components:
     - type: Transform
       pos: -2.4954174,-21.78422
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33538
     components:
     - type: Transform
       pos: 1.4627867,-62.75765
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33539
     components:
     - type: Transform
       pos: 19.544283,3.1722114
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignDirectionalLibrary
   entities:
   - uid: 33540
@@ -234302,11 +235688,15 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -16.483158,-2.4910235
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33541
     components:
     - type: Transform
       pos: -16.489834,25.303034
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignDirectionalMed
   entities:
   - uid: 33542
@@ -234314,34 +235704,46 @@ entities:
     - type: Transform
       pos: -20.465418,3.4582398
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33543
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -16.458973,21.244955
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33544
     components:
     - type: Transform
       pos: 19.544283,3.4222114
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33545
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.4471617,-62.50765
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33546
     components:
     - type: Transform
       pos: 1.504024,25.238964
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33547
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 1.4544559,-21.568363
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignDirectionalSci
   entities:
   - uid: 33548
@@ -234349,28 +235751,38 @@ entities:
     - type: Transform
       pos: -20.53457,21.716835
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33549
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -2.4954174,-21.53422
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33550
     components:
     - type: Transform
       pos: -20.508827,7.4560776
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33551
     components:
     - type: Transform
       pos: 19.514046,7.286875
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33552
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -2.5372133,-62.492023
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignDirectionalSec
   entities:
   - uid: 33553
@@ -234378,36 +235790,48 @@ entities:
     - type: Transform
       pos: -20.465418,3.7397835
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33554
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.4471617,-62.25765
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33555
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -16.458973,21.776205
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33556
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 1.4544559,-21.302738
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33557
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 19.544283,3.6722114
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33558
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 1.472774,25.770214
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignDirectionalSupply
   entities:
   - uid: 33559
@@ -234416,18 +235840,24 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 1.504024,25.520214
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33560
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -16.458973,21.526205
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33561
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 19.514046,7.786875
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignDisposalSpace
   entities:
   - uid: 33562
@@ -234436,17 +235866,23 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 34.5,60.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33563
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 32.5,60.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33564
     components:
     - type: Transform
       pos: 27.5,-70.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignDoors
   entities:
   - uid: 33565
@@ -234454,173 +235890,235 @@ entities:
     - type: Transform
       pos: -35.5,-25.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33566
     components:
     - type: Transform
       pos: -39.5,-25.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33567
     components:
     - type: Transform
       pos: -39.5,-29.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33568
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 10.5,96.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33569
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 10.5,100.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33570
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 2.5,100.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33571
     components:
     - type: Transform
       pos: 10.5,70.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33572
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -19.5,70.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33573
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -11.5,70.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33574
     components:
     - type: Transform
       pos: -16.5,-17.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33575
     components:
     - type: Transform
       pos: -44.5,53.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33576
     components:
     - type: Transform
       pos: -42.5,49.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33577
     components:
     - type: Transform
       pos: 15.5,-17.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33578
     components:
     - type: Transform
       pos: -15.5,17.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33579
     components:
     - type: Transform
       pos: 14.5,17.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33580
     components:
     - type: Transform
       pos: -40.5,-73.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33581
     components:
     - type: Transform
       pos: -9.5,-81.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33582
     components:
     - type: Transform
       pos: 19.5,-8.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33583
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -41.5,70.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33584
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -33.5,70.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33585
     components:
     - type: Transform
       pos: 2.5,70.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33586
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -11.5,96.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33587
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 2.5,96.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33588
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -11.5,100.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33589
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -19.5,96.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33590
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -19.5,100.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33591
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -41.5,96.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33592
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -41.5,100.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33593
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -33.5,100.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33594
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -33.5,96.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33595
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -51.5,98.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignElectricalMed
   entities:
   - uid: 33596
@@ -234628,87 +236126,121 @@ entities:
     - type: Transform
       pos: -79.5,-17.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33597
     components:
     - type: Transform
       pos: -105.5,-1.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33598
     components:
     - type: Transform
       pos: -86.5,-21.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33599
     components:
     - type: Transform
       pos: -94.5,-21.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33600
     components:
     - type: Transform
       pos: -94.5,4.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33601
     components:
     - type: Transform
       pos: -86.5,4.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33602
     components:
     - type: Transform
       pos: -104.5,3.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33603
     components:
     - type: Transform
       pos: -105.5,-13.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33604
     components:
     - type: Transform
       pos: -94.5,6.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33605
     components:
     - type: Transform
       pos: -86.5,6.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33606
     components:
     - type: Transform
       pos: -94.5,-19.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33607
     components:
     - type: Transform
       pos: -86.5,-19.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33608
     components:
     - type: Transform
       pos: -104.5,-18.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33609
     components:
     - type: Transform
       pos: -103.5,-13.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33610
     components:
     - type: Transform
       pos: -103.5,-1.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33611
     components:
     - type: Transform
       pos: -79.5,3.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33612
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 61.5,-42.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignEngineering
   entities:
   - uid: 33613
@@ -234716,6 +236248,8 @@ entities:
     - type: Transform
       pos: -9.5,-78.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignEVA
   entities:
   - uid: 33614
@@ -234723,27 +236257,37 @@ entities:
     - type: Transform
       pos: -14.5,-10.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33615
     components:
     - type: Transform
       pos: -8.5,-10.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33616
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -13.5,-17.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33617
     components:
     - type: Transform
       pos: 52.5,10.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33618
     components:
     - type: Transform
       pos: 4.5,-10.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignExamroom
   entities:
   - uid: 33619
@@ -234751,16 +236295,22 @@ entities:
     - type: Transform
       pos: 42.5,-31.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33620
     components:
     - type: Transform
       pos: 29.5,-36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33621
     components:
     - type: Transform
       pos: 15.5,-28.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignFlammableMed
   entities:
   - uid: 33622
@@ -234768,17 +236318,23 @@ entities:
     - type: Transform
       pos: -44.5,52.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33623
     components:
     - type: Transform
       pos: -44.5,50.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33624
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -34.5,-47.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignHydro1
   entities:
   - uid: 33625
@@ -234786,6 +236342,8 @@ entities:
     - type: Transform
       pos: 37.5,41.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignInterrogation
   entities:
   - uid: 33626
@@ -234794,12 +236352,16 @@ entities:
       rot: 3.141592653589793 rad
       pos: 43.5,25.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33627
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 39.5,28.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignJanitor
   entities:
   - uid: 33628
@@ -234808,12 +236370,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,55.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33629
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -59.5,83.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignKiddiePlaque
   entities:
   - uid: 33630
@@ -234825,6 +236391,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: 14.5,-47.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignLawyer
   entities:
   - uid: 33631
@@ -234832,12 +236400,16 @@ entities:
     - type: Transform
       pos: 44.5,13.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33632
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 22.5,7.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignLibrary
   entities:
   - uid: 33633
@@ -234846,6 +236418,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -20.5,-4.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignMail
   entities:
   - uid: 33634
@@ -234853,6 +236427,8 @@ entities:
     - type: Transform
       pos: 16.5,25.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignMedical
   entities:
   - uid: 33635
@@ -234860,51 +236436,71 @@ entities:
     - type: Transform
       pos: 50.5,-31.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33636
     components:
     - type: Transform
       pos: 15.5,-21.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33637
     components:
     - type: Transform
       pos: 1.5,-27.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33638
     components:
     - type: Transform
       pos: 25.5,-41.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33639
     components:
     - type: Transform
       pos: 15.5,-27.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33640
     components:
     - type: Transform
       pos: 33.5,-32.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33641
     components:
     - type: Transform
       pos: 1.5,-22.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33642
     components:
     - type: Transform
       pos: 19.5,-41.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33643
     components:
     - type: Transform
       pos: 42.5,-33.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33644
     components:
     - type: Transform
       pos: 27.5,-32.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignMorgue
   entities:
   - uid: 33645
@@ -234913,12 +236509,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 5.5,-47.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33646
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 1.5,-49.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignNosmoking
   entities:
   - uid: 33647
@@ -234926,11 +236526,15 @@ entities:
     - type: Transform
       pos: 17.5,-22.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33648
     components:
     - type: Transform
       pos: -73.5,30.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignRadiationMed
   entities:
   - uid: 33649
@@ -234938,17 +236542,23 @@ entities:
     - type: Transform
       pos: -50.5,3.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33650
     components:
     - type: Transform
       pos: -71.5,3.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33651
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -72.5,-8.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignRedOne
   entities:
   - uid: 33652
@@ -234957,6 +236567,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 43.5,26.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignRedTwo
   entities:
   - uid: 33653
@@ -234965,6 +236577,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 39.5,27.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignRobo
   entities:
   - uid: 33654
@@ -234972,11 +236586,15 @@ entities:
     - type: Transform
       pos: -2.5,-42.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33655
     components:
     - type: Transform
       pos: -6.5,-53.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignSalvage
   entities:
   - uid: 33656
@@ -234985,6 +236603,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 26.5,49.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignScience
   entities:
   - uid: 33657
@@ -234992,41 +236612,57 @@ entities:
     - type: Transform
       pos: -2.5,-22.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33658
     components:
     - type: Transform
       pos: -13.5,-28.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33659
     components:
     - type: Transform
       pos: -10.5,-28.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33660
     components:
     - type: Transform
       pos: -2.5,-27.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33661
     components:
     - type: Transform
       pos: -16.5,-21.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33662
     components:
     - type: Transform
       pos: -30.5,-42.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33663
     components:
     - type: Transform
       pos: -21.5,-46.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33664
     components:
     - type: Transform
       pos: -2.5,-32.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignSecurearea
   entities:
   - uid: 33665
@@ -235035,128 +236671,178 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -132.5,26.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33666
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -124.5,26.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33667
     components:
     - type: Transform
       pos: -129.5,44.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33668
     components:
     - type: Transform
       pos: -67.5,43.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33669
     components:
     - type: Transform
       pos: -67.5,47.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33670
     components:
     - type: Transform
       pos: -67.5,39.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33671
     components:
     - type: Transform
       pos: -67.5,35.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33672
     components:
     - type: Transform
       pos: -67.5,31.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33673
     components:
     - type: Transform
       pos: -67.5,27.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33674
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -15.5,-32.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33675
     components:
     - type: Transform
       pos: -53.5,3.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33676
     components:
     - type: Transform
       pos: -18.5,-36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33677
     components:
     - type: Transform
       pos: -11.5,-32.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33678
     components:
     - type: Transform
       pos: -42.5,52.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33679
     components:
     - type: Transform
       pos: -67.5,19.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33680
     components:
     - type: Transform
       pos: -49.5,-5.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33681
     components:
     - type: Transform
       pos: 15.5,-2.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33682
     components:
     - type: Transform
       pos: -45.5,26.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33683
     components:
     - type: Transform
       pos: 28.5,-62.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33684
     components:
     - type: Transform
       pos: -50.5,17.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33685
     components:
     - type: Transform
       pos: -50.5,7.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33686
     components:
     - type: Transform
       pos: -42.5,50.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33687
     components:
     - type: Transform
       pos: -49.5,-9.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33688
     components:
     - type: Transform
       pos: -78.5,17.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33689
     components:
     - type: Transform
       pos: -127.5,39.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignSecureSmall
   entities:
   - uid: 33690
@@ -235165,6 +236851,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 33.5,-43.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignSecurity
   entities:
   - uid: 33691
@@ -235172,23 +236860,31 @@ entities:
     - type: Transform
       pos: -2.5,-78.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33692
     components:
     - type: Transform
       pos: 41.5,15.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33693
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -15.5,66.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33694
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -6.5,66.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignServer
   entities:
   - uid: 33695
@@ -235196,6 +236892,8 @@ entities:
     - type: Transform
       pos: -17.5,-49.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignShock
   entities:
   - uid: 33696
@@ -235204,81 +236902,113 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -68.5,9.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33697
     components:
     - type: Transform
       pos: -55.5,8.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33698
     components:
     - type: Transform
       pos: -58.5,8.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33699
     components:
     - type: Transform
       pos: -40.5,-75.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33700
     components:
     - type: Transform
       pos: -37.5,20.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33701
     components:
     - type: Transform
       pos: -35.5,-29.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33702
     components:
     - type: Transform
       pos: -43.5,0.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33703
     components:
     - type: Transform
       pos: -49.5,-10.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33704
     components:
     - type: Transform
       pos: -49.5,-18.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33705
     components:
     - type: Transform
       pos: -49.5,-25.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33706
     components:
     - type: Transform
       pos: 6.5,-47.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33707
     components:
     - type: Transform
       pos: -33.5,20.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33708
     components:
     - type: Transform
       pos: -49.5,3.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33709
     components:
     - type: Transform
       pos: -49.5,-29.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33710
     components:
     - type: Transform
       pos: -36.5,-80.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33711
     components:
     - type: Transform
       pos: -36.5,-73.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignSmoking
   entities:
   - uid: 33712
@@ -235286,86 +237016,120 @@ entities:
     - type: Transform
       pos: -51.5,31.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33713
     components:
     - type: Transform
       pos: -21.5,-47.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33714
     components:
     - type: Transform
       pos: -26.5,-36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33715
     components:
     - type: Transform
       pos: 65.5,-20.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33716
     components:
     - type: Transform
       pos: 9.5,-47.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33717
     components:
     - type: Transform
       pos: -2.5,-37.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33718
     components:
     - type: Transform
       pos: 33.5,-65.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33719
     components:
     - type: Transform
       pos: -10.5,-29.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33720
     components:
     - type: Transform
       pos: 77.5,-19.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33721
     components:
     - type: Transform
       pos: -25.5,-68.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33722
     components:
     - type: Transform
       pos: -40.5,-12.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33723
     components:
     - type: Transform
       pos: -22.5,18.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33724
     components:
     - type: Transform
       pos: 9.5,-36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33725
     components:
     - type: Transform
       pos: 29.5,-44.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33726
     components:
     - type: Transform
       pos: 2.5,-36.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33727
     components:
     - type: Transform
       pos: -46.5,-4.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33728
     components:
     - type: Transform
       pos: 14.5,-32.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignSpace
   entities:
   - uid: 33729
@@ -235373,41 +237137,57 @@ entities:
     - type: Transform
       pos: -39.5,-56.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33730
     components:
     - type: Transform
       pos: 31.5,-59.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33731
     components:
     - type: Transform
       pos: -59.5,-17.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33732
     components:
     - type: Transform
       pos: 36.5,-72.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33733
     components:
     - type: Transform
       pos: -21.5,-39.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33734
     components:
     - type: Transform
       pos: -60.5,-15.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33735
     components:
     - type: Transform
       pos: -78.5,16.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33736
     components:
     - type: Transform
       pos: -11.5,-82.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignSurgery
   entities:
   - uid: 33737
@@ -235416,6 +237196,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 29.5,-45.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignTelecomms
   entities:
   - uid: 33738
@@ -235424,6 +237206,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 19.5,18.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignToolStorage
   entities:
   - uid: 33739
@@ -235432,6 +237216,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 37.5,3.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignToxins
   entities:
   - uid: 33740
@@ -235439,6 +237225,8 @@ entities:
     - type: Transform
       pos: -26.5,-42.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignVault
   entities:
   - uid: 33741
@@ -235446,11 +237234,15 @@ entities:
     - type: Transform
       pos: 0.5,-6.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33742
     components:
     - type: Transform
       pos: -1.5,1.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignVirology
   entities:
   - uid: 33743
@@ -235459,6 +237251,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: 28.5,-58.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SignXenobio
   entities:
   - uid: 33744
@@ -235466,16 +237260,22 @@ entities:
     - type: Transform
       pos: -43.5,-29.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33745
     components:
     - type: Transform
       pos: -30.5,-32.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 33746
     components:
     - type: Transform
       pos: -43.5,-25.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SilverRing
   entities:
   - uid: 1844
@@ -237473,6 +239273,49 @@ entities:
       parent: 2
     - type: SpamEmitSound
       enabled: False
+- proto: SpawnerSafeRifle
+  entities:
+  - uid: 1814
+    components:
+    - type: Transform
+      pos: 68.5,13.5
+      parent: 2
+  - uid: 1815
+    components:
+    - type: Transform
+      pos: 68.5,14.5
+      parent: 2
+- proto: SpawnerSafeShotguns
+  entities:
+  - uid: 1813
+    components:
+    - type: Transform
+      pos: 64.5,13.5
+      parent: 2
+  - uid: 28404
+    components:
+    - type: Transform
+      pos: 64.5,14.5
+      parent: 2
+- proto: SpawnerSafeSmallArms
+  entities:
+  - uid: 28402
+    components:
+    - type: Transform
+      pos: 64.5,16.5
+      parent: 2
+- proto: SpawnerSafeSMG
+  entities:
+  - uid: 1816
+    components:
+    - type: Transform
+      pos: 68.5,16.5
+      parent: 2
+  - uid: 28406
+    components:
+    - type: Transform
+      pos: 67.5,16.5
+      parent: 2
 - proto: SpawnMechHauler
   entities:
   - uid: 34095
@@ -237480,6 +239323,13 @@ entities:
     - type: Transform
       pos: 10.5,47.5
       parent: 2
+- proto: SpawnMechPaddyFilled
+  entities:
+  - uid: 1820
+    components:
+    - type: Transform
+      pos: 66.5,14.5
+      parent: 2
 - proto: SpawnMechSecPodFilled
   entities:
   - uid: 34096
@@ -239349,53 +241199,71 @@ entities:
     - type: Transform
       pos: 7.5,70.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 34421
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 33.5,-61.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 34422
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 19.5,-12.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 34423
     components:
     - type: Transform
       pos: 18.5,25.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 34424
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -31.5,66.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 34425
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -16.5,-1.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 34426
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,-52.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 34427
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 3.5,-78.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 34428
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -43.5,6.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: StationMapBroken
   entities:
   - uid: 34429
@@ -239404,6 +241272,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 42.5,-40.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SteelBench
   entities:
   - uid: 34430
@@ -242340,6 +244210,8 @@ entities:
     - type: Transform
       pos: 38.5,73.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: SyndieHandyFlag
   entities:
   - uid: 34848
@@ -250703,38 +252575,52 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-3.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 36284
     components:
     - type: Transform
       pos: 20.5,-49.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 36285
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 33.5,-64.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 36286
     components:
     - type: Transform
       pos: 38.5,-32.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 36287
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 50.5,-33.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 36288
     components:
     - type: Transform
       pos: 32.5,-32.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 36289
     components:
     - type: Transform
       pos: 12.5,-59.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: VendingMachineWinter
   entities:
   - uid: 36290
@@ -250827,18 +252713,24 @@ entities:
       rot: 3.141592653589793 rad
       pos: 37.5,29.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 36305
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 45.5,26.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 36306
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 78.5,-0.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: WallmountTelescreenFrame
   entities:
   - uid: 36307
@@ -250847,6 +252739,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: -45.5,-35.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: WallmountTelevision
   entities:
   - uid: 36308
@@ -250857,39 +252751,53 @@ entities:
       rot: 3.141592653589793 rad
       pos: 61.5,33.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 36309
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -11.5,-74.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 36310
     components:
     - type: Transform
       pos: -37.5,7.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 36311
     components:
     - type: Transform
       pos: 28.5,-8.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 36312
     components:
     - type: Transform
       pos: -1.5,25.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 36313
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -20.5,-7.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 36314
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -39.5,14.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: WallReinforced
   entities:
   - uid: 36315
@@ -280088,6 +281996,8 @@ entities:
     - type: Transform
       pos: -73.5,41.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: WarningN2
   entities:
   - uid: 41782
@@ -280095,6 +282005,8 @@ entities:
     - type: Transform
       pos: -73.5,37.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: WarningO2
   entities:
   - uid: 41783
@@ -280102,6 +282014,8 @@ entities:
     - type: Transform
       pos: -73.5,33.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: WarningPlasma
   entities:
   - uid: 41784
@@ -280109,6 +282023,8 @@ entities:
     - type: Transform
       pos: -73.5,29.5
       parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: WarpPoint
   entities:
   - uid: 41785
@@ -280821,81 +282737,6 @@ entities:
     - type: Transform
       pos: 55.5,-3.5
       parent: 2
-- proto: WeaponEarthGovLaserSniper
-  entities:
-  - uid: 28397
-    components:
-    - type: Transform
-      parent: 28396
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: WeaponEnergyGun
-  entities:
-  - uid: 28398
-    components:
-    - type: Transform
-      parent: 28396
-    - type: Item
-      heldPrefix: disabler
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-    - type: HitscanBatteryAmmoProvider
-      proto: BulletDisabler
-  - uid: 28399
-    components:
-    - type: Transform
-      parent: 28396
-    - type: Item
-      heldPrefix: disabler
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-    - type: HitscanBatteryAmmoProvider
-      proto: BulletDisabler
-- proto: WeaponEnergyGunMini
-  entities:
-  - uid: 1883
-    components:
-    - type: Transform
-      parent: 1873
-    - type: Item
-      heldPrefix: disabler
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-    - type: HitscanBatteryAmmoProvider
-      proto: BulletDisabler
-  - uid: 41877
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 46.219055,2.4769573
-      parent: 2
-    - type: Item
-      heldPrefix: disabler
-    - type: HitscanBatteryAmmoProvider
-      proto: BulletDisabler
-  - uid: 41878
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -18.234957,-27.379057
-      parent: 2
-    - type: Item
-      heldPrefix: disabler
-    - type: HitscanBatteryAmmoProvider
-      proto: BulletDisabler
-  - uid: 41879
-    components:
-    - type: Transform
-      pos: -45.51563,8.636579
-      parent: 2
-    - type: Item
-      heldPrefix: disabler
-    - type: HitscanBatteryAmmoProvider
-      proto: BulletDisabler
 - proto: WeaponEnergyTurretAI
   entities:
   - uid: 41880
@@ -281143,45 +282984,48 @@ entities:
     - type: Transform
       pos: -31.539314,-43.055565
       parent: 2
-- proto: WeaponRifleBR64
+- proto: WeaponMiniEnergyGun
   entities:
-  - uid: 17148
+  - uid: 1883
     components:
     - type: Transform
-      parent: 17144
+      parent: 1873
+    - type: Item
+      heldPrefix: disabler
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: WeaponShotgunDoubleBarreledRubber
-  entities:
-  - uid: 1817
+    - type: HitscanBatteryAmmoProvider
+      proto: BulletDisabler
+  - uid: 41877
     components:
     - type: Transform
-      parent: 1813
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 1818
+      rot: 1.5707963267948966 rad
+      pos: 46.219055,2.4769573
+      parent: 2
+    - type: Item
+      heldPrefix: disabler
+    - type: HitscanBatteryAmmoProvider
+      proto: BulletDisabler
+  - uid: 41878
     components:
     - type: Transform
-      parent: 1813
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 1819
+      rot: -1.5707963267948966 rad
+      pos: -18.234957,-27.379057
+      parent: 2
+    - type: Item
+      heldPrefix: disabler
+    - type: HitscanBatteryAmmoProvider
+      proto: BulletDisabler
+  - uid: 41879
     components:
     - type: Transform
-      parent: 1813
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 1820
-    components:
-    - type: Transform
-      parent: 1813
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: -45.51563,8.636579
+      parent: 2
+    - type: Item
+      heldPrefix: disabler
+    - type: HitscanBatteryAmmoProvider
+      proto: BulletDisabler
 - proto: WeaponShotgunImprovisedLoaded
   entities:
   - uid: 28401
@@ -281811,7 +283655,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -370824.78
+      secondsUntilStateChange: -371033.53
       state: Opening
     - type: Airlock
       autoClose: False
@@ -282310,7 +284154,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -200489.34
+      secondsUntilStateChange: -200698.1
       state: Opening
     - type: Airlock
       autoClose: False
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
index 5900947e48..75df8db0d0 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -80,7 +80,7 @@
       map: ["enum.GunVisualLayers.MagUnshaded"]
       shader: unshaded
   - type: Gun
-    fireRate: 2.25 #Sunrise-Edit
+    fireRate: 2
   - type: RevolverAmmoProvider
     capacity: 5
     chambers: [ True, True, True, True, True ]
@@ -105,9 +105,6 @@
     sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi
   - type: Item
     storedOffset: 0,-2
-  - type: Gun #Sunrise-Start
-    selectedMode: SemiAuto
-    fireRate: 2 #Sunrise-End
   - type: RevolverAmmoProvider
     capacity: 6
     chambers: [ True, True, True, True, True, True ]
@@ -152,7 +149,7 @@
     storedOffset: 0,-2
   - type: Gun
     selectedMode: SemiAuto
-    fireRate: 2.25 #Sunrise-Edit
+    fireRate: 2
     availableModes:
     - SemiAuto
     soundGunshot:
@@ -188,7 +185,7 @@
   - type: Item
     storedOffset: 1,-5
   - type: Gun
-    fireRate: 1.75 #Sunrise-Edit
+    fireRate: 1.25 #Sunrise-Edit
   - type: ContainerContainer
     containers:
       revolver-ammo: !type:Container
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index bcd78086af..fed13f84bd 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: BaseWeaponRifle
-  parent: [BaseItem, BaseGunWieldable]
+  parent: [BaseItem, BaseGunWieldable, GunMedium]
   id: BaseWeaponRifle
   description: A rooty tooty point and shooty.
   abstract: true
@@ -76,10 +76,6 @@
         knockback: 0.1
       Felinid:
         knockback: 0.1
-  - type: ClothingSpeedModifier
-    walkModifier: 0.95
-    sprintModifier: 0.95
-  - type: HeldSpeedModifier
   - type: CursorOffsetRequiresWield
   - type: EyeCursorOffset
     maxOffset: 4.5
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index 2094453616..d646582d38 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: BaseSMG
-  parent: BaseItem
+  parent: [BaseItem, GunLight]
   id: BaseWeaponSubMachineGun
   description: A rooty tooty point and shooty.
   abstract: true
@@ -74,13 +74,6 @@
   - type: EmitSoundOnLand
     sound:
       collection: RiflesDrop
-  - type: SpeedModifiedOnWield
-    walkModifier: 0.95
-    sprintModifier: 0.95
-  - type: ClothingSpeedModifier
-    walkModifier: 0.97
-    sprintModifier: 0.97
-  - type: HeldSpeedModifier
   - type: CursorOffsetRequiresWield
   - type: EyeCursorOffset
     maxOffset: 3
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index e12a0c91c1..d40687fe0b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: BaseWeaponShotgun
-  parent: BaseItem
+  parent: [BaseItem, GunMedium]
   id: BaseWeaponShotgunAny
   description: A rooty tooty point and shooty.
   abstract: true
@@ -64,7 +64,7 @@
       path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg
 
 - type: entity
-  parent: BaseWeaponShotgunAny
+  parent: [BaseWeaponShotgunAny, GunLight]
   id: BaseWeaponShotgunPump
   abstract: true
   components:
@@ -85,7 +85,7 @@
 - type: entity
   name: Bulldog
   # Don't parent to BaseWeaponShotgun because it differs significantly
-  parent: [BaseItem, BaseGunWieldable, BaseSyndicateContraband]
+  parent: [BaseItem, BaseGunWieldable, BaseSyndicateContraband, GunLight]
   id: WeaponShotgunBulldog
   description: An automatic magazine-fed shotgun for close-quarters combat. Kicks like a mule on steroids. Uses .50 shotgun shells.
   components:
diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index 4796e003f8..3c28100363 100644
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: SP-91-RC
-  parent: [BaseWeaponSubMachineGun, BaseSecurityContraband]
+  parent: [WeaponSubMachineGunDrozdMk2, BaseSecurityContraband]
   id: WeaponSubMachineGunSP91RC
   description: Compact submachine gun designed for riot control.
   components:
diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index ede80db599..1389dd2da7 100644
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: riot shotgun
-  parent: [BaseWeaponShotgun, BaseGunWieldable, BaseSecurityContraband]
+  parent: [BaseWeaponShotgunPump, BaseGunWieldable, BaseSecurityContraband]
   id: WeaponShotgunRiot
   description: A sturdy shotgun with a longer magazine and a fixed tactical stock designed for non-lethal riot control.
   components:
@@ -8,7 +8,6 @@
     sprite: _Starlight/Objects/Weapons/Guns/Shotguns/riot_inhands_64x.rsi
   - type: Gun
     spread: 20
-    pump: true
   - type: Sprite
     sprite: _Starlight/Objects/Weapons/Guns/Shotguns/riot.rsi
   - type: Clothing
@@ -23,7 +22,7 @@
 
 - type: entity
   name: sawn-off riot shotgun
-  parent: [BaseWeaponShotgun, BaseGunWieldable, BaseSecurityContraband]
+  parent: [BaseWeaponShotgunPump, BaseGunWieldable, BaseSecurityContraband]
   id: WeaponShotgunRiotSawn
   description: Come with me if you want to live.
   components:
@@ -36,7 +35,6 @@
     sprite: _Starlight/Objects/Weapons/Guns/Shotguns/riot_sawn_inhands_64x.rsi
   - type: Gun
     spread: 30
-    pump: true
   - type: GunRequiresWield
   - type: BallisticAmmoProvider
     capacity: 4
diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/security.yml
index f1c83268df..d4079f4678 100644
--- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/security.yml
@@ -1,5 +1,6 @@
+# Energy Guns
 - type: entity
-  parent: GunSafe
+  parent: GunSafeBaseSecure
   id: GunSafeEnergyGunMini
   name: mini energy cannons safe
   suffix: SUNRISE
@@ -10,7 +11,41 @@
       amount: 5
 
 - type: entity
-  parent: GunSafe
+  id: GunSafeEnergyGunPistolSecurity
+  parent: GunSafeBaseSecure
+  name: safe
+  suffix: Energy Pistol «Judge»
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponEnergyGunPistolSecurity
+      amount: 4
+
+- type: entity
+  id: GunSafeEnergyPistolDominator
+  parent: GunSafeBaseSecure
+  name: safe
+  suffix: Energy Pistol «Dominator»
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponDominator
+      amount: 4
+
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafeEnergyGun
+  name: safe
+  suffix: Tactical Energy guns
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponEnergyGunTactical
+      amount: 2
+
+## Pistols and revolvers safes
+- type: entity
+  parent: GunSafeBaseSecure
   id: GunSafePistolG22
   name: safe
   suffix: Glock-22
@@ -19,24 +54,67 @@
     contents:
     - id: WeaponPistolG22
       amount: 4
+    - id: MagazineGlock22
+      amount: 8
+
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafePistolM1984
+  name: safe
+  suffix: M1984
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponPistolM1984
+      amount: 4
     - id: MagazinePistol
       amount: 8
 
 - type: entity
-  parent: GunSafe
-  id: GunSafeRifleM16A4
+  parent: GunSafeBaseSecure
+  id: GunSafeSnubRevolver
   name: safe
-  suffix: M16A4
+  suffix: Snub Revolver
   components:
   - type: StorageFill
     contents:
-    - id: WeaponRifleM16A4
-      amount: 2
-    - id: MagazineRifleSP
+    - id: WeaponRevolverSnubRevolver
+      amount: 4
+    - id: SpeedLoaderMagnumSP
+      amount: 6
+    - id: SpeedLoaderMagnumRubber
       amount: 4
 
 - type: entity
-  parent: GunSafe
+  parent: GunSafeBaseSecure
+  id: GunSafePistolVP78
+  name: safe
+  suffix: VP-78
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponPistolVP78
+      amount: 4
+    - id: MagazineVP70
+      amount: 8
+
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafePistolACP14
+  name: safe
+  suffix: ACP-14
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponPistolACP14
+      amount: 4
+    - id: MagazineACP14
+      amount: 8
+
+# Safes for SMGs
+
+- type: entity
+  parent: GunSafeBaseSecure
   id: GunSafeSubMachineGunVector
   name: safe
   suffix: Vector
@@ -46,10 +124,10 @@
     - id: WeaponSubMachineGunNewVector
       amount: 2
     - id: MagazinePistolSubMachineGunSP
-      amount: 4
+      amount: 6
 
 - type: entity
-  parent: GunSafe
+  parent: GunSafeBaseSecure
   id: GunSafeSubMachineGunMP7
   name: safe
   suffix: MP7, SUNRISE
@@ -62,7 +140,7 @@
       amount: 4
 
 - type: entity
-  parent: GunSafe
+  parent: GunSafeBaseSecure
   id: GunSafeSubMachineGunSkorpion
   name: safe
   suffix: Skorpion, SUNRISE
@@ -70,12 +148,131 @@
   - type: StorageFill
     contents:
     - id: WeaponSubMachineGunSkorpion
-      amount: 4
+      amount: 3
     - id: MagazinePistolSubMachineGunSP
       amount: 6
 
 - type: entity
-  parent: GunSafe
+  parent: GunSafeBaseSecure
+  id: GunSafeSubMachineGunMP5
+  name: safe
+  suffix: MP5, SUNRISE
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponSubMachineGunMP5
+      amount: 2
+    - id: MagazinePistolSubMachineGunSP
+      amount: 4
+
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafeSubMachineGunDrozdMk2
+  name: safe
+  suffix: Drozd Mk2, SUNRISE
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponSubMachineGunDrozdMk2
+      amount: 2
+    - id: MagazinePistolSubMachineGunSP
+      amount: 4
+
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafeSubMachineGunSP91RC
+  name: safe
+  suffix: SP91RC, SUNRISE
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponSubMachineGunSP91RC
+      amount: 2
+    - id: MagazinePistolSubMachineGunSP
+      amount: 4
+
+# Rifles safes
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafeRifleM16A4
+  name: safe
+  suffix: M16A4
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponRifleM16A4
+      amount: 2
+    - id: MagazineRifleSP
+      amount: 4
+
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafeRifleAKMU
+  name: safe
+  suffix: AKMU
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponRifleAKMU
+      amount: 2
+    - id: MagazineLightRifleSP
+      amount: 4
+
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafeRifleLecterMk2
+  name: safe
+  suffix: Lecter Mk2
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponRifleLecterMk2
+      amount: 2
+    - id: MagazineRifleSP
+      amount: 4
+
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafeRifleAR18
+  name: safe
+  suffix: AR-18
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponRifleAR18
+      amount: 2
+    - id: MagazineRifleHeavySP
+      amount: 4
+
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafeRifleFamas
+  name: safe
+  suffix: Famas
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponRifleFamas
+      amount: 2
+    - id: MagazineRifleSP
+      amount: 4
+
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafeWeaponRifleG36
+  name: safe
+  suffix: G-36
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponRifleG36
+      amount: 2
+    - id: MagazineRifleSP
+      amount: 4
+
+# Shotguns safes
+- type: entity
+  parent: GunSafeBaseSecure
   id: GunSafeShotgunTrenchgun4034
   name: safe
   suffix: Trenchgun 4034
@@ -84,15 +281,36 @@
     contents:
     - id: WeaponShotgunTrenchgun4034
       amount: 2
-    - id: BoxLethalshot
-      amount: 1
+    - id: SpeedLoaderShellShotgun
+      amount: 4
     - id: BoxBeanbag
       amount: 1
     - id: BoxShotgunSlug
       amount: 1
+    - id: BoxShotgunFlare
+      amount: 1
 
 - type: entity
-  parent: GunSafe
+  parent: GunSafeBaseSecure
+  id: GunSafeShotgunRiot
+  name: safe
+  suffix: Shotgun Riot
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponShotgunRiot
+      amount: 2
+    - id: SpeedLoaderShellShotgun
+      amount: 4
+    - id: BoxBeanbag
+      amount: 1
+    - id: BoxShotgunSlug
+      amount: 1
+    - id: BoxShotgunFlare
+      amount: 1
+
+- type: entity
+  parent: GunSafeBaseSecure
   id: GunSafeShotgunSPAS12
   name: safe
   suffix: LAW-12
@@ -101,44 +319,202 @@
     contents:
     - id: WeaponShotgunSPAS12
       amount: 2
-    - id: BoxLethalshot
-      amount: 1
+    - id: SpeedLoaderShellShotgun
+      amount: 4
     - id: BoxBeanbag
       amount: 1
     - id: BoxShotgunSlug
       amount: 1
+    - id: BoxShotgunFlare
+      amount: 1
 
 - type: entity
-  id: GunSafeEnergyGunPistolSecurity
-  parent: GunSafe
+  parent: GunSafeBaseSecure
+  id: GunSafeShotgunCombat
   name: safe
-  suffix: Energy Pistol «Judge»
+  suffix: Shotgun Combat
   components:
   - type: StorageFill
     contents:
-    - id: WeaponEnergyGunPistolSecurity
-      amount: 4
-
-- type: entity
-  id: GunSafeCombineSmallArms
-  parent: GunSafe
-  name: safe
-  suffix: Energy Pistol/Glock22
-  components:
-  - type: StorageFill
-    contents:
-    - id: WeaponEnergyGunPistolSecurity
-      amount: 3
-    - id: GlockBox
-      amount: 3
-
-- type: entity
-  parent: GunSafe
-  id: GunSafeEnergyGun
-  name: safe
-  suffix: Tactical Energy guns
-  components:
-  - type: StorageFill
-    contents:
-    - id: WeaponEnergyGunTactical
+    - id: WeaponShotgunCombat
       amount: 2
+    - id: SpeedLoaderShellShotgun
+      amount: 4
+    - id: BoxBeanbag
+      amount: 1
+    - id: BoxShotgunSlug
+      amount: 1
+    - id: BoxShotgunFlare
+      amount: 1
+
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafeDoubleBarreled
+  name: safe
+  description: According to the paperwork — state-of-the-art tactical shotguns. In reality — antique double-barrels.
+  suffix: Shotgun Double-Barreled
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponShotgunDoubleBarreled
+      amount: 4
+    - id: SpeedLoaderShellShotgun
+      amount: 4
+    - id: BoxBeanbag
+      amount: 1
+    - id: SpeedLoaderShotgunIncendiary
+      amount: 4
+    - id: BoxShotgunFlare
+      amount: 1
+
+# Small Arms Spawner
+- type: entity
+  name: Armory Safe Spawner
+  id: SpawnerSafeSmallArms
+  parent: MarkerBase
+  suffix: Spawner Safe Pistols
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Structures/Storage/closet.rsi
+          state: shotguncase
+    - type: EntityTableSpawner
+      table: !type:NestedSelector
+        tableId: SmallArmsSafes
+
+- type: entityTable
+  id: SmallArmsSafes
+  table: !type:GroupSelector
+    children:
+    - !type:GroupSelector
+      weight: 85
+      children:
+      - id: GunSafePistolMk58
+      - id: GunSafePistolG22
+      - id: GunSafeEnergyGunPistolSecurity
+    - !type:GroupSelector
+      weight: 10
+      children:
+      - id: GunSafePistolACP14
+      - id: GunSafeEnergyPistolDominator
+      - id: GunSafePistolVP78
+      - id: GunSafeSnubRevolver
+    - !type:GroupSelector
+      weight: 5
+      children:
+      - id: GunSafePistolM1984
+      - id: GunSafeSubMachineGunSkorpion
+
+# ShotGuns Spawner
+- type: entity
+  name: Armory Safe Spawner
+  id: SpawnerSafeShotguns
+  parent: MarkerBase
+  suffix: Spawner Safe ShotGuns
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Structures/Storage/closet.rsi
+          state: shotguncase
+    - type: EntityTableSpawner
+      table: !type:NestedSelector
+        tableId: ShotgunSafes
+
+- type: entityTable
+  id: ShotgunSafes
+  table: !type:GroupSelector
+    children:
+    - !type:GroupSelector
+      weight: 90
+      children:
+      - id: GunSafeShotgunTrenchgun4034
+      - id: GunSafeShotgunKammerer
+      - id: GunSafeShotgunRiot
+    - !type:GroupSelector
+      weight: 9
+      children:
+      - id: GunSafeShotgunSPAS12
+      - id: GunSafeShotgunEnforcer
+      - id: GunSafeShotgunCombat
+    - !type:GroupSelector
+      weight: 1
+      children:
+      - id: GunSafeDoubleBarreled
+
+# Rifle Spawner
+- type: entity
+  name: Armory Safe Spawner
+  id: SpawnerSafeRifle
+  parent: MarkerBase
+  suffix: Spawner Safe Rifle
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Structures/Storage/closet.rsi
+          state: shotguncase
+    - type: EntityTableSpawner
+      table: !type:NestedSelector
+        tableId: RifleSafes
+
+- type: entityTable
+  id: RifleSafes
+  table: !type:GroupSelector
+    children:
+    - !type:GroupSelector
+      weight: 85
+      children:
+      - id: GunSafeRifleLecter
+      - id: GunSafeRifleM16A4
+    - !type:GroupSelector
+      weight: 10
+      children:
+      - id: GunSafeRifleAKMU
+      - id: GunSafeRifleLecterMk2
+    - !type:GroupSelector
+      weight: 5
+      children:
+      - id: GunSafeRifleAR18
+      - id: GunSafeRifleFamas
+      - id: GunSafeWeaponRifleG36
+
+# SMG Spawner
+- type: entity
+  name: Armory Safe Spawner
+  id: SpawnerSafeSMG
+  parent: MarkerBase
+  suffix: Spawner Safe SMG
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Structures/Storage/closet.rsi
+          state: shotguncase
+    - type: EntityTableSpawner
+      table: !type:NestedSelector
+        tableId: SMGSafes
+
+- type: entityTable
+  id: SMGSafes
+  table: !type:GroupSelector
+    children:
+    - !type:GroupSelector
+      weight: 80
+      children:
+      - id: GunSafeSubMachineGunMP7
+      - id: GunSafeSubMachineGunMP5
+      - id: GunSafeSubMachineGunDrozd
+    - !type:GroupSelector
+      weight: 15
+      children:
+      - id: GunSafeSubMachineGunDrozdMk2
+      - id: GunSafeSubMachineGunVector
+      - id: GunSafeSubMachineGunWt550
+    - !type:GroupSelector
+      weight: 5
+      children:
+      - id: GunSafeRifleAR18
+      - id: WeaponSubMachineGunSkorpion
+
diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml
index 4ac87c1e78..5ab80295a5 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml
@@ -61,7 +61,7 @@
   parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing]
   id: ClothingOuterArmorSWAT
   name: SWAT armor
-  description: NT's unsuccessful attempt to create universal and inexpensive protection. It provides excellent protection against many types of damage, but it also slows down extremely much.
+  description: NT's unsuccessful attempt to create universal and expensive protection. It provides excellent protection against many types of damage, but it also slows down extremely much.
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/Armor/heavy.rsi
@@ -76,7 +76,7 @@
       coefficients:
         Blunt: 0.55
         Slash: 0.55
-        Piercing: 0.50
+        Piercing: 0.3
         Heat: 0.6
         Radiation: 0.6
         Caustic: 0.6
@@ -89,8 +89,8 @@
     heatingCoefficient: 0.5
     coolingCoefficient: 0.5
   - type: ClothingSpeedModifier
-    walkModifier: 0.75
-    sprintModifier: 0.75
+    walkModifier: 0.8
+    sprintModifier: 0.8
   - type: GroupExamine
   - type: ProtectedFromStepTriggers
     slots: WITHOUT_POCKET
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
index 2e22d7b806..bb2db80c2b 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -56,6 +56,9 @@
       map: ["enum.GunVisualLayers.Base"]
   - type: Clothing
     sprite: _Sunrise/Objects/Weapons/Guns/HMGs/gl-64/tiny.rsi
+    slots:
+    - Back
+    - suitStorage
   - type: Item
     size: Huge
     shape:
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index aa4bff56f2..325aadad7c 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -59,18 +59,6 @@
     containers:
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
-  # - type: MeleeWeapon
-  #   angle: 60
-  #   range: 1
-  #   damage:
-  #     types:
-  #       Blunt: 11
-  #       Structural: 4
-  #   bluntStaminaDamageFactor: 2.0
-  #   attackRate: 0.9
-  #   autoAttack: false
-  # - type: AltFireMelee
-  #   attackType: Heavy
   - type: StaticPrice
     price: 500
   - type: EmitSoundOnPickup
@@ -160,7 +148,7 @@
 
 - type: entity
   name: AKM-U
-  parent: BaseWeaponSMGSunrise
+  parent: BaseWeaponRifleSunrise
   id: WeaponRifleAKMU
   components:
   - type: Sprite
@@ -306,7 +294,7 @@
     angleIncrease: 1.65
     angleDecay: 18
     fireRate: 5.25
-    burstFireRate: 9
+    burstFireRate: 12
     selectedMode: Burst
     availableModes:
     - Burst
@@ -772,7 +760,7 @@
 
 - type: entity
   name: Lecter Mk2
-  parent: WeaponRifleLecter
+  parent: [WeaponRifleLecter, GunLight]
   id: WeaponRifleLecterMk2
   description: A high end military grade assault rifle. Uses .20 rifle ammo.
   components:
@@ -796,9 +784,6 @@
   - type: ChamberMagazineAmmoProvider
     autoEject: true
   - type: Appearance
-  - type: ClothingSpeedModifier
-    walkModifier: 0.97
-    sprintModifier: 0.97
   - type: EyeCursorOffset
     maxOffset: 5
     pvsIncrease: 0.55
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index 869e939fff..79ced1a5cc 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -1,45 +1,6 @@
-- type: entity
-  name: BaseWeaponSMGSunrise
-  parent: BaseWeaponSubMachineGun
-  id: BaseWeaponSMGSunrise
-  description: A rooty tooty point and shooty.
-  abstract: true
-  components:
-  - type: Gun
-    minAngle: 7
-    maxAngle: 19
-    angleIncrease: 1
-    angleDecay: 0.5
-    fireRate: 5
-    useKey: true
-    selectedMode: FullAuto
-  # - type: MeleeWeapon
-  #   angle: 60
-  #   range: 1
-  #   damage:
-  #     types:
-  #       Blunt: 9
-  #       Structural: 4
-  #   bluntStaminaDamageFactor: 2.0
-  #   attackRate: 0.9
-  #   autoAttack: false
-  # - type: AltFireMelee
-  #   attackType: Heavy
-  - type: SpeedModifiedOnWield
-    walkModifier: 0.95
-    sprintModifier: 0.95
-  - type: ClothingSpeedModifier
-    walkModifier: 0.97
-    sprintModifier: 0.97
-  - type: HeldSpeedModifier
-  - type: CursorOffsetRequiresWield
-  - type: EyeCursorOffset
-    maxOffset: 3
-    pvsIncrease: 0.35
-
 - type: entity
   name: P-90
-  parent: BaseWeaponSMGSunrise
+  parent: BaseWeaponSubMachineGun
   id: WeaponSubMachineGunP90
   components:
   - type: Item
@@ -106,7 +67,7 @@
 
 - type: entity
   name: MP-38
-  parent: BaseWeaponSMGSunrise
+  parent: BaseWeaponSubMachineGun
   id: WeaponSubMachineGunMP38
   components:
   - type: Sprite
@@ -163,7 +124,7 @@
 
 - type: entity
   name: MP7
-  parent: BaseWeaponSMGSunrise
+  parent: BaseWeaponSubMachineGun
   id: WeaponSubMachineGunMP7
   components:
   - type: Sprite
@@ -222,7 +183,7 @@
 
 - type: entity
   name: MP5
-  parent: BaseWeaponSMGSunrise
+  parent: BaseWeaponSubMachineGun
   id: WeaponSubMachineGunMP5
   components:
   - type: Sprite
@@ -293,7 +254,7 @@
 
 - type: entity
   name: Scorpion VZ-61
-  parent: BaseWeaponSMGSunrise
+  parent: BaseWeaponSubMachineGun
   id: WeaponSubMachineGunSkorpion
   components:
   - type: Item
@@ -354,7 +315,7 @@
 
 - type: entity
   name: New Vector
-  parent: BaseWeaponSMGSunrise
+  parent: WeaponSubMachineGunDrozd
   id: WeaponSubMachineGunNewVector
   components:
   - type: Sprite
@@ -371,22 +332,8 @@
     shape:
     - 0,0,3,2
     sprite: _Sunrise/Objects/Weapons/Guns/SMGs/vector/tiny.rsi
-  - type: GunWieldBonus
-    minAngle: -3
-    maxAngle: -16
   - type: Gun
-    minAngle: 6
-    maxAngle: 30
-    angleIncrease: 2.5
-    angleDecay: 0.5
-    fireRate: 7
-    burstFireRate: 12
-    selectedMode: Burst
-    availableModes:
-    - Burst
-    - FullAuto
-    shotsPerBurst: 3
-    burstCooldown: 0.15
+    burstFireRate: 22
     soundGunshot:
       path: /Audio/_Sunrise/Weapons/Guns/SMGs/new_vector/vector_shot.ogg
   - type: ItemSlots
@@ -419,7 +366,7 @@
 
 - type: entity
   name: PPSH-41
-  parent: BaseWeaponSMGSunrise
+  parent: BaseWeaponSubMachineGun
   id: WeaponSubMachineGunPPSH41
   components:
   - type: Sprite
@@ -484,7 +431,7 @@
 
 - type: entity
   name: MS-42
-  parent: BaseWeaponSMGSunrise
+  parent: BaseWeaponSubMachineGun
   id: WeaponAMS-42
   description: A more advanced version of Lecter.
   components:
@@ -542,7 +489,7 @@
 
 - type: entity
   name: AJ-100
-  parent: BaseWeaponSMGSunrise
+  parent: BaseWeaponSubMachineGun
   id: WeaponAJ100
   description: High-speed SMG, equipped with a universal connector for other types of pistol magazines.
   components:
@@ -608,7 +555,7 @@
 
 - type: entity
   name: SIAR-52 SMG
-  parent: BaseWeaponSMGSunrise
+  parent: BaseWeaponSubMachineGun
   id: WeaponSIAR52
   description: A high rate of fire weapon, equipped with integrated silencer.
   components:
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index 0bc47d92e1..adce1950d3 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: Spas-12
-  parent: [BaseWeaponShotgun, GunLight, GunMeleeMedium, BaseSecurityContraband]
+  parent: [BaseWeaponShotgun, GunMeleeMedium, BaseSecurityContraband]
   id: WeaponShotgunSPAS12
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/base_guns.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/base_guns.yml
index 3b80ef1f13..5f8a29c644 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/base_guns.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/base_guns.yml
@@ -6,11 +6,14 @@
   abstract: true
   components:
   - type: SpeedModifiedOnWield
-    walkModifier: 0.95
+    walkModifier: 1
     sprintModifier: 0.95
   - type: HeldSpeedModifier
-    walkModifier: 0.95
+    walkModifier: 1
     sprintModifier: 0.95
+  - type: ClothingSpeedModifier
+    walkModifier: 1
+    sprintModifier: 1
   - type: Item
     size: Small
   - type: UseDelay
@@ -21,11 +24,14 @@
   abstract: true
   components:
   - type: SpeedModifiedOnWield
-    walkModifier: 0.9
+    walkModifier: 1
     sprintModifier: 0.9
   - type: HeldSpeedModifier
-    walkModifier: 0.9
+    walkModifier: 1
     sprintModifier: 0.9
+  - type: ClothingSpeedModifier
+    walkModifier: 0.98
+    sprintModifier: 0.98
   - type: Item
     size: Normal
   - type: UseDelay
@@ -36,11 +42,14 @@
   abstract: true
   components:
   - type: SpeedModifiedOnWield
-    walkModifier: 0.85
+    walkModifier: 0.95
     sprintModifier: 0.85
   - type: HeldSpeedModifier
-    walkModifier: 0.85
+    walkModifier: 0.95
     sprintModifier: 0.85
+  - type: ClothingSpeedModifier
+    walkModifier: 0.95
+    sprintModifier: 0.95
   - type: Item
     size: Large
   - type: UseDelay
@@ -51,11 +60,14 @@
   abstract: true
   components:
   - type: SpeedModifiedOnWield
-    walkModifier: 0.75
+    walkModifier: 0.85
     sprintModifier: 0.75
   - type: HeldSpeedModifier
-    walkModifier: 0.75
+    walkModifier: 0.85
     sprintModifier: 0.75
+  - type: ClothingSpeedModifier
+    walkModifier: 0.9
+    sprintModifier: 0.9
   - type: Item
     size: Ginormous
   - type: UseDelay
diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/debug.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/debug.yml
index ea2d8e4e68..9df0586633 100644
--- a/Resources/Prototypes/_Sunrise/Roles/Jobs/debug.yml
+++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/debug.yml
@@ -2,7 +2,8 @@
   id: DebugSecurityOfficerGear
   equipment:
     head: ClothingHeadHelmetBasic
-    outerClothing: ClothingOuterArmorBasicSlim
+    outerClothing: ClothingOuterVestArmorSec
+    shoes: ClothingShoesBootsJackSec
 
 - type: entity
   save: false
@@ -16,8 +17,9 @@
 - type: startingGear
   id: DebugBulletProofGear
   equipment:
-    head: ClothingHeadHelmetBasic
+    head: ClothingHeadHelmetPubg
     outerClothing: ClothingOuterArmorBulletproof
+    shoes: ClothingShoesBootsJackSec
 
 - type: entity
   save: false
@@ -48,6 +50,7 @@
   equipment:
     head: ClothingHeadHatSyndieMAA
     outerClothing: ClothingOuterVestWeb
+    shoes: ClothingUnderSocksCoder
 
 - type: entity
   save: false
diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/HMGs/gl-64/tiny.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/HMGs/gl-64/tiny.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..2ed0eca06b
Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/HMGs/gl-64/tiny.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/HMGs/gl-64/tiny.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/HMGs/gl-64/tiny.rsi/meta.json
index 7e9ccb3e52..dcbfeeccdf 100644
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/HMGs/gl-64/tiny.rsi/meta.json
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/HMGs/gl-64/tiny.rsi/meta.json
@@ -19,6 +19,10 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
         {
             "name": "wielded-inhand-left",
             "directions": 4
@@ -28,4 +32,4 @@
             "directions": 4
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 6c22a7cef7..5367c80268 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -815,6 +815,8 @@ GrenadeEMP: GrenadeEMPTimer
 GrenadeFlash: GrenadeFlashTimer
 GrenadeFrag: GrenadeFragTimer
 WeaponEnergyGunMini: WeaponMiniEnergyGun
+# Safes
+GunSafeCombineSmallArms: SpawnerSafeSmallArms
 # SL HITSCAN START
 BoxMagazineRifle: BoxMagazineRifleSP
 MagazineBoxLightRifle: MagazineBoxLightRifleSP