From 17b4ede7a73475f5c7cb7c1eccf18d84a9409f92 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Thu, 15 Aug 2024 14:18:36 -0600 Subject: [PATCH] Marathon Update (#31054) --- Resources/Maps/marathon.yml | 233 +++++++++++++++++++----------------- 1 file changed, 123 insertions(+), 110 deletions(-) diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml index 4cf794b85c..f96296ae0b 100644 --- a/Resources/Maps/marathon.yml +++ b/Resources/Maps/marathon.yml @@ -89,7 +89,7 @@ entities: version: 6 -2,0: ind: -2,0 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAXQAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAYAAAAAAAYAAAAAABHwAAAAABHwAAAAADfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAABYAAAAAAAYAAAAAADJAAAAAABHwAAAAADfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAYAAAAAADYAAAAAADJAAAAAACHwAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAYAAAAAACYAAAAAADJAAAAAABHwAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAYAAAAAADYAAAAAABHwAAAAACHwAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACYAAAAAACYAAAAAABHwAAAAACfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAYAAAAAACYAAAAAACHwAAAAABHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJgAAAAABfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAKAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAXQAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAYAAAAAAAYAAAAAABHwAAAAABHwAAAAADfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAABYAAAAAAAYAAAAAADJAAAAAABHwAAAAADfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAYAAAAAADYAAAAAADJAAAAAACHwAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAYAAAAAACYAAAAAADJAAAAAABHwAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAYAAAAAADYAAAAAABHwAAAAACHwAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACYAAAAAACYAAAAAABHwAAAAACfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAYAAAAAACYAAAAAACHwAAAAABHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJgAAAAABfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAKAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAA version: 6 0,1: ind: 0,1 @@ -149,7 +149,7 @@ entities: version: 6 -3,3: ind: -3,3 - tiles: XQAAAAADXQAAAAACfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAADHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAADfgAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAUgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAADUgAAAAAAUgAAAAAAfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAUgAAAAAAUgAAAAAALgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAALgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAXQAAAAADXQAAAAADXQAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAADXQAAAAABLgAAAAAALgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA + tiles: XQAAAAADXQAAAAACfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAADHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAADfgAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAUgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAADUgAAAAAAUgAAAAAAfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAUgAAAAAAUgAAAAAALgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAALgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAXQAAAAADXQAAAAADXQAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAADXQAAAAABLgAAAAAALgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA version: 6 -2,3: ind: -2,3 @@ -1831,6 +1831,9 @@ entities: 3021: -28,11 3022: -27,11 3023: -26,11 + 3025: -22,12 + 3026: -21,12 + 3027: -20,12 - node: color: '#A4610696' id: CheckerNWSE @@ -8958,10 +8961,15 @@ entities: - type: Transform pos: -36.5,47.5 parent: 30 - - uid: 1990 + - uid: 1926 components: - type: Transform - pos: -39.5,52.5 + pos: -40.5,52.5 + parent: 30 + - uid: 6584 + components: + - type: Transform + pos: -38.5,52.5 parent: 30 - proto: AirlockAtmosphericsGlassLocked entities: @@ -10493,6 +10501,12 @@ entities: - type: Transform pos: -18.5,6.5 parent: 30 + - uid: 20709 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -18.5,11.5 + parent: 30 - proto: AirlockKitchenLocked entities: - uid: 459 @@ -10985,7 +10999,7 @@ entities: pos: -20.5,-5.5 parent: 30 - type: Door - secondsUntilStateChange: -21151.791 + secondsUntilStateChange: -21585.09 state: Opening - type: DeviceLinkSource lastSignals: @@ -11284,13 +11298,6 @@ entities: - type: Transform pos: 44.5,41.5 parent: 30 -- proto: AirlockServiceGlassLocked - entities: - - uid: 312 - components: - - type: Transform - pos: -18.5,10.5 - parent: 30 - proto: AirlockServiceLocked entities: - uid: 461 @@ -14115,13 +14122,6 @@ entities: - type: Transform pos: -58.35984,-63.50458 parent: 30 -- proto: BookHowToCookForFortySpaceman - entities: - - uid: 9948 - components: - - type: Transform - pos: -17.483065,5.6789637 - parent: 30 - proto: BookRandomStory entities: - uid: 21487 @@ -14764,6 +14764,20 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-54.5 parent: 30 +- proto: ButtonFrameExit + entities: + - uid: 348 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.5,-8.5 + parent: 30 + - uid: 20721 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-7.5 + parent: 30 - proto: ButtonFrameGrey entities: - uid: 11138 @@ -49020,29 +49034,6 @@ entities: - 0 - 0 - 0 - - uid: 2028 - components: - - type: Transform - pos: -37.5,46.5 - parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - uid: 5662 components: - type: Transform @@ -51215,18 +51206,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: ClothingOuterHardsuitSecurity - entities: - - uid: 20709 - components: - - type: Transform - pos: -37.400864,55.464325 - parent: 30 - - uid: 20710 - components: - - type: Transform - pos: -37.400864,55.464325 - parent: 30 - proto: ClothingOuterNunRobe entities: - uid: 17657 @@ -53695,10 +53674,10 @@ entities: parent: 30 - proto: DeployableBarrier entities: - - uid: 6584 + - uid: 474 components: - type: Transform - pos: -39.5,49.5 + pos: -37.5,46.5 parent: 30 - uid: 6585 components: @@ -59266,10 +59245,10 @@ entities: components: - type: Transform parent: 759 - - type: Physics - canCollide: False - type: Tag tags: [] + - type: Physics + canCollide: False - proto: DrinkMilkCarton entities: - uid: 448 @@ -60016,8 +59995,8 @@ entities: pos: -21.5,-39.5 parent: 30 - type: FaxMachine - destinationAddress: Engineering name: Engineering + destinationAddress: Engineering - uid: 14477 components: - type: Transform @@ -61007,6 +60986,7 @@ entities: - 320 - 21456 - 22072 + - 9948 - uid: 22076 components: - type: Transform @@ -61022,6 +61002,7 @@ entities: - 20378 - 20377 - 22077 + - 9948 - uid: 22080 components: - type: Transform @@ -62134,6 +62115,15 @@ entities: - type: Transform pos: -35.5,-28.5 parent: 30 + - uid: 9948 + components: + - type: Transform + pos: -18.5,10.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 22076 + - 22074 - uid: 9993 components: - type: Transform @@ -88138,11 +88128,6 @@ entities: - type: Transform pos: -62.5,-66.5 parent: 30 - - uid: 348 - components: - - type: Transform - pos: -18.5,11.5 - parent: 30 - uid: 349 components: - type: Transform @@ -88963,12 +88948,6 @@ entities: - type: Transform pos: -27.5,52.5 parent: 30 - - uid: 1920 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -40.5,52.5 - parent: 30 - uid: 1921 components: - type: Transform @@ -88981,11 +88960,10 @@ entities: rot: 3.141592653589793 rad pos: -37.5,52.5 parent: 30 - - uid: 1923 + - uid: 1925 components: - type: Transform - rot: 3.141592653589793 rad - pos: -38.5,52.5 + pos: -39.5,52.5 parent: 30 - uid: 1930 components: @@ -96802,6 +96780,11 @@ entities: - type: Transform pos: -14.5,7.5 parent: 30 + - uid: 20710 + components: + - type: Transform + pos: -14.5,8.5 + parent: 30 - proto: KitchenMicrowave entities: - uid: 483 @@ -100286,15 +100269,15 @@ entities: parent: 30 - proto: PortableFlasher entities: - - uid: 1925 + - uid: 1917 components: - type: Transform - pos: -41.5,51.5 + pos: -39.5,51.5 parent: 30 - - uid: 1926 + - uid: 1920 components: - type: Transform - pos: -37.5,51.5 + pos: -39.5,49.5 parent: 30 - proto: PortableGeneratorJrPacman entities: @@ -107528,24 +107511,12 @@ entities: rot: 3.141592653589793 rad pos: -41.5,52.5 parent: 30 - - uid: 1917 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -40.5,52.5 - parent: 30 - uid: 1918 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,52.5 parent: 30 - - uid: 1919 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -38.5,52.5 - parent: 30 - uid: 1928 components: - type: Transform @@ -107712,6 +107683,11 @@ entities: rot: 1.5707963267948966 rad pos: -7.5,28.5 parent: 30 + - uid: 5025 + components: + - type: Transform + pos: -39.5,52.5 + parent: 30 - uid: 5071 components: - type: Transform @@ -111645,6 +111621,30 @@ entities: - Pressed: Toggle - proto: SignalButtonDirectional entities: + - uid: 295 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.5,-8.5 + parent: 30 + - type: DeviceLinkSource + linkedPorts: + 7417: + - Pressed: Open + 7402: + - Pressed: Open + - uid: 1919 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-7.5 + parent: 30 + - type: DeviceLinkSource + linkedPorts: + 999: + - Pressed: Open + 988: + - Pressed: Open - uid: 3180 components: - type: Transform @@ -116310,6 +116310,16 @@ entities: - 0 - 0 - 0 + - uid: 1990 + components: + - type: Transform + pos: -37.5,51.5 + parent: 30 + - uid: 2028 + components: + - type: Transform + pos: -41.5,51.5 + parent: 30 - proto: SuitStorageWarden entities: - uid: 5052 @@ -117400,6 +117410,12 @@ entities: parent: 30 - proto: Table entities: + - uid: 312 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -18.5,10.5 + parent: 30 - uid: 325 components: - type: Transform @@ -118161,12 +118177,6 @@ entities: - type: Transform pos: 24.5,10.5 parent: 30 - - uid: 12836 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,5.5 - parent: 30 - uid: 12838 components: - type: Transform @@ -120284,12 +120294,6 @@ entities: rot: -1.5707963267948966 rad pos: -43.5,60.5 parent: 30 - - uid: 5025 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -25.5,39.5 - parent: 30 - uid: 6495 components: - type: Transform @@ -120306,6 +120310,14 @@ entities: - type: Transform pos: -49.5,-55.5 parent: 30 +- proto: ToiletGoldenDirtyWater + entities: + - uid: 12836 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,39.5 + parent: 30 - proto: ToolboxArtistic entities: - uid: 15264 @@ -121023,12 +121035,10 @@ entities: parent: 30 - proto: VendingMachineDinnerware entities: - - uid: 474 + - uid: 1923 components: - - type: MetaData - name: Dinnerware - type: Transform - pos: -17.5,11.5 + pos: -17.5,5.5 parent: 30 - uid: 19533 components: @@ -136954,6 +136964,14 @@ entities: rot: 3.141592653589793 rad pos: -20.5,8.5 parent: 30 +- proto: WindoorKitchenHydroponicsLocked + entities: + - uid: 20701 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -18.5,10.5 + parent: 30 - proto: WindoorSecure entities: - uid: 15983 @@ -137290,11 +137308,6 @@ entities: - type: Transform pos: -27.5,24.5 parent: 30 - - uid: 295 - components: - - type: Transform - pos: -18.5,11.5 - parent: 30 - uid: 296 components: - type: Transform -- 2.52.0