From: Scribbles0 <91828755+Scribbles0@users.noreply.github.com> Date: Mon, 7 Oct 2024 01:24:44 +0000 (-0700) Subject: oasis update (#32679) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=6b10e00da495379d61b35e3b809d2564cc3228c6;p=space-station-14.git oasis update (#32679) sec apcs and ai core wiring --- diff --git a/Resources/Maps/oasis.yml b/Resources/Maps/oasis.yml index 8cde5f558c..15a719bb53 100644 --- a/Resources/Maps/oasis.yml +++ b/Resources/Maps/oasis.yml @@ -14470,7 +14470,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -75908.84 + secondsUntilStateChange: -76151.9 state: Opening - uid: 6934 components: @@ -14482,7 +14482,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -75911.48 + secondsUntilStateChange: -76154.53 state: Opening - uid: 6935 components: @@ -14494,7 +14494,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -75910.33 + secondsUntilStateChange: -76153.38 state: Opening - uid: 6936 components: @@ -14505,7 +14505,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -75909.55 + secondsUntilStateChange: -76152.6 state: Opening - proto: AirlockTheatreLocked entities: @@ -15707,12 +15707,6 @@ entities: rot: 3.141592653589793 rad pos: -20.5,-5.5 parent: 2 - - uid: 2421 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 39.5,-18.5 - parent: 2 - uid: 2763 components: - type: Transform @@ -15885,6 +15879,30 @@ entities: rot: 3.141592653589793 rad pos: 25.5,35.5 parent: 2 + - uid: 29578 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 34.5,-13.5 + parent: 2 + - uid: 29579 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 45.5,-8.5 + parent: 2 + - uid: 29580 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 31.5,-23.5 + parent: 2 + - uid: 29581 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 55.5,-17.5 + parent: 2 - proto: APCElectronics entities: - uid: 5818 @@ -42197,27 +42215,27 @@ entities: - uid: 4624 components: - type: Transform - pos: 38.5,-17.5 + pos: 54.5,-17.5 parent: 2 - uid: 4625 components: - type: Transform - pos: 39.5,-17.5 + pos: 34.5,-13.5 parent: 2 - uid: 4626 components: - type: Transform - pos: 40.5,-17.5 + pos: 39.5,-11.5 parent: 2 - uid: 4627 components: - type: Transform - pos: 41.5,-17.5 + pos: 55.5,-17.5 parent: 2 - uid: 4628 components: - type: Transform - pos: 41.5,-18.5 + pos: 53.5,-14.5 parent: 2 - uid: 4629 components: @@ -42292,7 +42310,7 @@ entities: - uid: 4643 components: - type: Transform - pos: 38.5,-16.5 + pos: 47.5,-14.5 parent: 2 - uid: 4644 components: @@ -42404,11 +42422,6 @@ entities: - type: Transform pos: 31.5,-15.5 parent: 2 - - uid: 4666 - components: - - type: Transform - pos: 41.5,-17.5 - parent: 2 - uid: 4667 components: - type: Transform @@ -42652,12 +42665,7 @@ entities: - uid: 4823 components: - type: Transform - pos: 50.5,-16.5 - parent: 2 - - uid: 4824 - components: - - type: Transform - pos: 50.5,-15.5 + pos: 60.5,18.5 parent: 2 - uid: 4825 components: @@ -43042,7 +43050,7 @@ entities: - uid: 5414 components: - type: Transform - pos: 39.5,-18.5 + pos: 46.5,-8.5 parent: 2 - uid: 5463 components: @@ -50027,7 +50035,7 @@ entities: - uid: 13051 components: - type: Transform - pos: 56.5,16.5 + pos: 45.5,-8.5 parent: 2 - uid: 13052 components: @@ -56209,6 +56217,46 @@ entities: - type: Transform pos: -59.5,-8.5 parent: 2 + - uid: 29575 + components: + - type: Transform + pos: 60.5,19.5 + parent: 2 + - uid: 29576 + components: + - type: Transform + pos: 60.5,20.5 + parent: 2 + - uid: 29577 + components: + - type: Transform + pos: 60.5,21.5 + parent: 2 + - uid: 29582 + components: + - type: Transform + pos: 33.5,-23.5 + parent: 2 + - uid: 29583 + components: + - type: Transform + pos: 32.5,-23.5 + parent: 2 + - uid: 29584 + components: + - type: Transform + pos: 31.5,-23.5 + parent: 2 + - uid: 29585 + components: + - type: Transform + pos: 37.5,-20.5 + parent: 2 + - uid: 29586 + components: + - type: Transform + pos: 37.5,-19.5 + parent: 2 - proto: CableApcStack1 entities: - uid: 23589 @@ -63885,7 +63933,7 @@ entities: - uid: 418 components: - type: Transform - pos: 39.5,-18.5 + pos: 46.5,-8.5 parent: 2 - uid: 867 components: @@ -63927,6 +63975,11 @@ entities: - type: Transform pos: -25.5,0.5 parent: 2 + - uid: 2421 + components: + - type: Transform + pos: 53.5,-17.5 + parent: 2 - uid: 3299 components: - type: Transform @@ -64200,12 +64253,17 @@ entities: - uid: 4564 components: - type: Transform - pos: 40.5,-17.5 + pos: 54.5,-17.5 parent: 2 - uid: 4565 components: - type: Transform - pos: 39.5,-17.5 + pos: 55.5,-17.5 + parent: 2 + - uid: 4666 + components: + - type: Transform + pos: 47.5,-8.5 parent: 2 - uid: 4686 components: @@ -64657,6 +64715,11 @@ entities: - type: Transform pos: 43.5,-37.5 parent: 2 + - uid: 4824 + components: + - type: Transform + pos: 48.5,-8.5 + parent: 2 - uid: 4855 components: - type: Transform @@ -69467,6 +69530,146 @@ entities: - type: Transform pos: 25.5,35.5 parent: 2 + - uid: 29587 + components: + - type: Transform + pos: 45.5,-8.5 + parent: 2 + - uid: 29588 + components: + - type: Transform + pos: 40.5,-21.5 + parent: 2 + - uid: 29589 + components: + - type: Transform + pos: 39.5,-21.5 + parent: 2 + - uid: 29590 + components: + - type: Transform + pos: 38.5,-21.5 + parent: 2 + - uid: 29591 + components: + - type: Transform + pos: 36.5,-21.5 + parent: 2 + - uid: 29592 + components: + - type: Transform + pos: 35.5,-21.5 + parent: 2 + - uid: 29593 + components: + - type: Transform + pos: 34.5,-21.5 + parent: 2 + - uid: 29594 + components: + - type: Transform + pos: 37.5,-21.5 + parent: 2 + - uid: 29595 + components: + - type: Transform + pos: 34.5,-22.5 + parent: 2 + - uid: 29596 + components: + - type: Transform + pos: 34.5,-23.5 + parent: 2 + - uid: 29597 + components: + - type: Transform + pos: 33.5,-23.5 + parent: 2 + - uid: 29598 + components: + - type: Transform + pos: 32.5,-23.5 + parent: 2 + - uid: 29599 + components: + - type: Transform + pos: 31.5,-23.5 + parent: 2 + - uid: 29600 + components: + - type: Transform + pos: 40.5,-17.5 + parent: 2 + - uid: 29601 + components: + - type: Transform + pos: 39.5,-17.5 + parent: 2 + - uid: 29602 + components: + - type: Transform + pos: 38.5,-17.5 + parent: 2 + - uid: 29603 + components: + - type: Transform + pos: 38.5,-16.5 + parent: 2 + - uid: 29604 + components: + - type: Transform + pos: 38.5,-14.5 + parent: 2 + - uid: 29605 + components: + - type: Transform + pos: 38.5,-15.5 + parent: 2 + - uid: 29606 + components: + - type: Transform + pos: 38.5,-13.5 + parent: 2 + - uid: 29607 + components: + - type: Transform + pos: 38.5,-12.5 + parent: 2 + - uid: 29608 + components: + - type: Transform + pos: 38.5,-11.5 + parent: 2 + - uid: 29609 + components: + - type: Transform + pos: 37.5,-11.5 + parent: 2 + - uid: 29610 + components: + - type: Transform + pos: 36.5,-11.5 + parent: 2 + - uid: 29611 + components: + - type: Transform + pos: 35.5,-11.5 + parent: 2 + - uid: 29612 + components: + - type: Transform + pos: 34.5,-11.5 + parent: 2 + - uid: 29613 + components: + - type: Transform + pos: 34.5,-12.5 + parent: 2 + - uid: 29614 + components: + - type: Transform + pos: 34.5,-13.5 + parent: 2 - proto: CableTerminal entities: - uid: 6405 @@ -94055,7 +94258,7 @@ entities: pos: -13.5,-1.5 parent: 2 - type: Door - secondsUntilStateChange: -67232.83 + secondsUntilStateChange: -67475.88 - type: DeviceNetwork deviceLists: - 18275 @@ -138604,7 +138807,7 @@ entities: pos: 36.5,-35.5 parent: 2 - type: Door - secondsUntilStateChange: -104064.67 + secondsUntilStateChange: -104307.73 state: Opening - uid: 5211 components: @@ -189959,7 +190162,7 @@ entities: pos: 24.5,2.5 parent: 21002 - type: Door - secondsUntilStateChange: -449269.3 + secondsUntilStateChange: -449512.38 state: Opening - uid: 28863 components: