From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Tue, 10 Oct 2023 22:46:47 +0000 (-0600) Subject: Bagel Update (#20896) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=6f2f0b492fef81d5967573f3a59f967b82674c50;p=space-station-14.git Bagel Update (#20896) * bagel update * bagel update --- diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index f9f593407d..72ee490cc1 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -6413,7 +6413,8 @@ entities: -2,-2: 0: 65535 -2,-1: - 0: 61439 + 0: 61407 + 1: 32 2,-3: 0: 63280 2,-2: @@ -6567,7 +6568,8 @@ entities: -5,-1: 0: 65535 -5,0: - 0: 65535 + 0: 65279 + 1: 256 -5,1: 0: 65535 -5,2: @@ -6587,7 +6589,8 @@ entities: 1,-5: 0: 3311 2,-8: - 0: 65535 + 2: 1 + 0: 65534 2,-5: 0: 65535 3,-8: @@ -6638,19 +6641,19 @@ entities: 0: 65535 5,-8: 0: 32767 - 1: 32768 + 3: 32768 5,-7: 0: 65399 - 1: 136 + 3: 136 5,-6: 0: 65535 5,-5: 0: 65535 6,-8: 0: 36863 - 1: 28672 + 3: 28672 6,-7: - 1: 119 + 3: 119 0: 65416 6,-6: 0: 65535 @@ -6679,7 +6682,8 @@ entities: 6,-2: 0: 65535 7,-4: - 0: 65535 + 0: 65503 + 1: 32 7,-3: 0: 65535 7,-2: @@ -7251,7 +7255,8 @@ entities: 4,-12: 0: 65535 -12,1: - 0: 65535 + 0: 32767 + 1: 32768 -12,2: 0: 65535 -10,3: @@ -7534,10 +7539,10 @@ entities: 0: 34944 -7,-13: 0: 2184 - 2: 9984 + 4: 9984 -6,-13: 0: 36232 - 2: 512 + 4: 512 -5,-13: 0: 36744 -2,-20: @@ -7574,7 +7579,7 @@ entities: 0: 65535 -8,11: 0: 64719 - 2: 816 + 4: 816 -7,8: 0: 65535 -7,9: @@ -7594,7 +7599,8 @@ entities: 2,4: 0: 65535 3,4: - 0: 65535 + 0: 65519 + 1: 16 3,5: 0: 61439 0,-21: @@ -7607,15 +7613,15 @@ entities: 0: 65535 -12,10: 0: 62451 - 2: 3072 - 3: 12 + 4: 3072 + 5: 12 -11,10: - 2: 256 + 4: 256 0: 65278 - 3: 1 + 5: 1 -11,11: 0: 52478 - 2: 1 + 4: 1 -10,10: 0: 65535 -10,8: @@ -7632,7 +7638,7 @@ entities: 0: 65535 -9,11: 0: 63359 - 2: 2176 + 4: 2176 -8,12: 0: 48063 -7,12: @@ -7802,7 +7808,8 @@ entities: 9,3: 0: 65535 10,3: - 0: 65535 + 0: 32767 + 6: 32768 11,3: 0: 65535 13,2: @@ -7834,7 +7841,7 @@ entities: -1,11: 0: 65535 -5,12: - 2: 30515 + 4: 30515 0: 35020 -5,13: 0: 65535 @@ -7852,7 +7859,7 @@ entities: 0: 65535 -4,12: 0: 17 - 2: 65518 + 4: 65518 -4,13: 0: 65535 -4,14: @@ -7860,7 +7867,7 @@ entities: -4,15: 0: 61951 -3,12: - 2: 13107 + 4: 13107 0: 52428 -3,13: 0: 65535 @@ -7892,13 +7899,13 @@ entities: 0: 65535 -7,14: 0: 8191 - 2: 57344 + 4: 57344 -7,15: - 2: 238 + 4: 238 0: 65297 -6,12: 0: 4369 - 2: 61166 + 4: 61166 -6,13: 0: 65535 -6,14: @@ -8185,7 +8192,7 @@ entities: 0: 65535 -7,-12: 0: 44544 - 2: 34 + 4: 34 -6,-10: 0: 39144 13,-14: @@ -8211,7 +8218,7 @@ entities: 17,-8: 0: 29457 17,-7: - 3: 1 + 5: 1 0: 4990 17,-6: 0: 4593 @@ -8339,14 +8346,14 @@ entities: 0: 35771 -12,8: 0: 62451 - 4: 12 - 5: 3072 + 7: 12 + 8: 3072 -12,9: 0: 62451 - 2: 3084 + 4: 3084 -12,11: 0: 8947 - 2: 12 + 4: 12 -12,12: 0: 8751 -12,13: @@ -8540,11 +8547,11 @@ entities: -13,7: 0: 39327 -11,8: - 4: 1 + 7: 1 0: 65278 - 5: 256 + 8: 256 -11,9: - 2: 257 + 4: 257 0: 65278 1,12: 0: 63897 @@ -8566,8 +8573,8 @@ entities: 0: 65497 -13,12: 0: 53199 - 5: 48 - 4: 12288 + 8: 48 + 7: 12288 -13,13: 0: 61727 -18,4: @@ -9060,8 +9067,8 @@ entities: 0: 255 -14,12: 0: 32639 - 5: 128 - 4: 32768 + 8: 128 + 7: 32768 -14,13: 0: 31 -17,12: @@ -9077,9 +9084,9 @@ entities: -3,-20: 0: 28672 -8,-13: - 2: 3840 + 4: 3840 -9,-13: - 2: 3584 + 4: 3584 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -9096,6 +9103,36 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14996 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 21.596506 + - 81.243996 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 235 moles: @@ -9141,6 +9178,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 21.806608 + - 82.03439 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -13977,6 +14029,23 @@ entities: - pos: 5.5,23.5 parent: 60 type: Transform +- proto: AmePart + entities: + - uid: 16550 + components: + - pos: 8.452343,23.559658 + parent: 60 + type: Transform + - uid: 17676 + components: + - pos: 8.561718,23.497158 + parent: 60 + type: Transform + - uid: 18546 + components: + - pos: 8.671093,23.403408 + parent: 60 + type: Transform - proto: AnalysisComputerCircuitboard entities: - uid: 9455 @@ -57815,15 +57884,6 @@ entities: - pos: 31.52947,14.40356 parent: 60 type: Transform - - uid: 17299 - components: - - flags: InContainer - type: MetaData - - parent: 16058 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: ClothingBackpackSatchelLeather entities: - uid: 4702 @@ -57854,17 +57914,6 @@ entities: - pos: 19.497345,-45.396423 parent: 60 type: Transform -- proto: ClothingBeltMercWebbing - entities: - - uid: 18546 - components: - - flags: InContainer - type: MetaData - - parent: 16058 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: ClothingBeltMilitaryWebbing entities: - uid: 9121 @@ -57947,17 +57996,6 @@ entities: - pos: 14.470102,-43.56056 parent: 60 type: Transform -- proto: ClothingEyesGlassesMercenary - entities: - - uid: 17676 - components: - - flags: InContainer - type: MetaData - - parent: 16058 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: ClothingEyesGlassesSunglasses entities: - uid: 2252 @@ -58107,17 +58145,6 @@ entities: - pos: 35.520084,-27.379148 parent: 60 type: Transform -- proto: ClothingHandsGlovesMercFingerless - entities: - - uid: 17674 - components: - - flags: InContainer - type: MetaData - - parent: 16058 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: ClothingHandsGlovesNitrile entities: - uid: 4119 @@ -58153,17 +58180,6 @@ entities: - pos: -56.55667,-23.491457 parent: 60 type: Transform -- proto: ClothingHeadBandMerc - entities: - - uid: 17463 - components: - - flags: InContainer - type: MetaData - - parent: 16058 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: ClothingHeadBandRed entities: - uid: 1405 @@ -58216,17 +58232,6 @@ entities: - pos: -38.320274,19.65635 parent: 60 type: Transform -- proto: ClothingHeadHatBeretMerc - entities: - - uid: 19043 - components: - - flags: InContainer - type: MetaData - - parent: 16058 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: ClothingHeadHatBowlerHat entities: - uid: 8020 @@ -58514,17 +58519,6 @@ entities: - pos: 29.516983,-1.2031906 parent: 60 type: Transform -- proto: ClothingHeadHelmetMerc - entities: - - uid: 19162 - components: - - flags: InContainer - type: MetaData - - parent: 16058 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: ClothingHeadHelmetRiot entities: - uid: 1866 @@ -58689,17 +58683,6 @@ entities: - pos: 46.643196,3.6000824 parent: 60 type: Transform -- proto: ClothingMaskGasMerc - entities: - - uid: 19163 - components: - - flags: InContainer - type: MetaData - - parent: 16058 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: ClothingMaskNeckGaiter entities: - uid: 927 @@ -58766,6 +58749,13 @@ entities: - pos: -47.5,-26.5 parent: 60 type: Transform +- proto: ClothingNeckCloakTrans + entities: + - uid: 7082 + components: + - pos: -40.498245,-36.02266 + parent: 60 + type: Transform - proto: ClothingNeckHeadphones entities: - uid: 7861 @@ -58799,6 +58789,83 @@ entities: - pos: -11.221505,22.789167 parent: 60 type: Transform +- proto: ClothingNeckMantleCap + entities: + - uid: 16678 + components: + - flags: InContainer + type: MetaData + - parent: 1964 + type: Transform + - canCollide: False + type: Physics + - type: InsideEntityStorage +- proto: ClothingNeckMantleCE + entities: + - uid: 17299 + components: + - flags: InContainer + type: MetaData + - parent: 15403 + type: Transform + - canCollide: False + type: Physics + - type: InsideEntityStorage +- proto: ClothingNeckMantleCMO + entities: + - uid: 17463 + components: + - flags: InContainer + type: MetaData + - parent: 7044 + type: Transform + - canCollide: False + type: Physics + - type: InsideEntityStorage +- proto: ClothingNeckMantleHOP + entities: + - uid: 5207 + components: + - flags: InContainer + type: MetaData + - parent: 6235 + type: Transform + - canCollide: False + type: Physics + - type: InsideEntityStorage +- proto: ClothingNeckMantleHOS + entities: + - uid: 17672 + components: + - flags: InContainer + type: MetaData + - parent: 5933 + type: Transform + - canCollide: False + type: Physics + - type: InsideEntityStorage +- proto: ClothingNeckMantleQM + entities: + - uid: 16058 + components: + - flags: InContainer + type: MetaData + - parent: 13099 + type: Transform + - canCollide: False + type: Physics + - type: InsideEntityStorage +- proto: ClothingNeckMantleRD + entities: + - uid: 17673 + components: + - flags: InContainer + type: MetaData + - parent: 8197 + type: Transform + - canCollide: False + type: Physics + - type: InsideEntityStorage - proto: ClothingNeckNonBinaryPin entities: - uid: 13569 @@ -59053,17 +59120,6 @@ entities: - canCollide: False type: Physics - type: InsideEntityStorage -- proto: ClothingOuterHardsuitSalvage - entities: - - uid: 5207 - components: - - flags: InContainer - type: MetaData - - parent: 13099 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: ClothingOuterHardsuitSyndicate entities: - uid: 8071 @@ -59122,17 +59178,6 @@ entities: - pos: 59.42158,-46.288704 parent: 60 type: Transform -- proto: ClothingOuterVestWebMerc - entities: - - uid: 17672 - components: - - flags: InContainer - type: MetaData - - parent: 16058 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: ClothingShoesBootsJack entities: - uid: 846 @@ -59169,17 +59214,6 @@ entities: - pos: -22.454462,29.447395 parent: 60 type: Transform -- proto: ClothingShoesBootsMercFilled - entities: - - uid: 17673 - components: - - flags: InContainer - type: MetaData - - parent: 16058 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: ClothingShoesBootsWork entities: - uid: 23663 @@ -59376,17 +59410,6 @@ entities: - pos: 37.53859,15.558934 parent: 60 type: Transform -- proto: ClothingUniformJumpsuitMercenary - entities: - - uid: 16678 - components: - - flags: InContainer - type: MetaData - - parent: 16058 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: ClothingUniformJumpsuitOperative entities: - uid: 8069 @@ -60594,11 +60617,6 @@ entities: type: Transform - proto: CrateEngineeringAMEJar entities: - - uid: 7082 - components: - - pos: -3.5,33.5 - parent: 60 - type: Transform - uid: 16061 components: - pos: 6.5,23.5 @@ -61301,54 +61319,6 @@ entities: - pos: -4.5,-28.5 parent: 60 type: Transform -- proto: CrateWeaponSecure - entities: - - uid: 16058 - components: - - name: mercenary's stash - type: MetaData - - pos: 56.5,-17.5 - parent: 60 - type: Transform - - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 1.8856695 - - 7.0937095 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - type: EntityStorage - - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 18546 - - 17676 - - 17674 - - 17673 - - 17672 - - 17463 - - 17299 - - 16678 - - 19043 - - 19162 - - 19163 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - type: ContainerContainer - proto: CrayonBox entities: - uid: 6700 @@ -106478,6 +106448,35 @@ entities: - pos: -6.5,-2.5 parent: 60 type: Transform + - air: + volume: 200 + immutable: False + temperature: 293.1496 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + type: EntityStorage + - containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 16678 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + type: ContainerContainer - proto: LockerChemistryFilled entities: - uid: 2529 @@ -106533,6 +106532,35 @@ entities: - pos: 12.5,17.5 parent: 60 type: Transform + - air: + volume: 200 + immutable: False + temperature: 293.1496 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + type: EntityStorage + - containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 17299 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + type: ContainerContainer - proto: LockerChiefMedicalOfficerFilledHardsuit entities: - uid: 7044 @@ -106540,6 +106568,35 @@ entities: - pos: 29.5,-14.5 parent: 60 type: Transform + - air: + volume: 200 + immutable: False + temperature: 293.1496 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + type: EntityStorage + - containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 17463 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + type: ContainerContainer - proto: LockerDetectiveFilled entities: - uid: 7640 @@ -107079,8 +107136,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 1.6495836 - - 6.2055764 + - 1.877957 + - 7.0646954 - 0 - 0 - 0 @@ -107097,6 +107154,7 @@ entities: showEnts: False occludes: True ents: + - 5207 - 4641 paper_label: !type:ContainerSlot showEnts: False @@ -107110,6 +107168,35 @@ entities: - pos: -19.5,2.5 parent: 60 type: Transform + - air: + volume: 200 + immutable: False + temperature: 293.1496 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + type: EntityStorage + - containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 17672 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + type: ContainerContainer - proto: LockerMedicalFilled entities: - uid: 241 @@ -107168,8 +107255,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 1.877957 - - 7.0646954 + - 1.8962268 + - 7.133425 - 0 - 0 - 0 @@ -107186,7 +107273,7 @@ entities: showEnts: False occludes: True ents: - - 5207 + - 16058 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -107199,6 +107286,35 @@ entities: - pos: -44.5,7.5 parent: 60 type: Transform + - air: + volume: 200 + immutable: False + temperature: 293.1496 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + type: EntityStorage + - containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 17673 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + type: ContainerContainer - proto: LockerSalvageSpecialistFilled entities: - uid: 215 @@ -107853,7 +107969,7 @@ entities: entities: - uid: 7003 components: - - pos: 44.487556,-48.458042 + - pos: 56.487034,-17.432411 parent: 60 type: Transform - proto: MaterialReclaimer @@ -115167,6 +115283,11 @@ entities: - pos: -20.5,5.5 parent: 60 type: Transform + - uid: 19043 + components: + - pos: 8.5,23.5 + parent: 60 + type: Transform - uid: 19131 components: - pos: 20.5,19.5 @@ -124427,7 +124548,7 @@ entities: - pos: 0.5,47.5 parent: 60 type: Transform - - uid: 16550 + - uid: 19162 components: - pos: -5.5,33.5 parent: 60 @@ -124599,6 +124720,11 @@ entities: - pos: 4.5,34.5 parent: 60 type: Transform + - uid: 17674 + components: + - pos: -3.5,33.5 + parent: 60 + type: Transform - uid: 17946 components: - name: GravGenSMES