From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Mon, 2 Sep 2024 06:40:08 +0000 (-0600) Subject: fland update (#31742) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=d1f882eca739676d669689523807d7629282668f;p=space-station-14.git fland update (#31742) --- diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml index b30f883bd2..dcff4b5713 100644 --- a/Resources/Maps/fland.yml +++ b/Resources/Maps/fland.yml @@ -420,7 +420,7 @@ entities: version: 6 6,-2: ind: 6,-2 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAGAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAABwAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABZAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAABZAAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAZAAAAAAAXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADZAAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAACfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATQAAAAAATQAAAAABTQAAAAADTQAAAAAATQAAAAABfgAAAAAAZAAAAAAAXQAAAAABfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAATQAAAAADTQAAAAADTQAAAAADTQAAAAABTQAAAAACHwAAAAADXQAAAAAAXQAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAGAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAABwAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABZAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAADbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACXQAAAAACXQAAAAADXQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAABZAAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAZAAAAAAAXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADZAAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAACfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATQAAAAAATQAAAAABTQAAAAADTQAAAAAATQAAAAABfgAAAAAAZAAAAAAAXQAAAAABfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAATQAAAAADTQAAAAADTQAAAAADTQAAAAABTQAAAAACHwAAAAADXQAAAAAAXQAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAA version: 6 7,-2: ind: 7,-2 @@ -12328,7 +12328,7 @@ entities: -3,6: 0: 61439 -3,7: - 0: 61182 + 0: 61166 -3,8: 0: 65263 -2,4: @@ -14529,7 +14529,7 @@ entities: 24,-7: 0: 10103 24,-6: - 0: 63351 + 0: 65535 24,-5: 0: 60943 20,-3: @@ -14692,7 +14692,7 @@ entities: 3: 51 0: 34944 25,-6: - 0: 61440 + 0: 62259 25,-5: 0: 64399 25,-4: @@ -15085,11 +15085,11 @@ entities: 27,9: 0: 47887 28,10: - 0: 13195 + 0: 45963 27,10: 0: 64779 28,11: - 0: 3 + 0: 3979 27,11: 0: 30477 28,12: @@ -15097,25 +15097,25 @@ entities: 29,9: 0: 65398 29,10: - 0: 1 + 0: 15873 + 29,11: + 0: 52689 29,12: 0: 52701 - 29,11: - 0: 52416 30,9: 0: 65024 3: 226 + 30,10: + 0: 3854 30,11: 0: 65534 - 30,10: - 0: 14 30,12: 0: 64443 31,9: 3: 242 0: 61440 31,10: - 0: 15 + 0: 3855 31,11: 0: 65520 31,12: @@ -15124,9 +15124,9 @@ entities: 3: 242 0: 12288 32,10: - 0: 2255 + 0: 14799 32,11: - 0: 256 + 0: 17734 24,9: 0: 65295 23,9: @@ -15160,7 +15160,7 @@ entities: 27,12: 0: 30583 32,12: - 0: 273 + 0: 17749 33,9: 3: 35058 33,10: @@ -15175,13 +15175,13 @@ entities: 34,10: 3: 16 32,13: - 0: 1 + 0: 13893 31,13: 0: 255 32,14: - 0: 65480 + 0: 65481 31,14: - 0: 65280 + 0: 65295 32,15: 0: 14207 31,15: @@ -15195,20 +15195,22 @@ entities: 0: 16247 33,15: 0: 3 + 28,13: + 0: 15 28,15: 0: 3831 27,15: 0: 30696 + 29,13: + 0: 12765 29,15: 0: 4095 29,14: - 0: 59392 - 29,13: - 0: 204 + 0: 59406 30,13: 0: 3839 30,14: - 0: 65280 + 0: 65295 30,15: 0: 65535 30,16: @@ -15276,7 +15278,7 @@ entities: 19,15: 3: 240 20,16: - 3: 4082 + 3: 65522 21,13: 0: 61440 21,14: @@ -15302,16 +15304,23 @@ entities: 0: 65282 22,16: 0: 52428 - 3: 272 + 3: 4368 23,15: 0: 4593 23,16: 0: 7953 19,16: - 3: 4080 + 3: 65520 + 20,17: + 3: 15 + 19,17: + 3: 15 21,16: - 3: 4080 + 3: 65520 + 21,17: + 3: 15 22,17: + 3: 1 0: 36044 22,18: 0: 2252 @@ -15353,7 +15362,7 @@ entities: 15,15: 0: 15 16,16: - 3: 8177 + 3: 65521 17,12: 0: 65535 17,13: @@ -15376,7 +15385,7 @@ entities: 18,11: 0: 30707 18,16: - 3: 4083 + 3: 65523 17,9: 0: 65359 17,10: @@ -15493,7 +15502,7 @@ entities: 3: 15 0: 28784 16,17: - 3: 4369 + 3: 4383 16,18: 3: 4369 16,19: @@ -15501,7 +15510,11 @@ entities: 16,20: 3: 4369 17,16: - 3: 4080 + 3: 65520 + 17,17: + 3: 15 + 18,17: + 3: 15 8,17: 0: 24584 9,17: @@ -97160,13 +97173,6 @@ entities: rot: 3.141592653589793 rad pos: -5.5,-27.5 parent: 13329 -- proto: ComputerShuttleSalvage - entities: - - uid: 13474 - components: - - type: Transform - pos: 15.5,-29.5 - parent: 13329 - proto: ComputerSolarControl entities: - uid: 26230 @@ -154637,8 +154643,6 @@ entities: - type: Transform pos: 120.5,-24.5 parent: 13329 - - type: GravityGenerator - charge: 100 - type: PointLight radius: 175.75 - proto: Grille @@ -175410,6 +175414,12 @@ entities: rot: 1.5707963267948966 rad pos: 95.5,-54.5 parent: 13329 + - uid: 13474 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 98.5,-23.5 + parent: 13329 - uid: 14465 components: - type: Transform @@ -175465,6 +175475,17 @@ entities: rot: 1.5707963267948966 rad pos: 44.5,-41.5 parent: 13329 + - uid: 15772 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 98.5,-21.5 + parent: 13329 + - uid: 15777 + components: + - type: Transform + pos: 101.5,-20.5 + parent: 13329 - uid: 17625 components: - type: Transform @@ -176224,6 +176245,16 @@ entities: rot: -1.5707963267948966 rad pos: 44.5,55.5 parent: 13329 + - uid: 35763 + components: + - type: Transform + pos: 100.5,-20.5 + parent: 13329 + - uid: 35764 + components: + - type: Transform + pos: 99.5,-20.5 + parent: 13329 - proto: RailingCorner entities: - uid: 30703 @@ -176463,6 +176494,12 @@ entities: rot: -1.5707963267948966 rad pos: 60.5,-16.5 parent: 13329 + - uid: 35765 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 98.5,-20.5 + parent: 13329 - proto: RandomArcade entities: - uid: 13298 @@ -184238,11 +184275,11 @@ entities: parent: 13329 - proto: SignDirectionalGravity entities: - - uid: 26208 + - uid: 15769 components: - type: Transform rot: 1.5707963267948966 rad - pos: 99.5,-21.5 + pos: 102.5,-21.5 parent: 13329 - proto: SignDirectionalHop entities: @@ -189326,6 +189363,13 @@ entities: - type: Transform pos: 21.5,49.5 parent: 13329 +- proto: StationAnchor + entities: + - uid: 15776 + components: + - type: Transform + pos: 100.5,-22.5 + parent: 13329 - proto: StationMap entities: - uid: 27930 @@ -206758,11 +206802,6 @@ entities: - type: Transform pos: 100.5,-32.5 parent: 13329 - - uid: 15769 - components: - - type: Transform - pos: 99.5,-21.5 - parent: 13329 - uid: 15770 components: - type: Transform @@ -206773,21 +206812,6 @@ entities: - type: Transform pos: 99.5,-28.5 parent: 13329 - - uid: 15772 - components: - - type: Transform - pos: 99.5,-22.5 - parent: 13329 - - uid: 15776 - components: - - type: Transform - pos: 100.5,-21.5 - parent: 13329 - - uid: 15777 - components: - - type: Transform - pos: 101.5,-21.5 - parent: 13329 - uid: 15778 components: - type: Transform @@ -211851,7 +211875,7 @@ entities: - uid: 20564 components: - type: Transform - pos: 99.5,-23.5 + pos: 100.5,-24.5 parent: 13329 - uid: 20566 components: @@ -213484,6 +213508,11 @@ entities: - type: Transform pos: 87.5,-45.5 parent: 13329 + - uid: 26208 + components: + - type: Transform + pos: 101.5,-24.5 + parent: 13329 - uid: 26756 components: - type: Transform @@ -214134,6 +214163,21 @@ entities: - type: Transform pos: 48.5,48.5 parent: 13329 + - uid: 35760 + components: + - type: Transform + pos: 102.5,-24.5 + parent: 13329 + - uid: 35761 + components: + - type: Transform + pos: 102.5,-23.5 + parent: 13329 + - uid: 35762 + components: + - type: Transform + pos: 102.5,-22.5 + parent: 13329 - proto: WallSolid entities: - uid: 2