diff --git a/Resources/Maps/_Sunrise/Station/marathon.yml b/Resources/Maps/_Sunrise/Station/marathon.yml index c91ffa5a9ac..da1bba47d87 100644 --- a/Resources/Maps/_Sunrise/Station/marathon.yml +++ b/Resources/Maps/_Sunrise/Station/marathon.yml @@ -5871,11 +5871,11 @@ entities: -16,-3: 0: 34816 -15,-3: - 0: 65280 + 0: 65296 -15,-2: 0: 1 -14,-3: - 0: 65280 + 0: 65408 -14,-2: 0: 8 -13,-5: @@ -6645,18 +6645,18 @@ entities: 2: 34952 6,-6: 2: 61440 - 4: 224 + 6: 224 6,-5: 0: 112 2: 2184 6,-8: 3: 224 - 5: 57344 + 4: 57344 6,-7: - 5: 224 - 6: 57344 + 4: 224 + 5: 57344 6,-9: - 5: 57568 + 4: 57568 7,-5: 2: 4080 7,-6: @@ -7660,7 +7660,7 @@ entities: temperature: 293.15 moles: - 0 - - 6666.982 + - 0 - 0 - 0 - 0 @@ -7674,7 +7674,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 + - 6666.982 - 0 - 0 - 0 @@ -7689,8 +7689,8 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 6666.982 - 0 + - 6666.982 - 0 - 0 - 0 @@ -10016,6 +10016,18 @@ entities: rot: 3.141592653589793 rad pos: -23.5,54.5 parent: 30 +- proto: AirlockExternalGlassShuttleLocked + entities: + - uid: 14533 + components: + - type: Transform + pos: -59.5,-10.5 + parent: 30 + - uid: 16751 + components: + - type: Transform + pos: -52.5,-10.5 + parent: 30 - proto: AirlockExternalLocked entities: - uid: 5390 @@ -10448,7 +10460,7 @@ entities: pos: -27.5,18.5 parent: 30 - type: Door - secondsUntilStateChange: -10715.332 + secondsUntilStateChange: -11594.158 state: Opening - type: DeviceLinkSource lastSignals: @@ -12875,6 +12887,18 @@ entities: - type: Transform pos: -73.5,-38.5 parent: 30 +- proto: AtmosDeviceFanDirectional + entities: + - uid: 15273 + components: + - type: Transform + pos: -59.5,-10.5 + parent: 30 + - uid: 15646 + components: + - type: Transform + pos: -52.5,-10.5 + parent: 30 - proto: AtmosDeviceFanTiny entities: - uid: 380 @@ -27668,6 +27692,11 @@ entities: - type: Transform pos: -59.5,30.5 parent: 30 + - uid: 16966 + components: + - type: Transform + pos: -1.5,59.5 + parent: 30 - uid: 17041 components: - type: Transform @@ -116060,21 +116089,21 @@ entities: parent: 30 - proto: SpawnPointSeniorEngineer entities: - - uid: 15272 + - uid: 868 components: - type: Transform pos: -23.5,-40.5 parent: 30 - proto: SpawnPointSeniorPhysician entities: - - uid: 14533 + - uid: 15751 components: - type: Transform pos: -13.5,-20.5 parent: 30 - proto: SpawnPointSeniorResearcher entities: - - uid: 15273 + - uid: 1083 components: - type: Transform pos: 18.5,11.5 @@ -117073,12 +117102,69 @@ entities: - type: Transform pos: -20.5,42.5 parent: 30 + - uid: 15993 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.5,12.5 + parent: 30 + - uid: 16094 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,14.5 + parent: 30 - uid: 16746 components: - type: Transform rot: 3.141592653589793 rad pos: -20.5,40.5 parent: 30 + - uid: 16780 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -38.5,26.5 + parent: 30 + - uid: 16781 + components: + - type: Transform + pos: 0.5,42.5 + parent: 30 + - uid: 16795 + components: + - type: Transform + pos: -0.5,37.5 + parent: 30 + - uid: 16798 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,66.5 + parent: 30 + - uid: 16802 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,66.5 + parent: 30 + - uid: 16803 + components: + - type: Transform + pos: -5.5,74.5 + parent: 30 + - uid: 16931 + components: + - type: Transform + pos: 4.5,74.5 + parent: 30 + - uid: 17112 + components: + - type: Transform + anchored: False + rot: 3.141592653589793 rad + pos: -0.22898674,56.08518 + parent: 5350 - uid: 21172 components: - type: Transform @@ -117355,6 +117441,17 @@ entities: - SurveillanceCameraEngineering nameSet: True id: TEG North + - uid: 16167 + components: + - type: Transform + pos: 1.5,-44.5 + parent: 30 + - uid: 16242 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -16.5,-28.5 + parent: 30 - uid: 21209 components: - type: Transform @@ -117568,6 +117665,18 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Disposals + - uid: 15991 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 30.5,42.5 + parent: 30 + - uid: 15992 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 46.5,38.5 + parent: 30 - uid: 16225 components: - type: Transform @@ -117622,6 +117731,11 @@ entities: rot: 3.141592653589793 rad pos: -52.5,25.5 parent: 30 + - uid: 16747 + components: + - type: Transform + pos: -58.5,-9.5 + parent: 30 - uid: 16748 components: - type: Transform @@ -117656,6 +117770,11 @@ entities: - type: Transform pos: -17.5,1.5 parent: 30 + - uid: 16777 + components: + - type: Transform + pos: -43.5,13.5 + parent: 30 - uid: 20787 components: - type: Transform @@ -118036,6 +118155,16 @@ entities: rot: 1.5707963267948966 rad pos: 15.5,17.5 parent: 30 + - uid: 16126 + components: + - type: Transform + pos: 30.5,18.5 + parent: 30 + - uid: 16139 + components: + - type: Transform + pos: 24.5,18.5 + parent: 30 - uid: 16201 components: - type: Transform @@ -118093,10 +118222,11 @@ entities: - SurveillanceCameraSecurity nameSet: True id: Armory Space View - - uid: 16242 + - uid: 15272 components: - type: Transform - pos: 40.5,37.5 + rot: 3.141592653589793 rad + pos: 38.5,41.5 parent: 30 - uid: 21165 components: @@ -118279,6 +118409,11 @@ entities: - SurveillanceCameraService nameSet: True id: Service Hall + - uid: 15979 + components: + - type: Transform + pos: 3.5,13.5 + parent: 30 - uid: 21221 components: - type: Transform @@ -118358,6 +118493,12 @@ entities: - SurveillanceCameraSupply nameSet: True id: Cargo Bay + - uid: 16166 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 37.5,-2.5 + parent: 30 - uid: 18064 components: - type: Transform @@ -122617,11 +122758,6 @@ entities: - type: Transform pos: -50.5,11.5 parent: 30 - - uid: 868 - components: - - type: Transform - pos: -59.5,-10.5 - parent: 30 - uid: 882 components: - type: Transform @@ -122734,11 +122870,6 @@ entities: - type: Transform pos: -61.5,-10.5 parent: 30 - - uid: 1083 - components: - - type: Transform - pos: -52.5,-10.5 - parent: 30 - uid: 1140 components: - type: Transform