From 4e8375e5f99e7ac4616f37bc3b497f9ef5924ee3 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Thu, 13 Jun 2024 16:03:01 -0600 Subject: [PATCH] bagel update (#28946) --- Resources/Maps/bagel.yml | 220 ++++++++++++++++++++++++--------------- 1 file changed, 137 insertions(+), 83 deletions(-) diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index 5700fc8296..3dfb5c154a 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -504,8 +504,8 @@ entities: 3339: -40,44 3341: -36,30 3762: -39,-8 - 3814: 8,43 - 3815: 8,51 + 3808: 8,43 + 3809: 8,51 - node: color: '#FFFFFFFF' id: Arrows @@ -527,8 +527,8 @@ entities: 3351: -26,38 3759: 47,-23 3763: -40,-4 - 3810: -8,51 - 3811: -8,43 + 3806: -8,51 + 3807: -8,43 - node: color: '#FFFFFFFF' id: ArrowsGreyscale @@ -557,12 +557,12 @@ entities: color: '#FFFFFFFF' id: Bot decals: - 3816: -7,46 - 3817: -7,47 - 3818: -7,48 - 3819: 7,46 - 3820: 7,47 - 3821: 7,48 + 3810: -7,46 + 3811: -7,47 + 3812: -7,48 + 3813: 7,46 + 3814: 7,47 + 3815: 7,48 - node: color: '#FFFFFFFF' id: Bot @@ -675,7 +675,7 @@ entities: 3493: 39,-13 3539: 45,-9 3672: -17,-54 - 3841: 2,27 + 3835: 2,27 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' @@ -714,8 +714,8 @@ entities: 3254: 6,-36 3349: -19,46 3745: 50,-11 - 3834: -25,-1 - 3835: -25,0 + 3828: -25,-1 + 3829: -25,0 - node: color: '#FFFFFFFF' id: BotLeftGreyscale @@ -753,15 +753,15 @@ entities: color: '#FFFFFFFF' id: BotRightGreyscale decals: - 3837: -29,-1 - 3838: -29,0 - 3839: -29,1 - 3852: 7,34 - 3853: 7,35 - 3854: 7,36 - 3855: 8,36 - 3858: 8,34 - 3859: 8,35 + 3831: -29,-1 + 3832: -29,0 + 3833: -29,1 + 3846: 7,34 + 3847: 7,35 + 3848: 7,36 + 3849: 8,36 + 3850: 8,34 + 3851: 8,35 - node: color: '#79150096' id: Box @@ -884,7 +884,7 @@ entities: 2380: -14,11 3038: 21,1 3049: 23,1 - 3851: 6,37 + 3845: 6,37 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerSw @@ -901,9 +901,9 @@ entities: 2989: -115,13 3041: 23,0 3325: 37,18 - 3848: 6,34 - 3849: 6,35 - 3850: 6,36 + 3842: 6,34 + 3843: 6,35 + 3844: 6,36 - node: color: '#FFFFFFFF' id: BrickTileDarkLineN @@ -5520,22 +5520,22 @@ entities: color: '#FFFFFFFF' id: WarnCornerNE decals: - 3832: -33,21 + 3826: -33,21 - node: color: '#FFFFFFFF' id: WarnCornerNW decals: - 3829: -31,21 + 3823: -31,21 - node: color: '#FFFFFFFF' id: WarnCornerSE decals: - 3833: -33,19 + 3827: -33,19 - node: color: '#FFFFFFFF' id: WarnCornerSW decals: - 3828: -31,19 + 3822: -31,19 - node: color: '#FFFFFFFF' id: WarnCornerSmallNE @@ -5545,7 +5545,7 @@ entities: 1366: -2,31 3332: -2,24 3392: -19,40 - 3827: -8,29 + 3821: -8,29 - node: color: '#FFFFFFFF' id: WarnCornerSmallNW @@ -5555,7 +5555,7 @@ entities: 2137: 2,24 3380: -27,38 3391: -15,40 - 3826: -5,29 + 3820: -5,29 - node: color: '#FFFFFFFF' id: WarnCornerSmallSE @@ -5563,7 +5563,7 @@ entities: 1053: -2,-78 1364: -2,36 3390: -19,42 - 3840: -29,-1 + 3834: -29,-1 - node: color: '#FFFFFFFF' id: WarnCornerSmallSW @@ -5574,7 +5574,7 @@ entities: 2568: 40,-35 3379: -27,40 3389: -15,42 - 3836: -25,-1 + 3830: -25,-1 - node: color: '#52B4E996' id: WarnFullGreyscale @@ -5649,7 +5649,7 @@ entities: 3201: 56,11 3388: -19,41 3440: 1,-13 - 3831: -33,20 + 3825: -33,20 - node: color: '#52B4E996' id: WarnLineGreyscaleE @@ -5944,8 +5944,8 @@ entities: 3381: -18,42 3382: -17,42 3383: -16,42 - 3822: -7,31 - 3823: -6,31 + 3816: -7,31 + 3817: -6,31 - node: color: '#DE3A3A96' id: WarnLineS @@ -5997,7 +5997,7 @@ entities: 3378: -27,39 3384: -15,41 3441: -1,-13 - 3830: -31,20 + 3824: -31,20 - node: color: '#DE3A3A96' id: WarnLineW @@ -6065,14 +6065,14 @@ entities: 3386: -17,40 3387: -18,40 3393: -43,-2 - 3824: -7,29 - 3825: -6,29 - 3842: 4,37 - 3843: 5,37 - 3844: 6,37 - 3845: -4,37 - 3846: -5,37 - 3847: -6,37 + 3818: -7,29 + 3819: -6,29 + 3836: 4,37 + 3837: 5,37 + 3838: 6,37 + 3839: -4,37 + 3840: -5,37 + 3841: -6,37 - node: angle: -3.141592653589793 rad color: '#FFFFFFFF' @@ -8110,7 +8110,7 @@ entities: 1: 39312 -12,8: 4: 12 - 6: 3072 + 5: 3072 -11,5: 0: 63351 -11,6: @@ -8119,7 +8119,7 @@ entities: -11,8: 4: 1 1: 17476 - 6: 256 + 5: 256 -11,7: 1: 17484 -10,5: @@ -8222,10 +8222,10 @@ entities: 0: 255 1: 57344 -8,11: - 5: 816 + 6: 816 1: 34952 -9,11: - 5: 2176 + 6: 2176 1: 8738 -8,12: 1: 34959 @@ -8245,7 +8245,7 @@ entities: -6,11: 0: 4095 -6,12: - 5: 61166 + 6: 61166 -5,9: 0: 65535 -5,10: @@ -8253,7 +8253,7 @@ entities: -5,11: 0: 36863 -5,12: - 5: 30515 + 6: 30515 0: 12 -4,9: 0: 65535 @@ -8263,7 +8263,7 @@ entities: 0: 4095 -4,12: 0: 1 - 5: 65518 + 6: 65518 -4,13: 1: 61680 -5,13: @@ -8277,7 +8277,7 @@ entities: -5,15: 1: 17487 -3,12: - 5: 13107 + 6: 13107 1: 34944 -3,13: 1: 47792 @@ -8343,7 +8343,7 @@ entities: 1: 61713 -12,9: 0: 16 - 5: 3084 + 6: 3084 -13,9: 1: 39305 -13,10: @@ -8353,18 +8353,18 @@ entities: 0: 12544 -12,10: 3: 12 - 5: 3072 + 6: 3072 -12,11: - 5: 12 + 6: 12 -11,9: - 5: 257 + 6: 257 1: 17476 -11,10: 3: 1 - 5: 256 + 6: 256 1: 17476 -11,11: - 5: 1 + 6: 1 1: 17476 -11,12: 1: 17487 @@ -8418,7 +8418,7 @@ entities: 1: 15 -13,12: 1: 34952 - 6: 48 + 5: 48 4: 12288 -12,13: 1: 61455 @@ -8452,11 +8452,11 @@ entities: 1: 62671 -7,14: 1: 244 - 5: 57344 + 6: 57344 0: 1024 -7,15: 1: 61440 - 5: 238 + 6: 238 0: 1024 -7,16: 1: 65524 @@ -8515,7 +8515,7 @@ entities: -14,12: 0: 1 1: 8738 - 6: 128 + 5: 128 4: 32768 -17,12: 0: 52232 @@ -9040,7 +9040,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 + - 6666.982 - 0 - 0 - 0 @@ -9055,7 +9055,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 6666.982 + - 0 - 0 - 0 - 0 @@ -9075,6 +9075,16 @@ entities: - type: GasTileOverlay - type: GridPathfinding - type: NavMap + - type: Joint + joints: + docking43669: !type:WeldJoint + bodyB: 60 + bodyA: 7536 + id: docking43669 + localAnchorB: -47.5,-40 + localAnchorA: 0.5,0 + damping: 1559.7855 + stiffness: 14000.604 - uid: 943 components: - type: MetaData @@ -9356,6 +9366,16 @@ entities: - type: GasTileOverlay - type: RadiationGridResistance - type: GridPathfinding + - type: Joint + joints: + docking43669: !type:WeldJoint + bodyB: 60 + bodyA: 7536 + id: docking43669 + localAnchorB: -47.5,-40 + localAnchorA: 0.5,0 + damping: 1559.7855 + stiffness: 14000.604 - proto: AcousticGuitarInstrument entities: - uid: 2133 @@ -12011,6 +12031,13 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-0.5 parent: 7536 + - type: Docking + dockJointId: docking43669 + dockedWith: 7332 + - type: DeviceLinkSource + lastSignals: + DoorStatus: False + DockStatus: True - proto: AirlockExternalLocked entities: - uid: 1435 @@ -13331,10 +13358,16 @@ entities: - type: Transform pos: -47.5,-39.5 parent: 60 + - type: Docking + dockJointId: docking43669 + dockedWith: 8108 - type: DeviceLinkSource linkedPorts: 7316: - DoorStatus: DoorBolt + lastSignals: + DoorStatus: False + DockStatus: True - type: DeviceLinkSink links: - 7316 @@ -16567,7 +16600,7 @@ entities: - uid: 178 components: - type: Transform - pos: -26.404684,-13.628057 + pos: -26.426329,-14.112597 parent: 60 - proto: BoxLatexGloves entities: @@ -56281,18 +56314,6 @@ entities: - type: Transform pos: 45.485657,-24.447033 parent: 60 -- proto: chem_master - entities: - - uid: 2626 - components: - - type: Transform - pos: 41.5,-26.5 - parent: 60 - - uid: 2627 - components: - - type: Transform - pos: 41.5,-29.5 - parent: 60 - proto: ChemDispenser entities: - uid: 2520 @@ -56312,6 +56333,18 @@ entities: - type: Transform pos: 40.5,-28.5 parent: 60 +- proto: ChemMaster + entities: + - uid: 2626 + components: + - type: Transform + pos: 41.5,-26.5 + parent: 60 + - uid: 2627 + components: + - type: Transform + pos: 41.5,-29.5 + parent: 60 - proto: ChessBoard entities: - uid: 5198 @@ -67347,17 +67380,17 @@ entities: - uid: 14454 components: - type: Transform - pos: -26.766462,-13.446835 + pos: -27.223204,-13.440722 parent: 60 - uid: 14618 components: - type: Transform - pos: -26.953962,-13.46246 + pos: -27.098204,-13.175097 parent: 60 - uid: 14625 components: - type: Transform - pos: -26.860212,-13.30621 + pos: -27.035704,-13.425097 parent: 60 - uid: 20082 components: @@ -68112,6 +68145,8 @@ entities: - type: Transform pos: -40.5,5.5 parent: 60 + - type: FaxMachine + name: RD Office - uid: 11100 components: - type: Transform @@ -68168,6 +68203,13 @@ entities: parent: 60 - type: FaxMachine name: Library + - uid: 24176 + components: + - type: Transform + pos: -26.5,-13.5 + parent: 60 + - type: FaxMachine + name: Security Fax - proto: FaxMachineCaptain entities: - uid: 15836 @@ -75245,11 +75287,15 @@ entities: - uid: 898 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: -10.5,-22.5 parent: 60 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 899 components: - type: Transform @@ -75277,11 +75323,15 @@ entities: - uid: 902 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: -13.5,-22.5 parent: 60 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 903 components: - type: Transform @@ -82912,11 +82962,15 @@ entities: - uid: 8899 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: 22.5,-31.5 parent: 60 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 8918 components: - type: Transform @@ -125617,7 +125671,7 @@ entities: - type: Transform pos: -2.5112958,-11.444662 parent: 60 -- proto: soda_dispenser +- proto: SodaDispenser entities: - uid: 2257 components: -- 2.51.2