diff --git a/Resources/Maps/Shuttles/emergency_awesome.yml b/Resources/Maps/Shuttles/emergency_awesome.yml index 07efa408de4..1653aeb6398 100644 --- a/Resources/Maps/Shuttles/emergency_awesome.yml +++ b/Resources/Maps/Shuttles/emergency_awesome.yml @@ -19,7 +19,11 @@ entities: - type: MetaData name: Awesome Emergency - type: Transform +<<<<<<< HEAD pos: -96.0185,14.997883 +======= + pos: -91.98113,14.272835 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c parent: invalid - type: MapGrid chunks: @@ -585,7 +589,11 @@ entities: - type: RadiationGridResistance - proto: AirAlarm entities: +<<<<<<< HEAD - uid: 2 +======= + - uid: 552 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -593,6 +601,7 @@ entities: parent: 1 - type: DeviceList devices: +<<<<<<< HEAD - 250 - 257 - 253 @@ -603,6 +612,18 @@ entities: - 22 - 255 - uid: 3 +======= + - 566 + - 564 + - 560 + - 488 + - 569 + - 236 + - 474 + - 558 + - 562 + - uid: 553 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -610,6 +631,7 @@ entities: parent: 1 - type: DeviceList devices: +<<<<<<< HEAD - 363 - 354 - 23 @@ -620,6 +642,18 @@ entities: - 256 - 254 - uid: 4 +======= + - 508 + - 522 + - 559 + - 492 + - 568 + - 565 + - 557 + - 563 + - 561 + - uid: 554 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -627,11 +661,19 @@ entities: parent: 1 - type: DeviceList devices: +<<<<<<< HEAD - 251 - 364 - 356 - 24 - uid: 5 +======= + - 570 + - 540 + - 541 + - 571 + - uid: 555 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -639,12 +681,21 @@ entities: parent: 1 - type: DeviceList devices: +<<<<<<< HEAD - 362 - 25 - 355 - 255 - 254 - uid: 6 +======= + - 506 + - 572 + - 525 + - 562 + - 561 + - uid: 556 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -652,6 +703,7 @@ entities: parent: 1 - type: DeviceList devices: +<<<<<<< HEAD - 357 - 365 - 26 @@ -660,6 +712,16 @@ entities: - proto: AirCanister entities: - uid: 7 +======= + - 550 + - 551 + - 573 + - 563 + - 564 +- proto: AirCanister + entities: + - uid: 103 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform anchored: True @@ -669,59 +731,99 @@ entities: bodyType: Static - proto: AirlockCommandGlassLocked entities: +<<<<<<< HEAD - uid: 8 +======= + - uid: 214 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,10.5 parent: 1 +<<<<<<< HEAD - uid: 9 +======= + - uid: 216 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,10.5 parent: 1 +<<<<<<< HEAD - uid: 10 +======= + - uid: 268 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,11.5 parent: 1 +<<<<<<< HEAD - uid: 11 +======= + - uid: 271 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,11.5 parent: 1 - proto: AirlockEngineeringLocked entities: +<<<<<<< HEAD - uid: 12 +======= + - uid: 63 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,-1.5 parent: 1 +<<<<<<< HEAD - uid: 13 +======= + - uid: 80 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,-1.5 parent: 1 - proto: AirlockExternalGlassShuttleLocked entities: +<<<<<<< HEAD - uid: 14 +======= + - uid: 130 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,-0.5 parent: 1 +<<<<<<< HEAD - uid: 15 +======= + - uid: 131 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,1.5 parent: 1 +<<<<<<< HEAD - uid: 16 +======= + - uid: 132 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,7.5 parent: 1 +<<<<<<< HEAD - uid: 17 +======= + - uid: 133 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -729,13 +831,21 @@ entities: parent: 1 - proto: AirlockGlass entities: +<<<<<<< HEAD - uid: 18 +======= + - uid: 309 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,4.5 parent: 1 +<<<<<<< HEAD - uid: 19 +======= + - uid: 310 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad @@ -743,95 +853,153 @@ entities: parent: 1 - proto: AirlockSecurityGlassLocked entities: +<<<<<<< HEAD - uid: 20 +======= + - uid: 202 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,7.5 parent: 1 +<<<<<<< HEAD - uid: 21 +======= + - uid: 219 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,7.5 parent: 1 - proto: AirSensor entities: +<<<<<<< HEAD - uid: 22 +======= + - uid: 558 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,4.5 parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 2 - uid: 23 +======= + - 552 + - uid: 559 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,4.5 parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 3 - uid: 24 +======= + - 553 + - uid: 571 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,1.5 parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 4 - uid: 25 +======= + - 554 + - uid: 572 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,7.5 parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 5 - uid: 26 +======= + - 555 + - uid: 573 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,15.5 parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 6 - uid: 27 +======= + - 556 + - uid: 584 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,-3.5 parent: 1 - proto: APCBasic entities: +<<<<<<< HEAD - uid: 28 +======= + - uid: 4 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,-6.5 parent: 1 +<<<<<<< HEAD - uid: 29 +======= + - uid: 349 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 7.5,5.5 parent: 1 +<<<<<<< HEAD - uid: 30 +======= + - uid: 384 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,6.5 parent: 1 +<<<<<<< HEAD - uid: 31 +======= + - uid: 385 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,2.5 parent: 1 +<<<<<<< HEAD - uid: 32 +======= + - uid: 398 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,13.5 parent: 1 +<<<<<<< HEAD - proto: AtmosDeviceFanDirectional entities: - uid: 586 @@ -861,769 +1029,1374 @@ entities: - proto: BedsheetMedical entities: - uid: 33 +======= +- proto: BedsheetMedical + entities: + - uid: 319 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,0.5 parent: 1 +<<<<<<< HEAD - uid: 34 +======= + - uid: 325 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,1.5 parent: 1 +<<<<<<< HEAD - uid: 35 +======= + - uid: 326 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,-0.5 parent: 1 - proto: BlastDoorOpen entities: +<<<<<<< HEAD - uid: 36 +======= + - uid: 208 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,10.5 parent: 1 +<<<<<<< HEAD - uid: 37 +======= + - uid: 209 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,10.5 parent: 1 +<<<<<<< HEAD - uid: 38 +======= + - uid: 210 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,9.5 parent: 1 +<<<<<<< HEAD - uid: 39 +======= + - uid: 213 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,9.5 parent: 1 +<<<<<<< HEAD - uid: 40 +======= + - uid: 218 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,9.5 parent: 1 - proto: Brutepack entities: +<<<<<<< HEAD - uid: 41 +======= + - uid: 333 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.4606323,-0.35036087 parent: 1 - proto: CableApcExtension entities: +<<<<<<< HEAD - uid: 42 +======= + - uid: 5 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,-6.5 parent: 1 +<<<<<<< HEAD - uid: 43 +======= + - uid: 6 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,-7.5 parent: 1 +<<<<<<< HEAD - uid: 44 +======= + - uid: 7 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,-7.5 parent: 1 +<<<<<<< HEAD - uid: 45 +======= + - uid: 8 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,-7.5 parent: 1 +<<<<<<< HEAD - uid: 46 +======= + - uid: 9 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 47 +======= + - uid: 10 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 48 +======= + - uid: 11 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 49 +======= + - uid: 12 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 10.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 50 +======= + - uid: 13 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 10.5,-6.5 parent: 1 +<<<<<<< HEAD - uid: 51 +======= + - uid: 14 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,-4.5 parent: 1 +<<<<<<< HEAD - uid: 52 +======= + - uid: 15 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,-3.5 parent: 1 +<<<<<<< HEAD - uid: 53 +======= + - uid: 16 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,-3.5 parent: 1 +<<<<<<< HEAD - uid: 54 +======= + - uid: 17 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,-3.5 parent: 1 +<<<<<<< HEAD - uid: 55 +======= + - uid: 18 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,-3.5 parent: 1 +<<<<<<< HEAD - uid: 56 +======= + - uid: 19 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,-3.5 parent: 1 +<<<<<<< HEAD - uid: 57 +======= + - uid: 20 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,-4.5 parent: 1 +<<<<<<< HEAD - uid: 58 +======= + - uid: 21 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,-6.5 parent: 1 +<<<<<<< HEAD - uid: 59 +======= + - uid: 22 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,-7.5 parent: 1 +<<<<<<< HEAD - uid: 60 +======= + - uid: 23 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 61 +======= + - uid: 24 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,-7.5 parent: 1 +<<<<<<< HEAD - uid: 62 +======= + - uid: 25 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,-7.5 parent: 1 +<<<<<<< HEAD - uid: 63 +======= + - uid: 27 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 64 +======= + - uid: 28 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 65 +======= + - uid: 29 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,-6.5 parent: 1 +<<<<<<< HEAD - uid: 66 +======= + - uid: 37 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 67 +======= + - uid: 197 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,-3.5 parent: 1 +<<<<<<< HEAD - uid: 68 +======= + - uid: 303 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,-3.5 parent: 1 +<<<<<<< HEAD - uid: 69 +======= + - uid: 307 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,-3.5 parent: 1 +<<<<<<< HEAD - uid: 70 +======= + - uid: 313 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,-3.5 parent: 1 +<<<<<<< HEAD - uid: 71 +======= + - uid: 314 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,-2.5 parent: 1 +<<<<<<< HEAD - uid: 72 +======= + - uid: 316 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,-2.5 parent: 1 +<<<<<<< HEAD - uid: 73 +======= + - uid: 350 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,5.5 parent: 1 +<<<<<<< HEAD - uid: 74 +======= + - uid: 351 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,4.5 parent: 1 +<<<<<<< HEAD - uid: 75 +======= + - uid: 352 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,4.5 parent: 1 +<<<<<<< HEAD - uid: 76 +======= + - uid: 353 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,4.5 parent: 1 +<<<<<<< HEAD - uid: 77 +======= + - uid: 354 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,4.5 parent: 1 +<<<<<<< HEAD - uid: 78 +======= + - uid: 355 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,4.5 parent: 1 +<<<<<<< HEAD - uid: 79 +======= + - uid: 356 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,4.5 parent: 1 +<<<<<<< HEAD - uid: 80 +======= + - uid: 357 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,4.5 parent: 1 +<<<<<<< HEAD - uid: 81 +======= + - uid: 358 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,4.5 parent: 1 +<<<<<<< HEAD - uid: 82 +======= + - uid: 359 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,6.5 parent: 1 +<<<<<<< HEAD - uid: 83 +======= + - uid: 360 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,7.5 parent: 1 +<<<<<<< HEAD - uid: 84 +======= + - uid: 361 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,8.5 parent: 1 +<<<<<<< HEAD - uid: 85 +======= + - uid: 362 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,5.5 parent: 1 +<<<<<<< HEAD - uid: 86 +======= + - uid: 363 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,9.5 parent: 1 +<<<<<<< HEAD - uid: 87 +======= + - uid: 364 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,3.5 parent: 1 +<<<<<<< HEAD - uid: 88 +======= + - uid: 365 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,1.5 parent: 1 +<<<<<<< HEAD - uid: 89 +======= + - uid: 366 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,0.5 parent: 1 +<<<<<<< HEAD - uid: 90 +======= + - uid: 367 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,-0.5 parent: 1 +<<<<<<< HEAD - uid: 91 +======= + - uid: 368 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,2.5 parent: 1 +<<<<<<< HEAD - uid: 92 +======= + - uid: 369 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,4.5 parent: 1 +<<<<<<< HEAD - uid: 93 +======= + - uid: 370 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,2.5 parent: 1 +<<<<<<< HEAD - uid: 94 +======= + - uid: 371 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,1.5 parent: 1 +<<<<<<< HEAD - uid: 95 +======= + - uid: 372 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,0.5 parent: 1 +<<<<<<< HEAD - uid: 96 +======= + - uid: 373 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,-0.5 parent: 1 +<<<<<<< HEAD - uid: 97 +======= + - uid: 374 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,3.5 parent: 1 +<<<<<<< HEAD - uid: 98 +======= + - uid: 375 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,5.5 parent: 1 +<<<<<<< HEAD - uid: 99 +======= + - uid: 376 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,7.5 parent: 1 +<<<<<<< HEAD - uid: 100 +======= + - uid: 377 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,8.5 parent: 1 +<<<<<<< HEAD - uid: 101 +======= + - uid: 378 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,9.5 parent: 1 +<<<<<<< HEAD - uid: 102 +======= + - uid: 379 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,6.5 parent: 1 +<<<<<<< HEAD - uid: 103 +======= + - uid: 380 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,9.5 parent: 1 +<<<<<<< HEAD - uid: 104 +======= + - uid: 381 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,10.5 parent: 1 +<<<<<<< HEAD - uid: 105 +======= + - uid: 382 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,9.5 parent: 1 +<<<<<<< HEAD - uid: 106 +======= + - uid: 383 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,10.5 parent: 1 +<<<<<<< HEAD - uid: 107 +======= + - uid: 406 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,13.5 parent: 1 +<<<<<<< HEAD - uid: 108 +======= + - uid: 407 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,13.5 parent: 1 +<<<<<<< HEAD - uid: 109 +======= + - uid: 408 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,13.5 parent: 1 +<<<<<<< HEAD - uid: 110 +======= + - uid: 409 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,12.5 parent: 1 +<<<<<<< HEAD - uid: 111 +======= + - uid: 410 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,10.5 parent: 1 +<<<<<<< HEAD - uid: 112 +======= + - uid: 411 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,11.5 parent: 1 +<<<<<<< HEAD - uid: 113 +======= + - uid: 412 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,13.5 parent: 1 +<<<<<<< HEAD - uid: 114 +======= + - uid: 413 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,13.5 parent: 1 +<<<<<<< HEAD - uid: 115 +======= + - uid: 414 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,12.5 parent: 1 +<<<<<<< HEAD - uid: 116 +======= + - uid: 415 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,11.5 parent: 1 +<<<<<<< HEAD - uid: 117 +======= + - uid: 416 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,10.5 parent: 1 +<<<<<<< HEAD - uid: 118 +======= + - uid: 417 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,12.5 parent: 1 +<<<<<<< HEAD - uid: 119 +======= + - uid: 418 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,12.5 parent: 1 +<<<<<<< HEAD - uid: 120 +======= + - uid: 419 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,14.5 parent: 1 +<<<<<<< HEAD - uid: 121 +======= + - uid: 420 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,15.5 parent: 1 +<<<<<<< HEAD - uid: 122 +======= + - uid: 421 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,14.5 parent: 1 +<<<<<<< HEAD - uid: 123 +======= + - uid: 422 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,15.5 parent: 1 +<<<<<<< HEAD - uid: 124 +======= + - uid: 423 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,6.5 parent: 1 +<<<<<<< HEAD - uid: 125 +======= + - uid: 424 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,6.5 parent: 1 +<<<<<<< HEAD - uid: 126 +======= + - uid: 425 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,7.5 parent: 1 +<<<<<<< HEAD - uid: 127 +======= + - uid: 426 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,7.5 parent: 1 +<<<<<<< HEAD - uid: 128 +======= + - uid: 427 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,7.5 parent: 1 +<<<<<<< HEAD - uid: 129 +======= + - uid: 428 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,2.5 parent: 1 +<<<<<<< HEAD - uid: 130 +======= + - uid: 429 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,2.5 parent: 1 +<<<<<<< HEAD - uid: 131 +======= + - uid: 430 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,2.5 parent: 1 +<<<<<<< HEAD - uid: 132 +======= + - uid: 431 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,1.5 parent: 1 +<<<<<<< HEAD - uid: 133 +======= + - uid: 432 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,-0.5 parent: 1 +<<<<<<< HEAD - uid: 134 +======= + - uid: 433 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,0.5 parent: 1 +<<<<<<< HEAD - uid: 135 +======= + - uid: 434 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,2.5 parent: 1 - proto: CableHV entities: +<<<<<<< HEAD - uid: 136 +======= + - uid: 30 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,-6.5 parent: 1 +<<<<<<< HEAD - uid: 137 +======= + - uid: 31 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,-6.5 parent: 1 +<<<<<<< HEAD - uid: 138 +======= + - uid: 32 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,-4.5 parent: 1 +<<<<<<< HEAD - uid: 139 +======= + - uid: 33 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,-4.5 parent: 1 +<<<<<<< HEAD - uid: 140 +======= + - uid: 34 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 141 +======= + - uid: 35 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,-4.5 parent: 1 +<<<<<<< HEAD - uid: 142 +======= + - uid: 36 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 143 +======= + - uid: 38 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 144 +======= + - uid: 39 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 145 +======= + - uid: 40 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 146 +======= + - uid: 41 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,-4.5 parent: 1 - proto: CableMV entities: +<<<<<<< HEAD - uid: 147 +======= + - uid: 42 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,-4.5 parent: 1 +<<<<<<< HEAD - uid: 148 +======= + - uid: 43 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,-4.5 parent: 1 +<<<<<<< HEAD - uid: 149 +======= + - uid: 44 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 150 +======= + - uid: 45 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,-6.5 parent: 1 +<<<<<<< HEAD - uid: 151 +======= + - uid: 337 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,-3.5 parent: 1 +<<<<<<< HEAD - uid: 152 +======= + - uid: 338 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,-2.5 parent: 1 +<<<<<<< HEAD - uid: 153 +======= + - uid: 339 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,-2.5 parent: 1 +<<<<<<< HEAD - uid: 154 +======= + - uid: 340 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,-1.5 parent: 1 +<<<<<<< HEAD - uid: 155 +======= + - uid: 341 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,0.5 parent: 1 +<<<<<<< HEAD - uid: 156 +======= + - uid: 342 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,1.5 parent: 1 +<<<<<<< HEAD - uid: 157 +======= + - uid: 343 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,2.5 parent: 1 +<<<<<<< HEAD - uid: 158 +======= + - uid: 344 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,3.5 parent: 1 +<<<<<<< HEAD - uid: 159 +======= + - uid: 345 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,-0.5 parent: 1 +<<<<<<< HEAD - uid: 160 +======= + - uid: 346 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,4.5 parent: 1 +<<<<<<< HEAD - uid: 161 +======= + - uid: 347 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,5.5 parent: 1 +<<<<<<< HEAD - uid: 162 +======= + - uid: 348 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,5.5 parent: 1 +<<<<<<< HEAD - uid: 163 +======= + - uid: 386 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,2.5 parent: 1 +<<<<<<< HEAD - uid: 164 +======= + - uid: 387 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,6.5 parent: 1 +<<<<<<< HEAD - uid: 165 +======= + - uid: 388 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,7.5 parent: 1 +<<<<<<< HEAD - uid: 166 +======= + - uid: 389 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,7.5 parent: 1 +<<<<<<< HEAD - uid: 167 +======= + - uid: 390 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,7.5 parent: 1 +<<<<<<< HEAD - uid: 168 +======= + - uid: 392 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,7.5 parent: 1 +<<<<<<< HEAD - uid: 169 +======= + - uid: 393 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,6.5 parent: 1 +<<<<<<< HEAD - uid: 170 +======= + - uid: 394 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,6.5 parent: 1 +<<<<<<< HEAD - uid: 171 +======= + - uid: 395 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,8.5 parent: 1 +<<<<<<< HEAD - uid: 172 +======= + - uid: 396 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,10.5 parent: 1 +<<<<<<< HEAD - uid: 173 +======= + - uid: 397 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,9.5 parent: 1 +<<<<<<< HEAD - uid: 174 +======= + - uid: 399 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,10.5 parent: 1 +<<<<<<< HEAD - uid: 175 +======= + - uid: 400 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,10.5 parent: 1 +<<<<<<< HEAD - uid: 176 +======= + - uid: 401 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,11.5 parent: 1 +<<<<<<< HEAD - uid: 177 +======= + - uid: 402 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,13.5 parent: 1 +<<<<<<< HEAD - uid: 178 +======= + - uid: 403 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,12.5 parent: 1 +<<<<<<< HEAD - uid: 179 +======= + - uid: 404 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,13.5 parent: 1 +<<<<<<< HEAD - uid: 180 +======= + - uid: 405 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,13.5 parent: 1 +<<<<<<< HEAD - uid: 181 +======= + - uid: 503 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,7.5 parent: 1 - proto: CableTerminal entities: +<<<<<<< HEAD - uid: 182 +======= + - uid: 46 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 5.5,-4.5 parent: 1 +<<<<<<< HEAD - uid: 183 +======= + - uid: 47 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -1631,156 +2404,272 @@ entities: parent: 1 - proto: Catwalk entities: +<<<<<<< HEAD - uid: 184 +======= + - uid: 48 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,-7.5 parent: 1 +<<<<<<< HEAD - uid: 185 +======= + - uid: 49 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,-7.5 parent: 1 +<<<<<<< HEAD - uid: 186 +======= + - uid: 50 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,-7.5 parent: 1 +<<<<<<< HEAD - uid: 187 +======= + - uid: 51 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 188 +======= + - uid: 52 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,-6.5 parent: 1 +<<<<<<< HEAD - uid: 189 +======= + - uid: 53 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,-7.5 parent: 1 +<<<<<<< HEAD - uid: 190 +======= + - uid: 54 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,-7.5 parent: 1 +<<<<<<< HEAD - uid: 191 +======= + - uid: 55 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,-7.5 parent: 1 +<<<<<<< HEAD - uid: 192 +======= + - uid: 56 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 10.5,-6.5 parent: 1 +<<<<<<< HEAD - uid: 193 +======= + - uid: 57 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 10.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 194 +======= + - uid: 58 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,-6.5 parent: 1 +<<<<<<< HEAD - uid: 195 +======= + - uid: 59 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 196 +======= + - uid: 60 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,-4.5 parent: 1 +<<<<<<< HEAD - uid: 197 +======= + - uid: 61 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 198 +======= + - uid: 62 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,-4.5 parent: 1 +<<<<<<< HEAD - uid: 199 +======= + - uid: 226 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,12.5 parent: 1 +<<<<<<< HEAD - uid: 200 +======= + - uid: 227 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,11.5 parent: 1 +<<<<<<< HEAD - uid: 201 +======= + - uid: 228 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,14.5 parent: 1 +<<<<<<< HEAD - uid: 202 +======= + - uid: 229 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,14.5 parent: 1 +<<<<<<< HEAD - uid: 203 +======= + - uid: 230 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 10.5,12.5 parent: 1 +<<<<<<< HEAD - uid: 204 +======= + - uid: 231 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 10.5,11.5 parent: 1 +<<<<<<< HEAD - uid: 205 +======= + - uid: 467 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad pos: 8.5,6.5 parent: 1 +<<<<<<< HEAD - uid: 206 +======= + - uid: 469 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,13.5 parent: 1 +<<<<<<< HEAD - uid: 207 +======= + - uid: 470 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad pos: 8.5,2.5 parent: 1 +<<<<<<< HEAD - uid: 208 +======= + - uid: 498 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,4.5 parent: 1 - proto: Chair entities: +<<<<<<< HEAD - uid: 209 +======= + - uid: 290 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,8.5 parent: 1 +<<<<<<< HEAD - uid: 210 +======= + - uid: 291 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,8.5 parent: 1 +<<<<<<< HEAD - uid: 211 +======= + - uid: 292 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,8.5 parent: 1 - proto: ChairCarp entities: +<<<<<<< HEAD - uid: 212 +======= + - uid: 265 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad @@ -1788,12 +2677,20 @@ entities: parent: 1 - proto: ChairOfficeLight entities: +<<<<<<< HEAD - uid: 213 +======= + - uid: 320 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5091476,2.5533772 parent: 1 +<<<<<<< HEAD - uid: 214 +======= + - uid: 322 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -1801,159 +2698,267 @@ entities: parent: 1 - proto: ChairPilotSeat entities: +<<<<<<< HEAD - uid: 215 +======= + - uid: 66 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,-2.5 parent: 1 +<<<<<<< HEAD - uid: 216 +======= + - uid: 67 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,-2.5 parent: 1 +<<<<<<< HEAD - uid: 217 +======= + - uid: 68 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,-2.5 parent: 1 +<<<<<<< HEAD - uid: 218 +======= + - uid: 82 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,-2.5 parent: 1 +<<<<<<< HEAD - uid: 219 +======= + - uid: 182 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,9.5 parent: 1 +<<<<<<< HEAD - uid: 220 +======= + - uid: 183 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,8.5 parent: 1 +<<<<<<< HEAD - uid: 221 +======= + - uid: 184 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,7.5 parent: 1 +<<<<<<< HEAD - uid: 222 +======= + - uid: 185 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,5.5 parent: 1 +<<<<<<< HEAD - uid: 223 +======= + - uid: 186 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,3.5 parent: 1 +<<<<<<< HEAD - uid: 224 +======= + - uid: 187 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,4.5 parent: 1 +<<<<<<< HEAD - uid: 225 +======= + - uid: 188 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,1.5 parent: 1 +<<<<<<< HEAD - uid: 226 +======= + - uid: 189 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,0.5 parent: 1 +<<<<<<< HEAD - uid: 227 +======= + - uid: 190 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,-0.5 parent: 1 +<<<<<<< HEAD - uid: 228 +======= + - uid: 259 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,15.5 parent: 1 +<<<<<<< HEAD - uid: 229 +======= + - uid: 260 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,15.5 parent: 1 +<<<<<<< HEAD - uid: 230 +======= + - uid: 261 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,15.5 parent: 1 +<<<<<<< HEAD - uid: 231 +======= + - uid: 262 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,14.5 parent: 1 +<<<<<<< HEAD - uid: 232 +======= + - uid: 263 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,14.5 parent: 1 +<<<<<<< HEAD - uid: 233 +======= + - uid: 264 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,13.5 parent: 1 +<<<<<<< HEAD - uid: 234 +======= + - uid: 266 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,13.5 parent: 1 +<<<<<<< HEAD - uid: 235 +======= + - uid: 293 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,6.5 parent: 1 +<<<<<<< HEAD - uid: 236 +======= + - uid: 295 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,6.5 parent: 1 +<<<<<<< HEAD - uid: 237 +======= + - uid: 296 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,5.5 parent: 1 +<<<<<<< HEAD - uid: 238 +======= + - uid: 297 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,4.5 parent: 1 +<<<<<<< HEAD - uid: 239 +======= + - uid: 298 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,3.5 parent: 1 +<<<<<<< HEAD - uid: 240 +======= + - uid: 305 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,-2.5 parent: 1 +<<<<<<< HEAD - uid: 241 +======= + - uid: 312 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -1961,49 +2966,77 @@ entities: parent: 1 - proto: ComputerComms entities: +<<<<<<< HEAD - uid: 242 +======= + - uid: 255 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,16.5 parent: 1 - proto: ComputerCriminalRecords entities: +<<<<<<< HEAD - uid: 243 +======= + - uid: 254 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,16.5 parent: 1 - proto: ComputerEmergencyShuttle entities: +<<<<<<< HEAD - uid: 244 +======= + - uid: 267 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,14.5 parent: 1 - proto: ComputerId entities: +<<<<<<< HEAD - uid: 245 +======= + - uid: 256 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,16.5 parent: 1 - proto: ComputerPowerMonitoring entities: +<<<<<<< HEAD - uid: 246 +======= + - uid: 258 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,15.5 parent: 1 - proto: ComputerRadar entities: +<<<<<<< HEAD - uid: 247 +======= + - uid: 257 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,15.5 parent: 1 - proto: DefibrillatorCabinetFilled entities: +<<<<<<< HEAD - uid: 248 +======= + - uid: 327 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2011,25 +3044,41 @@ entities: parent: 1 - proto: Firelock entities: +<<<<<<< HEAD - uid: 249 +======= + - uid: 565 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,-1.5 parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 3 - uid: 250 +======= + - 553 + - uid: 566 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,-1.5 parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 2 - proto: FirelockEdge entities: - uid: 251 +======= + - 552 +- proto: FirelockEdge + entities: + - uid: 570 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad @@ -2037,71 +3086,118 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 4 - proto: FirelockGlass entities: - uid: 252 +======= + - 554 +- proto: FirelockGlass + entities: + - uid: 557 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,4.5 parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 3 - uid: 253 +======= + - 553 + - uid: 560 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,4.5 parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 2 - uid: 254 +======= + - 552 + - uid: 561 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,7.5 parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 5 - 3 - uid: 255 +======= + - 555 + - 553 + - uid: 562 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,7.5 parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 5 - 2 - uid: 256 +======= + - 555 + - 552 + - uid: 563 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,10.5 parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 3 - 6 - uid: 257 +======= + - 553 + - 556 + - uid: 564 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,10.5 parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 2 - 6 - proto: GasPipeBend entities: - uid: 258 +======= + - 552 + - 556 +- proto: GasPipeBend + entities: + - uid: 69 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,-3.5 parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 259 +======= + - uid: 70 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2109,7 +3205,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 260 +======= + - uid: 453 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2117,7 +3217,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 261 +======= + - uid: 457 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2125,7 +3229,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 262 +======= + - uid: 463 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad @@ -2133,7 +3241,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 263 +======= + - uid: 471 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2141,14 +3253,22 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 264 +======= + - uid: 472 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,1.5 parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 265 +======= + - uid: 473 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2156,7 +3276,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 266 +======= + - uid: 475 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2164,7 +3288,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 267 +======= + - uid: 476 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad @@ -2172,7 +3300,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 268 +======= + - uid: 478 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad @@ -2180,21 +3312,33 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 269 +======= + - uid: 485 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,9.5 parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 270 +======= + - uid: 527 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,8.5 parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 271 +======= + - uid: 528 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2202,7 +3346,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 272 +======= + - uid: 533 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2210,7 +3358,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 273 +======= + - uid: 536 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad @@ -2218,7 +3370,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 274 +======= + - uid: 538 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2226,14 +3382,22 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 275 +======= + - uid: 539 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,4.5 parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 276 +======= + - uid: 542 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2241,14 +3405,22 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 277 +======= + - uid: 543 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,10.5 parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 278 +======= + - uid: 544 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2256,7 +3428,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 279 +======= + - uid: 545 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad @@ -2264,7 +3440,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 280 +======= + - uid: 567 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2272,7 +3452,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 281 +======= + - uid: 575 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2280,14 +3464,22 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 282 +======= + - uid: 578 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,-2.5 parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 283 +======= + - uid: 579 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2297,14 +3489,22 @@ entities: color: '#0000FFFF' - proto: GasPipeStraight entities: +<<<<<<< HEAD - uid: 284 +======= + - uid: 438 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,-4.5 parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 285 +======= + - uid: 455 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2312,7 +3512,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 286 +======= + - uid: 459 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2320,7 +3524,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 287 +======= + - uid: 460 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2328,7 +3536,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 288 +======= + - uid: 461 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2336,7 +3548,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 289 +======= + - uid: 464 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad @@ -2344,7 +3560,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 290 +======= + - uid: 466 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad @@ -2352,7 +3572,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 291 +======= + - uid: 480 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2360,7 +3584,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 292 +======= + - uid: 481 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2368,7 +3596,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 293 +======= + - uid: 482 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2376,7 +3608,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 294 +======= + - uid: 483 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2384,7 +3620,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 295 +======= + - uid: 484 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2392,14 +3632,22 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 296 +======= + - uid: 486 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,-0.5 parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 297 +======= + - uid: 489 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2407,7 +3655,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 298 +======= + - uid: 490 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2415,7 +3667,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 299 +======= + - uid: 491 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2423,7 +3679,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 300 +======= + - uid: 493 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2431,7 +3691,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 301 +======= + - uid: 494 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2439,35 +3703,55 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 302 +======= + - uid: 496 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,2.5 parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 303 +======= + - uid: 497 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,3.5 parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 304 +======= + - uid: 499 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,1.5 parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 305 +======= + - uid: 500 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,5.5 parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 306 +======= + - uid: 502 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2475,7 +3759,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 307 +======= + - uid: 504 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2483,7 +3771,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 308 +======= + - uid: 505 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2491,42 +3783,66 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 309 +======= + - uid: 509 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,2.5 parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 310 +======= + - uid: 511 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,5.5 parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 311 +======= + - uid: 512 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,6.5 parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 312 +======= + - uid: 513 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,7.5 parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 313 +======= + - uid: 514 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,3.5 parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 314 +======= + - uid: 517 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2534,7 +3850,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 315 +======= + - uid: 518 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2542,7 +3862,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 316 +======= + - uid: 519 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2550,7 +3874,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 317 +======= + - uid: 520 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2558,7 +3886,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 318 +======= + - uid: 523 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad @@ -2566,7 +3898,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 319 +======= + - uid: 524 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad @@ -2574,7 +3910,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 320 +======= + - uid: 526 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2582,14 +3922,22 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 321 +======= + - uid: 529 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,8.5 parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 322 +======= + - uid: 530 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2597,7 +3945,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 323 +======= + - uid: 531 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2605,7 +3957,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 324 +======= + - uid: 532 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad @@ -2613,7 +3969,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 325 +======= + - uid: 534 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad @@ -2621,7 +3981,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 326 +======= + - uid: 535 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad @@ -2629,7 +3993,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 327 +======= + - uid: 537 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad @@ -2637,7 +4005,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 328 +======= + - uid: 546 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2645,7 +4017,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 329 +======= + - uid: 547 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2653,21 +4029,33 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 330 +======= + - uid: 548 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,11.5 parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 331 +======= + - uid: 549 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,11.5 parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 332 +======= + - uid: 580 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2675,7 +4063,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 333 +======= + - uid: 581 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2685,7 +4077,11 @@ entities: color: '#FF0000FF' - proto: GasPipeTJunction entities: +<<<<<<< HEAD - uid: 334 +======= + - uid: 391 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad @@ -2693,7 +4089,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 335 +======= + - uid: 462 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2701,7 +4101,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 336 +======= + - uid: 465 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2709,7 +4113,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 337 +======= + - uid: 468 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2717,7 +4125,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 338 +======= + - uid: 477 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2725,7 +4137,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 339 +======= + - uid: 479 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2733,7 +4149,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 340 +======= + - uid: 487 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2741,7 +4161,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 341 +======= + - uid: 495 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2749,7 +4173,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 342 +======= + - uid: 501 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2757,7 +4185,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' +<<<<<<< HEAD - uid: 343 +======= + - uid: 507 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2765,7 +4197,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 344 +======= + - uid: 510 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2773,7 +4209,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 345 +======= + - uid: 515 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2781,7 +4221,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 346 +======= + - uid: 516 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2789,7 +4233,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 347 +======= + - uid: 521 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,9.5 @@ -2798,13 +4246,21 @@ entities: color: '#0000FFFF' - proto: GasPort entities: +<<<<<<< HEAD - uid: 348 +======= + - uid: 456 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 349 +======= + - uid: 458 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2812,7 +4268,11 @@ entities: parent: 1 - proto: GasPressurePump entities: +<<<<<<< HEAD - uid: 350 +======= + - uid: 102 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2820,7 +4280,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' +<<<<<<< HEAD - uid: 351 +======= + - uid: 437 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2830,7 +4294,11 @@ entities: color: '#FF0000FF' - proto: GasVentPump entities: +<<<<<<< HEAD - uid: 352 +======= + - uid: 236 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2838,10 +4306,17 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 2 - type: AtmosPipeColor color: '#0000FFFF' - uid: 353 +======= + - 552 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 492 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2849,10 +4324,17 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 3 - type: AtmosPipeColor color: '#0000FFFF' - uid: 354 +======= + - 553 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 522 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2860,10 +4342,17 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 3 - type: AtmosPipeColor color: '#0000FFFF' - uid: 355 +======= + - 553 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 525 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad @@ -2871,10 +4360,17 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 5 - type: AtmosPipeColor color: '#0000FFFF' - uid: 356 +======= + - 555 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 541 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2882,20 +4378,34 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 4 - type: AtmosPipeColor color: '#0000FFFF' - uid: 357 +======= + - 554 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 550 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,12.5 parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 6 - type: AtmosPipeColor color: '#0000FFFF' - uid: 358 +======= + - 556 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 569 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -2903,10 +4413,17 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 2 - type: AtmosPipeColor color: '#0000FFFF' - uid: 359 +======= + - 552 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 582 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad @@ -2916,7 +4433,11 @@ entities: color: '#0000FFFF' - proto: GasVentScrubber entities: +<<<<<<< HEAD - uid: 360 +======= + - uid: 474 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2924,10 +4445,17 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 2 - type: AtmosPipeColor color: '#FF0000FF' - uid: 361 +======= + - 552 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 488 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2935,10 +4463,17 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 2 - type: AtmosPipeColor color: '#FF0000FF' - uid: 362 +======= + - 552 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 506 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad @@ -2946,10 +4481,17 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 5 - type: AtmosPipeColor color: '#FF0000FF' - uid: 363 +======= + - 555 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 508 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2957,10 +4499,17 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 3 - type: AtmosPipeColor color: '#FF0000FF' - uid: 364 +======= + - 553 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 540 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2968,20 +4517,34 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 4 - type: AtmosPipeColor color: '#FF0000FF' - uid: 365 +======= + - 554 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 551 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,12.5 parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 6 - type: AtmosPipeColor color: '#FF0000FF' - uid: 366 +======= + - 556 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 568 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -2989,10 +4552,17 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: +<<<<<<< HEAD - 3 - type: AtmosPipeColor color: '#FF0000FF' - uid: 367 +======= + - 553 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 583 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad @@ -3002,224 +4572,392 @@ entities: color: '#FF0000FF' - proto: GeneratorRTG entities: +<<<<<<< HEAD - uid: 368 +======= + - uid: 71 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,-4.5 parent: 1 +<<<<<<< HEAD - uid: 369 +======= + - uid: 72 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,-5.5 parent: 1 - proto: GeneratorWallmountBasic entities: +<<<<<<< HEAD - uid: 370 +======= + - uid: 435 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,-6.5 parent: 1 +<<<<<<< HEAD - uid: 371 +======= + - uid: 436 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,-6.5 parent: 1 - proto: GravityGeneratorMini entities: +<<<<<<< HEAD - uid: 372 +======= + - uid: 73 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,-6.5 parent: 1 - proto: Grille entities: +<<<<<<< HEAD - uid: 373 +======= + - uid: 3 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,-0.5 parent: 1 +<<<<<<< HEAD - uid: 374 +======= + - uid: 74 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,-7.5 parent: 1 +<<<<<<< HEAD - uid: 375 +======= + - uid: 129 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,17.5 parent: 1 +<<<<<<< HEAD - uid: 376 +======= + - uid: 134 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 10.5,0.5 parent: 1 +<<<<<<< HEAD - uid: 377 +======= + - uid: 135 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 10.5,3.5 parent: 1 +<<<<<<< HEAD - uid: 378 +======= + - uid: 136 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 10.5,5.5 parent: 1 +<<<<<<< HEAD - uid: 379 +======= + - uid: 137 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 10.5,4.5 parent: 1 +<<<<<<< HEAD - uid: 380 +======= + - uid: 138 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 10.5,8.5 parent: 1 +<<<<<<< HEAD - uid: 381 +======= + - uid: 160 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,9.5 parent: 1 +<<<<<<< HEAD - uid: 382 +======= + - uid: 161 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,7.5 parent: 1 +<<<<<<< HEAD - uid: 383 +======= + - uid: 162 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,8.5 parent: 1 +<<<<<<< HEAD - uid: 384 +======= + - uid: 163 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,5.5 parent: 1 +<<<<<<< HEAD - uid: 385 +======= + - uid: 164 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,3.5 parent: 1 +<<<<<<< HEAD - uid: 386 +======= + - uid: 165 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,4.5 parent: 1 +<<<<<<< HEAD - uid: 387 +======= + - uid: 166 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,1.5 parent: 1 +<<<<<<< HEAD - uid: 388 +======= + - uid: 167 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,0.5 parent: 1 +<<<<<<< HEAD - uid: 389 +======= + - uid: 168 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,-0.5 parent: 1 +<<<<<<< HEAD - uid: 390 +======= + - uid: 198 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,9.5 parent: 1 +<<<<<<< HEAD - uid: 391 +======= + - uid: 201 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,1.5 parent: 1 +<<<<<<< HEAD - uid: 392 +======= + - uid: 212 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,9.5 parent: 1 +<<<<<<< HEAD - uid: 393 +======= + - uid: 217 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,9.5 parent: 1 +<<<<<<< HEAD - uid: 394 +======= + - uid: 232 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,15.5 parent: 1 +<<<<<<< HEAD - uid: 395 +======= + - uid: 233 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,16.5 parent: 1 +<<<<<<< HEAD - uid: 396 +======= + - uid: 234 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,16.5 parent: 1 +<<<<<<< HEAD - uid: 397 +======= + - uid: 237 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,16.5 parent: 1 +<<<<<<< HEAD - uid: 398 +======= + - uid: 239 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,16.5 parent: 1 +<<<<<<< HEAD - uid: 399 +======= + - uid: 240 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,15.5 parent: 1 +<<<<<<< HEAD - uid: 400 +======= + - uid: 241 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,17.5 parent: 1 +<<<<<<< HEAD - uid: 401 +======= + - uid: 242 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,17.5 parent: 1 +<<<<<<< HEAD - uid: 402 +======= + - uid: 243 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,17.5 parent: 1 +<<<<<<< HEAD - uid: 403 +======= + - uid: 244 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,17.5 parent: 1 +<<<<<<< HEAD - uid: 404 +======= + - uid: 276 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,11.5 parent: 1 +<<<<<<< HEAD - uid: 405 +======= + - uid: 306 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,0.5 parent: 1 - proto: Gyroscope entities: +<<<<<<< HEAD - uid: 406 +======= + - uid: 75 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,-5.5 parent: 1 - proto: HospitalCurtainsOpen entities: +<<<<<<< HEAD - uid: 407 +======= + - uid: 64 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,0.5 parent: 1 +<<<<<<< HEAD - uid: 408 +======= + - uid: 120 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,-0.5 parent: 1 +<<<<<<< HEAD - uid: 409 +======= + - uid: 315 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -3227,7 +4965,11 @@ entities: parent: 1 - proto: LockableButtonCommand entities: +<<<<<<< HEAD - uid: 410 +======= + - uid: 283 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad @@ -3235,6 +4977,7 @@ entities: parent: 1 - type: DeviceLinkSource linkedPorts: +<<<<<<< HEAD 36: - Pressed: Toggle 37: @@ -3242,6 +4985,15 @@ entities: - proto: LockableButtonSecurity entities: - uid: 411 +======= + 208: + - Pressed: Toggle + 209: + - Pressed: Toggle +- proto: LockableButtonSecurity + entities: + - uid: 577 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -3249,6 +5001,7 @@ entities: parent: 1 - type: DeviceLinkSource linkedPorts: +<<<<<<< HEAD 38: - Pressed: Toggle 40: @@ -3258,96 +5011,167 @@ entities: - proto: LockerEvidence entities: - uid: 412 +======= + 210: + - Pressed: Toggle + 218: + - Pressed: Toggle + 213: + - Pressed: Toggle +- proto: LockerEvidence + entities: + - uid: 294 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,6.5 parent: 1 - proto: MachineFrameDestroyed entities: +<<<<<<< HEAD - uid: 413 +======= + - uid: 90 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,-6.5 parent: 1 +<<<<<<< HEAD - uid: 414 +======= + - uid: 220 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 10.5,11.5 parent: 1 +<<<<<<< HEAD - uid: 415 +======= + - uid: 224 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 10.5,12.5 parent: 1 - proto: MedicalBed entities: +<<<<<<< HEAD - uid: 416 +======= + - uid: 286 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,-0.5 parent: 1 +<<<<<<< HEAD - uid: 417 +======= + - uid: 289 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,0.5 parent: 1 +<<<<<<< HEAD - uid: 418 +======= + - uid: 318 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,1.5 parent: 1 - proto: MedkitFilled entities: +<<<<<<< HEAD - uid: 419 +======= + - uid: 324 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.529434,3.6471272 parent: 1 - proto: PowerCellRecharger entities: +<<<<<<< HEAD - uid: 420 +======= + - uid: 277 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,1.5 parent: 1 - proto: Poweredlight entities: +<<<<<<< HEAD - uid: 421 +======= + - uid: 446 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,1.5 parent: 1 +<<<<<<< HEAD - uid: 422 +======= + - uid: 447 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,6.5 parent: 1 +<<<<<<< HEAD - uid: 423 +======= + - uid: 448 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,12.5 parent: 1 +<<<<<<< HEAD - uid: 424 +======= + - uid: 449 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,12.5 parent: 1 +<<<<<<< HEAD - uid: 425 +======= + - uid: 450 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,-2.5 parent: 1 +<<<<<<< HEAD - uid: 426 +======= + - uid: 451 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,6.5 parent: 1 +<<<<<<< HEAD - uid: 427 +======= + - uid: 452 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -3355,47 +5179,79 @@ entities: parent: 1 - proto: PoweredlightLED entities: +<<<<<<< HEAD - uid: 428 +======= + - uid: 89 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,-7.5 parent: 1 +<<<<<<< HEAD - uid: 429 +======= + - uid: 439 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,-7.5 parent: 1 +<<<<<<< HEAD - uid: 430 +======= + - uid: 440 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 431 +======= + - uid: 441 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 432 +======= + - uid: 442 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,14.5 parent: 1 +<<<<<<< HEAD - uid: 433 +======= + - uid: 443 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,14.5 parent: 1 +<<<<<<< HEAD - uid: 434 +======= + - uid: 444 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,12.5 parent: 1 +<<<<<<< HEAD - uid: 435 +======= + - uid: 445 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -3403,186 +5259,326 @@ entities: parent: 1 - proto: RandomVending entities: +<<<<<<< HEAD - uid: 436 +======= + - uid: 81 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,-2.5 parent: 1 - proto: RandomVendingDrinks entities: +<<<<<<< HEAD - uid: 437 +======= + - uid: 194 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,-2.5 parent: 1 - proto: RandomVendingSnacks entities: +<<<<<<< HEAD - uid: 438 +======= + - uid: 308 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,-3.5 parent: 1 - proto: ReinforcedWindow entities: +<<<<<<< HEAD - uid: 439 +======= + - uid: 76 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 10.5,0.5 parent: 1 +<<<<<<< HEAD - uid: 440 +======= + - uid: 140 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 10.5,3.5 parent: 1 +<<<<<<< HEAD - uid: 441 +======= + - uid: 141 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 10.5,5.5 parent: 1 +<<<<<<< HEAD - uid: 442 +======= + - uid: 142 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 10.5,4.5 parent: 1 +<<<<<<< HEAD - uid: 443 +======= + - uid: 143 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,-7.5 parent: 1 +<<<<<<< HEAD - uid: 444 +======= + - uid: 146 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 10.5,8.5 parent: 1 +<<<<<<< HEAD - uid: 445 +======= + - uid: 171 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,9.5 parent: 1 +<<<<<<< HEAD - uid: 446 +======= + - uid: 172 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,7.5 parent: 1 +<<<<<<< HEAD - uid: 447 +======= + - uid: 173 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,8.5 parent: 1 +<<<<<<< HEAD - uid: 448 +======= + - uid: 174 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,5.5 parent: 1 +<<<<<<< HEAD - uid: 449 +======= + - uid: 175 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,3.5 parent: 1 +<<<<<<< HEAD - uid: 450 +======= + - uid: 176 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,4.5 parent: 1 +<<<<<<< HEAD - uid: 451 +======= + - uid: 177 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,1.5 parent: 1 +<<<<<<< HEAD - uid: 452 +======= + - uid: 178 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,0.5 parent: 1 +<<<<<<< HEAD - uid: 453 +======= + - uid: 179 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,-0.5 parent: 1 +<<<<<<< HEAD - uid: 454 +======= + - uid: 235 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,15.5 parent: 1 +<<<<<<< HEAD - uid: 455 +======= + - uid: 238 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,16.5 parent: 1 +<<<<<<< HEAD - uid: 456 +======= + - uid: 245 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,16.5 parent: 1 +<<<<<<< HEAD - uid: 457 +======= + - uid: 246 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,17.5 parent: 1 +<<<<<<< HEAD - uid: 458 +======= + - uid: 247 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,17.5 parent: 1 +<<<<<<< HEAD - uid: 459 +======= + - uid: 248 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,17.5 parent: 1 +<<<<<<< HEAD - uid: 460 +======= + - uid: 249 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,17.5 parent: 1 +<<<<<<< HEAD - uid: 461 +======= + - uid: 250 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,17.5 parent: 1 +<<<<<<< HEAD - uid: 462 +======= + - uid: 251 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,16.5 parent: 1 +<<<<<<< HEAD - uid: 463 +======= + - uid: 252 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,16.5 parent: 1 +<<<<<<< HEAD - uid: 464 +======= + - uid: 253 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,15.5 parent: 1 +<<<<<<< HEAD - uid: 465 +======= + - uid: 278 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,11.5 parent: 1 +<<<<<<< HEAD - uid: 466 +======= + - uid: 281 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,9.5 parent: 1 +<<<<<<< HEAD - uid: 467 +======= + - uid: 282 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,9.5 parent: 1 +<<<<<<< HEAD - uid: 468 +======= + - uid: 284 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,9.5 parent: 1 - proto: Screen entities: +<<<<<<< HEAD - uid: 469 +======= + - uid: 180 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,6.5 parent: 1 +<<<<<<< HEAD - uid: 470 +======= + - uid: 181 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad @@ -3590,26 +5586,42 @@ entities: parent: 1 - proto: SMESBasic entities: +<<<<<<< HEAD - uid: 471 +======= + - uid: 77 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 472 +======= + - uid: 78 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,-4.5 parent: 1 - proto: StasisBed entities: +<<<<<<< HEAD - uid: 473 +======= + - uid: 287 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,0.5 parent: 1 - proto: StorageCanister entities: +<<<<<<< HEAD - uid: 474 +======= + - uid: 574 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform anchored: True @@ -3619,37 +5631,61 @@ entities: bodyType: Static - proto: SubstationBasic entities: +<<<<<<< HEAD - uid: 475 +======= + - uid: 79 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,-4.5 parent: 1 - proto: TableReinforced entities: +<<<<<<< HEAD - uid: 476 +======= + - uid: 191 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,2.5 parent: 1 +<<<<<<< HEAD - uid: 477 +======= + - uid: 192 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,6.5 parent: 1 +<<<<<<< HEAD - uid: 478 +======= + - uid: 280 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,12.5 parent: 1 +<<<<<<< HEAD - uid: 479 +======= + - uid: 299 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,6.5 parent: 1 +<<<<<<< HEAD - uid: 480 +======= + - uid: 300 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad @@ -3657,93 +5693,157 @@ entities: parent: 1 - proto: TableReinforcedGlass entities: +<<<<<<< HEAD - uid: 481 +======= + - uid: 275 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-0.5 parent: 1 +<<<<<<< HEAD - uid: 482 +======= + - uid: 317 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,1.5 parent: 1 +<<<<<<< HEAD - uid: 483 +======= + - uid: 323 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,3.5 parent: 1 - proto: Thruster entities: +<<<<<<< HEAD - uid: 484 +======= + - uid: 84 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,-7.5 parent: 1 +<<<<<<< HEAD - uid: 485 +======= + - uid: 85 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,-7.5 parent: 1 +<<<<<<< HEAD - uid: 486 +======= + - uid: 86 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad pos: 8.5,-7.5 parent: 1 +<<<<<<< HEAD - uid: 487 +======= + - uid: 87 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-7.5 parent: 1 +<<<<<<< HEAD - uid: 488 +======= + - uid: 88 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-7.5 parent: 1 +<<<<<<< HEAD - uid: 489 +======= + - uid: 91 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 490 +======= + - uid: 92 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad pos: 10.5,-6.5 parent: 1 +<<<<<<< HEAD - uid: 491 +======= + - uid: 93 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad pos: 10.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 492 +======= + - uid: 221 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,14.5 parent: 1 +<<<<<<< HEAD - uid: 493 +======= + - uid: 222 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,14.5 parent: 1 +<<<<<<< HEAD - uid: 494 +======= + - uid: 223 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,11.5 parent: 1 +<<<<<<< HEAD - uid: 495 +======= + - uid: 225 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,12.5 parent: 1 +<<<<<<< HEAD - uid: 496 +======= + - uid: 454 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad @@ -3751,398 +5851,702 @@ entities: parent: 1 - proto: VendingMachineBooze entities: +<<<<<<< HEAD - uid: 497 +======= + - uid: 273 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,12.5 parent: 1 - proto: VendingMachineCigs entities: +<<<<<<< HEAD - uid: 498 +======= + - uid: 274 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,12.5 parent: 1 - proto: VendingMachineMedical entities: +<<<<<<< HEAD - uid: 499 +======= + - uid: 321 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,3.5 parent: 1 - proto: WallReinforced entities: +<<<<<<< HEAD - uid: 500 +======= + - uid: 2 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,-1.5 parent: 1 +<<<<<<< HEAD - uid: 501 +======= + - uid: 26 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,-6.5 parent: 1 +<<<<<<< HEAD - uid: 502 +======= + - uid: 94 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,-4.5 parent: 1 +<<<<<<< HEAD - uid: 503 +======= + - uid: 95 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 504 +======= + - uid: 96 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,-6.5 parent: 1 +<<<<<<< HEAD - uid: 505 +======= + - uid: 97 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 10.5,-4.5 parent: 1 +<<<<<<< HEAD - uid: 506 +======= + - uid: 98 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,-4.5 parent: 1 +<<<<<<< HEAD - uid: 507 +======= + - uid: 99 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,-4.5 parent: 1 +<<<<<<< HEAD - uid: 508 +======= + - uid: 100 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 509 +======= + - uid: 101 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,-6.5 parent: 1 +<<<<<<< HEAD - uid: 510 +======= + - uid: 104 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,-6.5 parent: 1 +<<<<<<< HEAD - uid: 511 +======= + - uid: 105 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,-6.5 parent: 1 +<<<<<<< HEAD - uid: 512 +======= + - uid: 106 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,-7.5 parent: 1 +<<<<<<< HEAD - uid: 513 +======= + - uid: 107 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,-7.5 parent: 1 +<<<<<<< HEAD - uid: 514 +======= + - uid: 108 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,-6.5 parent: 1 +<<<<<<< HEAD - uid: 515 +======= + - uid: 109 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,-6.5 parent: 1 +<<<<<<< HEAD - uid: 516 +======= + - uid: 110 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,-3.5 parent: 1 +<<<<<<< HEAD - uid: 517 +======= + - uid: 111 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,-2.5 parent: 1 +<<<<<<< HEAD - uid: 518 +======= + - uid: 112 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,-1.5 parent: 1 +<<<<<<< HEAD - uid: 519 +======= + - uid: 113 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,-1.5 parent: 1 +<<<<<<< HEAD - uid: 520 +======= + - uid: 114 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 10.5,-3.5 parent: 1 +<<<<<<< HEAD - uid: 521 +======= + - uid: 115 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 10.5,-2.5 parent: 1 +<<<<<<< HEAD - uid: 522 +======= + - uid: 116 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,-1.5 parent: 1 +<<<<<<< HEAD - uid: 523 +======= + - uid: 117 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 10.5,-1.5 parent: 1 +<<<<<<< HEAD - uid: 524 +======= + - uid: 119 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,-1.5 parent: 1 +<<<<<<< HEAD - uid: 525 +======= + - uid: 122 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,-1.5 parent: 1 +<<<<<<< HEAD - uid: 526 +======= + - uid: 139 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 10.5,10.5 parent: 1 +<<<<<<< HEAD - uid: 527 +======= + - uid: 144 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 10.5,2.5 parent: 1 +<<<<<<< HEAD - uid: 528 +======= + - uid: 145 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 10.5,6.5 parent: 1 +<<<<<<< HEAD - uid: 529 +======= + - uid: 147 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,10.5 parent: 1 +<<<<<<< HEAD - uid: 530 +======= + - uid: 148 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,11.5 parent: 1 +<<<<<<< HEAD - uid: 531 +======= + - uid: 149 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,12.5 parent: 1 +<<<<<<< HEAD - uid: 532 +======= + - uid: 150 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 9.5,13.5 parent: 1 +<<<<<<< HEAD - uid: 533 +======= + - uid: 151 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,13.5 parent: 1 +<<<<<<< HEAD - uid: 534 +======= + - uid: 152 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,14.5 parent: 1 +<<<<<<< HEAD - uid: 535 +======= + - uid: 153 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,14.5 parent: 1 +<<<<<<< HEAD - uid: 536 +======= + - uid: 154 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,13.5 parent: 1 +<<<<<<< HEAD - uid: 537 +======= + - uid: 155 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,13.5 parent: 1 +<<<<<<< HEAD - uid: 538 +======= + - uid: 156 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,11.5 parent: 1 +<<<<<<< HEAD - uid: 539 +======= + - uid: 157 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,12.5 parent: 1 +<<<<<<< HEAD - uid: 540 +======= + - uid: 158 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 1.5,10.5 parent: 1 +<<<<<<< HEAD - uid: 541 +======= + - uid: 159 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,10.5 parent: 1 +<<<<<<< HEAD - uid: 542 +======= + - uid: 169 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,2.5 parent: 1 +<<<<<<< HEAD - uid: 543 +======= + - uid: 170 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 0.5,6.5 parent: 1 +<<<<<<< HEAD - uid: 544 +======= + - uid: 193 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,5.5 parent: 1 +<<<<<<< HEAD - uid: 545 +======= + - uid: 196 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,5.5 parent: 1 +<<<<<<< HEAD - uid: 546 +======= + - uid: 199 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,5.5 parent: 1 +<<<<<<< HEAD - uid: 547 +======= + - uid: 200 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,8.5 parent: 1 +<<<<<<< HEAD - uid: 548 +======= + - uid: 203 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,8.5 parent: 1 +<<<<<<< HEAD - uid: 549 +======= + - uid: 204 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,9.5 parent: 1 +<<<<<<< HEAD - uid: 550 +======= + - uid: 205 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,5.5 parent: 1 +<<<<<<< HEAD - uid: 551 +======= + - uid: 206 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,9.5 parent: 1 +<<<<<<< HEAD - uid: 552 +======= + - uid: 207 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,5.5 parent: 1 +<<<<<<< HEAD - uid: 553 +======= + - uid: 211 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,6.5 parent: 1 +<<<<<<< HEAD - uid: 554 +======= + - uid: 215 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,6.5 parent: 1 +<<<<<<< HEAD - uid: 555 +======= + - uid: 269 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,11.5 parent: 1 +<<<<<<< HEAD - uid: 556 +======= + - uid: 270 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,11.5 parent: 1 +<<<<<<< HEAD - uid: 557 +======= + - uid: 272 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,11.5 parent: 1 +<<<<<<< HEAD - uid: 558 +======= + - uid: 279 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,11.5 parent: 1 +<<<<<<< HEAD - uid: 559 +======= + - uid: 332 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,-1.5 parent: 1 +<<<<<<< HEAD - uid: 560 +======= + - uid: 576 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,-6.5 parent: 1 - proto: WallReinforcedRust entities: +<<<<<<< HEAD - uid: 561 +======= + - uid: 118 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,-1.5 parent: 1 - proto: WallSolid entities: +<<<<<<< HEAD - uid: 562 +======= + - uid: 195 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,1.5 parent: 1 +<<<<<<< HEAD - uid: 563 +======= + - uid: 285 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,0.5 parent: 1 +<<<<<<< HEAD - uid: 564 +======= + - uid: 304 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,3.5 parent: 1 - proto: WallSolidRust entities: +<<<<<<< HEAD - uid: 565 +======= + - uid: 301 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,3.5 parent: 1 +<<<<<<< HEAD - uid: 566 +======= + - uid: 302 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,2.5 parent: 1 +<<<<<<< HEAD - uid: 567 +======= + - uid: 311 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,2.5 parent: 1 +<<<<<<< HEAD - uid: 568 +======= + - uid: 331 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,-0.5 parent: 1 - proto: WindoorSecureEngineeringLocked entities: +<<<<<<< HEAD - uid: 569 +======= + - uid: 123 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,-3.5 parent: 1 +<<<<<<< HEAD - uid: 570 +======= + - uid: 124 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 7.5,-3.5 parent: 1 +<<<<<<< HEAD - uid: 571 +======= + - uid: 585 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 5.5,-5.5 parent: 1 - proto: WindoorSecureMedicalLocked entities: +<<<<<<< HEAD - uid: 572 +======= + - uid: 330 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad @@ -4150,74 +6554,126 @@ entities: parent: 1 - proto: Window entities: +<<<<<<< HEAD - uid: 573 +======= + - uid: 65 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,1.5 parent: 1 +<<<<<<< HEAD - uid: 574 +======= + - uid: 83 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,-0.5 parent: 1 +<<<<<<< HEAD - uid: 575 +======= + - uid: 288 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 3.5,0.5 parent: 1 - proto: WindowReinforcedDirectional entities: +<<<<<<< HEAD - uid: 576 +======= + - uid: 121 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,-4.5 parent: 1 +<<<<<<< HEAD - uid: 577 +======= + - uid: 125 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 2.5,-3.5 parent: 1 +<<<<<<< HEAD - uid: 578 +======= + - uid: 126 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 4.5,-3.5 parent: 1 +<<<<<<< HEAD - uid: 579 +======= + - uid: 127 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 6.5,-3.5 parent: 1 +<<<<<<< HEAD - uid: 580 +======= + - uid: 128 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform pos: 8.5,-3.5 parent: 1 +<<<<<<< HEAD - uid: 581 +======= + - uid: 328 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,3.5 parent: 1 +<<<<<<< HEAD - uid: 582 +======= + - uid: 329 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,3.5 parent: 1 +<<<<<<< HEAD - uid: 583 +======= + - uid: 334 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,-5.5 parent: 1 +<<<<<<< HEAD - uid: 584 +======= + - uid: 335 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-4.5 parent: 1 +<<<<<<< HEAD - uid: 585 +======= + - uid: 336 +>>>>>>> 2bc6a805f6656f06adcfa0fe18580b4e9821988c components: - type: Transform rot: -1.5707963267948966 rad