Omega large camera update (#13951)

* Added missed camera routers

* Fix bug with empty security storage

* Fix of fix (based)

* Added PortableFlasher to Security Armory

* Improved Command, Security and Supply cameras

* Added general cameras

* Added service cameras

* Removed librarian camera and security corridor camera

* Removed chapels and chaplains cameras

diff --git a/Resources/Maps/omega.yml b/Resources/Maps/omega.yml
index 8985b1b5a4171201e897b9baed5c17e7cd46ef86..0fcfc4688da2e3c9354987d9c309973577ae4c66 100644 (file)
--- a/Resources/Maps/omega.yml
+++ b/Resources/Maps/omega.yml
@@ -37452,7 +37452,7 @@ entities:
     parent: 0\r
     type: Transform\r
 - uid: 3578\r
-  type: TableReinforced\r
+  type: SurveillanceCameraRouterSupply\r
   components:\r
   - pos: 15.5,32.5\r
     parent: 0\r
@@ -70103,12 +70103,10 @@ entities:
     removedMasks: 20\r
     type: EntityStorage\r
   - containers:\r
-      EntityStorageComponent: !type:Container\r
+      entity_storage: !type:Container\r
         ents:\r
         - 8375\r
         - 8376\r
-      entity_storage: !type:Container\r
-        ents: []\r
     type: ContainerContainer\r
 - uid: 8374\r
   type: ClosetBombFilled\r
@@ -84715,10 +84713,9 @@ entities:
     parent: 0\r
     type: Transform\r
 - uid: 10658\r
-  type: WindowReinforcedDirectional\r
+  type: SurveillanceCameraRouterService\r
   components:\r
-  - rot: -1.5707963267948966 rad\r
-    pos: -52.5,-13.5\r
+  - pos: -52.5,-13.5\r
     parent: 0\r
     type: Transform\r
 - uid: 10659\r
@@ -84790,7 +84787,7 @@ entities:
     parent: 0\r
     type: Transform\r
 - uid: 10668\r
-  type: ComputerPowerMonitoring\r
+  type: SurveillanceCameraRouterEngineering\r
   components:\r
   - pos: -48.5,-6.5\r
     parent: 0\r
@@ -93864,7 +93861,7 @@ entities:
     parent: 0\r
     type: Transform\r
 - uid: 12046\r
-  type: SurveillanceCameraRouterEngineering\r
+  type: SurveillanceCameraRouterGeneral\r
   components:\r
   - pos: -50.5,-13.5\r
     parent: 0\r
@@ -93964,14 +93961,14 @@ entities:
     id: Security\r
     type: SurveillanceCamera\r
 - uid: 12060\r
-  type: SurveillanceCameraSecurity\r
+  type: SurveillanceCameraGeneral\r
   components:\r
   - rot: -1.5707963267948966 rad\r
     pos: -23.5,12.5\r
     parent: 0\r
     type: Transform\r
   - setupAvailableNetworks:\r
-    - SurveillanceCameraSecurity\r
+    - SurveillanceCameraGeneral\r
     nameSet: True\r
     id: Security Hallway\r
     type: SurveillanceCamera\r
@@ -97901,4 +97898,430 @@ entities:
   - pos: 6.5,-20.5\r
     parent: 0\r
     type: Transform\r
+- uid: 12520\r
+  type: PortableFlasher\r
+  components:\r
+  - pos: -36.5,20.5\r
+    parent: 0\r
+    type: Transform\r
+- uid: 12521\r
+  type: SurveillanceCameraSecurity\r
+  components:\r
+  - pos: -17.5,14.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraSecurity\r
+    nameSet: True\r
+    id: Lawyer office\r
+    type: SurveillanceCamera\r
+- uid: 12522\r
+  type: SurveillanceCameraCommand\r
+  components:\r
+  - rot: -1.5707963267948966 rad\r
+    pos: -23.5,24.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraCommand\r
+    nameSet: True\r
+    id: HoS office\r
+    type: SurveillanceCamera\r
+- uid: 12523\r
+  type: SurveillanceCameraCommand\r
+  components:\r
+  - pos: -12.5,15.5 \r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraCommand\r
+    nameSet: True\r
+    id: Drone bay\r
+    type: SurveillanceCamera\r
+- uid: 12524\r
+  type: SurveillanceCameraCommand\r
+  components:\r
+  - pos: 7.5,14.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraCommand\r
+    nameSet: True\r
+    id: EvA Storage\r
+    type: SurveillanceCamera\r
+- uid: 12525\r
+  type: SurveillanceCameraSupply\r
+  components:\r
+  - rot: 3.141592653589793 rad\r
+    pos: 17.5,35.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraSupply\r
+    nameSet: True\r
+    id: QM Room\r
+    type: SurveillanceCamera\r
+- uid: 12526\r
+  type: SurveillanceCameraSupply\r
+  components:\r
+  - rot: -1.5707963267948966 rad\r
+    pos: 22.5,12.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraSupply\r
+    nameSet: True\r
+    id: Salvagers \r
+    type: SurveillanceCamera\r
+- uid: 12527\r
+  type: SurveillanceCameraSecurity\r
+  components:\r
+  - rot: -1.5707963267948966 rad\r
+    pos: 18.5,-15.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraSecurity\r
+    nameSet: True\r
+    id: Detective office\r
+    type: SurveillanceCamera\r
+- uid: 12528\r
+  type: SurveillanceCameraGeneral\r
+  components:\r
+  - rot: 1.5707963267948966 rad\r
+    pos: -25.5,-1.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraGeneral\r
+    nameSet: True\r
+    id: Entrance of engineering \r
+    type: SurveillanceCamera\r
+- uid: 12529\r
+  type: SurveillanceCameraGeneral\r
+  components:\r
+  - pos: -17.5,-12.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraGeneral\r
+    nameSet: True\r
+    id: Hydro and medbay\r
+    type: SurveillanceCamera\r
+- uid: 12530\r
+  type: SurveillanceCameraGeneral\r
+  components:\r
+  - pos: 11.5,-12.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraGeneral\r
+    nameSet: True\r
+    id: Science and detective\r
+    type: SurveillanceCamera\r
+- uid: 12531\r
+  type: SurveillanceCameraGeneral\r
+  components:\r
+  - pos: -0.5,-13.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraGeneral\r
+    nameSet: True\r
+    id: Entrance of service\r
+    type: SurveillanceCamera\r
+- uid: 12532\r
+  type: SurveillanceCameraGeneral\r
+  components:\r
+  - rot: -1.5707963267948966 rad\r
+    pos: -6.5,-23.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraGeneral\r
+    nameSet: True\r
+    id: Entrance of medbay\r
+    type: SurveillanceCamera\r
+- uid: 12533\r
+  type: SurveillanceCameraGeneral\r
+  components:\r
+  - rot: 1.5707963267948966 rad\r
+    pos: 1.5,-22.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraGeneral\r
+    nameSet: True\r
+    id: Entrance of science\r
+    type: SurveillanceCamera\r
+- uid: 12534\r
+  type: SurveillanceCameraGeneral\r
+  components:\r
+  - rot: 3.141592653589793 rad\r
+    pos: -3.5,-31.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraGeneral\r
+    nameSet: True\r
+    id: Entrance 3\r
+    type: SurveillanceCamera\r
+- uid: 12535\r
+  type: SurveillanceCameraGeneral\r
+  components:\r
+  - rot: -1.5707963267948966 rad\r
+    pos: -11.5,-39.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraGeneral\r
+    nameSet: True\r
+    id: Entrance 2\r
+    type: SurveillanceCamera\r
+- uid: 12536\r
+  type: SurveillanceCameraGeneral\r
+  components:\r
+  - rot: -1.5707963267948966 rad\r
+    pos: -11.5,-53.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraGeneral\r
+    nameSet: True\r
+    id: Entrance 1\r
+    type: SurveillanceCamera\r
+- uid: 12537\r
+  type: SurveillanceCameraGeneral\r
+  components:\r
+  - rot: -1.5707963267948966 rad\r
+    pos: 11.5,14.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraGeneral\r
+    nameSet: True\r
+    id: Entrance of cargo\r
+    type: SurveillanceCamera\r
+- uid: 12538\r
+  type: SurveillanceCameraGeneral\r
+  components:\r
+  - rot: -1.5707963267948966 rad\r
+    pos: 11.5,1.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraGeneral\r
+    nameSet: True\r
+    id: Service and evac\r
+    type: SurveillanceCamera\r
+- uid: 12539\r
+  type: SurveillanceCameraGeneral\r
+  components:\r
+  - pos: 20.5,-3.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraGeneral\r
+    nameSet: True\r
+    id: Entrance of evac\r
+    type: SurveillanceCamera\r
+- uid: 12540\r
+  type: SurveillanceCameraGeneral\r
+  components:\r
+  - pos: 30.5,-9.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraGeneral\r
+    nameSet: True\r
+    id: Evacuation 1\r
+    type: SurveillanceCamera\r
+- uid: 12541\r
+  type: SurveillanceCameraGeneral\r
+  components:\r
+  - rot: 3.141592653589793 rad\r
+    pos: 30.5,4.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraGeneral\r
+    nameSet: True\r
+    id: Evacuation 2\r
+    type: SurveillanceCamera\r
+- uid: 12542\r
+  type: SurveillanceCameraGeneral\r
+  components:\r
+  - pos: 1.5,19.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraGeneral\r
+    nameSet: True\r
+    id: Entrance of bridge\r
+    type: SurveillanceCamera\r
+- uid: 12543\r
+  type: SurveillanceCameraGeneral\r
+  components:\r
+  - pos: -16.5,19.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraGeneral\r
+    nameSet: True\r
+    id: Security and drones\r
+    type: SurveillanceCamera\r
+- uid: 12544\r
+  type: SurveillanceCameraGeneral\r
+  components:\r
+  - pos: -19.5,1.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraGeneral\r
+    nameSet: True\r
+    id: Dormitory\r
+    type: SurveillanceCamera\r
+- uid: 12545\r
+  type: SurveillanceCameraMedical\r
+  components:\r
+  - rot: 1.5707963267948966 rad\r
+    pos: -18.5,-16.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraMedical\r
+    nameSet: True\r
+    id: Morgue\r
+    type: SurveillanceCamera\r
+- uid: 12546\r
+  type: SurveillanceCameraService\r
+  components:\r
+  - rot: 3.141592653589793 rad\r
+    pos: -13.5,-5.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraService\r
+    nameSet: True\r
+    id: Botany\r
+    type: SurveillanceCamera\r
+- uid: 12547\r
+  type: SurveillanceCameraService\r
+  components:\r
+  - rot: 3.141592653589793 rad\r
+    pos: -27.5,-14.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraService\r
+    nameSet: True\r
+    id: Library\r
+    type: SurveillanceCamera\r
+- uid: 12548\r
+  type: SurveillanceCameraService\r
+  components:\r
+  - rot: 3.141592653589793 rad\r
+    pos: 7.5,-5.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraService\r
+    nameSet: True\r
+    id: Freezer\r
+    type: SurveillanceCamera\r
+- uid: 12549\r
+  type: SurveillanceCameraService\r
+  components:\r
+  - rot: 1.5707963267948966 rad\r
+    pos: 7.5,-0.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraService\r
+    nameSet: True\r
+    id: Kitchen\r
+    type: SurveillanceCamera\r
+- uid: 12550\r
+  type: SurveillanceCameraService\r
+  components:\r
+  - pos: 6.5,6.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraService\r
+    nameSet: True\r
+    id: Bartenders room\r
+    type: SurveillanceCamera\r
+- uid: 12551\r
+  type: SurveillanceCameraService\r
+  components:\r
+  - rot: 1.5707963267948966 rad\r
+    pos: 0.5,4.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraService\r
+    nameSet: True\r
+    id: Service 2\r
+    type: SurveillanceCamera\r
+- uid: 12552\r
+  type: SurveillanceCameraService\r
+  components:\r
+  - rot: -1.5707963267948966 rad\r
+    pos: -5.5,-2.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraService\r
+    nameSet: True\r
+    id: Service 1\r
+    type: SurveillanceCamera\r
+- uid: 12553\r
+  type: SurveillanceCameraService\r
+  components:\r
+  - rot: 3.141592653589793 rad\r
+    pos: -9.5,1.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraService\r
+    nameSet: True\r
+    id: Clowns room\r
+    type: SurveillanceCamera\r
+- uid: 12554\r
+  type: SurveillanceCameraService\r
+  components:\r
+  - rot: -1.5707963267948966 rad\r
+    pos: -10.5,6.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraService\r
+    nameSet: True\r
+    id: Theater\r
+    type: SurveillanceCamera\r
+- uid: 12555\r
+  type: SurveillanceCameraService\r
+  components:\r
+  - rot: 3.141592653589793 rad\r
+    pos: -20.5,-6.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraService\r
+    nameSet: True\r
+    id: Janitors room\r
+    type: SurveillanceCamera\r
+- uid: 12556\r
+  type: SurveillanceCameraService\r
+  components:\r
+  - rot: -1.5707963267948966 rad\r
+    pos: -19.5,-33.5\r
+    parent: 0\r
+    type: Transform\r
+  - setupAvailableNetworks:\r
+    - SurveillanceCameraService\r
+    nameSet: True\r
+    id: Chapel 1\r
+    type: SurveillanceCamera\r
 ...\r