diff --git a/Resources/Maps/Next/next_amber.yml b/Resources/Maps/Next/next_amber.yml index 7cff1ca9b67..ae77ad8a664 100644 --- a/Resources/Maps/Next/next_amber.yml +++ b/Resources/Maps/Next/next_amber.yml @@ -13061,7 +13061,8 @@ entities: 4,-8: 0: 47547 4,-7: - 0: 56792 + 7: 16 + 0: 56776 4,-6: 0: 61432 4,-5: @@ -14465,6 +14466,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14975 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -14529,8 +14545,8 @@ entities: id: docking287 localAnchorB: 19,29.5 localAnchorA: 20,29.5 - damping: 33.95499 - stiffness: 304.7793 + damping: 33.954987 + stiffness: 304.77927 - proto: AcousticGuitarInstrument entities: - uid: 10313 @@ -54124,6 +54140,13 @@ entities: - type: Transform pos: 22.549095,-30.46535 parent: 2 +- proto: CaptainDrobe + entities: + - uid: 20236 + components: + - type: Transform + pos: -26.5,-55.5 + parent: 2 - proto: CarbonDioxideCanister entities: - uid: 1457 @@ -71177,13 +71200,6 @@ entities: - type: Transform pos: 65.54841,-77.60572 parent: 2 -- proto: DresserCaptainFilled - entities: - - uid: 20236 - components: - - type: Transform - pos: -26.5,-55.5 - parent: 2 - proto: DresserChiefEngineerFilled entities: - uid: 2576 @@ -126162,6 +126178,18 @@ entities: - type: Transform pos: -23.5,-53.5 parent: 2 +- proto: SpawnMobGorillaLargo + entities: + - uid: 2142 + components: + - type: Transform + pos: -45.5,-44.5 + parent: 2 + - uid: 23015 + components: + - type: Transform + pos: -8.5,19.5 + parent: 2 - proto: SpawnMobKangarooWillow entities: - uid: 20136 @@ -126216,18 +126244,6 @@ entities: - type: Transform pos: -7.5,-25.5 parent: 2 -- proto: SpawnMobRaccoonMorticia - entities: - - uid: 2142 - components: - - type: Transform - pos: -45.5,-44.5 - parent: 2 - - uid: 23015 - components: - - type: Transform - pos: -8.5,19.5 - parent: 2 - proto: SpawnMobReindeerBuck entities: - uid: 61 @@ -132488,6 +132504,13 @@ entities: - type: Transform pos: -15.5,-29.5 parent: 2 +- proto: VendingMachinePride + entities: + - uid: 10905 + components: + - type: Transform + pos: 16.5,-26.5 + parent: 2 - proto: VendingMachineRobotics entities: - uid: 4200 @@ -147293,13 +147316,6 @@ entities: - type: Transform pos: -12.5,5.5 parent: 2 -- proto: WardrobeBlueFilled - entities: - - uid: 10905 - components: - - type: Transform - pos: 16.5,-26.5 - parent: 2 - proto: WardrobeBotanistFilled entities: - uid: 4163 diff --git a/Resources/Maps/Next/next_astra.yml b/Resources/Maps/Next/next_astra.yml index 5f0d852dd60..d01240bed6a 100644 --- a/Resources/Maps/Next/next_astra.yml +++ b/Resources/Maps/Next/next_astra.yml @@ -33724,11 +33724,6 @@ entities: - type: Transform pos: -73.5,-50.5 parent: 2 - - uid: 1816 - components: - - type: Transform - pos: 38.5,-5.5 - parent: 2 - uid: 1817 components: - type: Transform @@ -212036,7 +212031,7 @@ entities: pos: 3.5,-52.5 parent: 2 - type: Door - secondsUntilStateChange: -190826.28 + secondsUntilStateChange: -191109.38 state: Opening - type: DeviceLinkSource lastSignals: @@ -212047,7 +212042,7 @@ entities: pos: 2.5,-52.5 parent: 2 - type: Door - secondsUntilStateChange: -190827.02 + secondsUntilStateChange: -191110.11 state: Opening - type: DeviceLinkSource lastSignals: @@ -238914,7 +238909,7 @@ entities: pos: 80.5,5.5 parent: 2 - type: Door - secondsUntilStateChange: -2803.9397 + secondsUntilStateChange: -3087.0261 state: Opening - uid: 31675 components: @@ -253293,6 +253288,13 @@ entities: - type: Transform pos: 37.5,15.5 parent: 2 +- proto: VendingMachinePride + entities: + - uid: 1816 + components: + - type: Transform + pos: 38.5,-5.5 + parent: 2 - proto: VendingMachinePwrGame entities: - uid: 33769 diff --git a/Resources/Maps/Next/next_avrite.yml b/Resources/Maps/Next/next_avrite.yml index e7ed1151ae5..b1b5ef95b80 100644 --- a/Resources/Maps/Next/next_avrite.yml +++ b/Resources/Maps/Next/next_avrite.yml @@ -196857,7 +196857,7 @@ entities: pos: -25.5,-29.5 parent: 2 - type: Door - secondsUntilStateChange: -49998.97 + secondsUntilStateChange: -50025.35 state: Closing - uid: 23821 components: @@ -218064,13 +218064,6 @@ entities: rot: -1.5707963267948966 rad pos: 18.714266,-43.397064 parent: 2 -- proto: DungeonMasterCircuitBoard - entities: - - uid: 16169 - components: - - type: Transform - pos: 25.4994,6.5410814 - parent: 2 - proto: Eggshells entities: - uid: 9994 @@ -233377,49 +233370,43 @@ entities: - type: Transform pos: -53.5,-88.5 parent: 2 -- proto: FloraTree02 +- proto: FloraTree entities: - - uid: 12301 + - uid: 5137 components: - type: Transform - pos: -102.54518,11.399421 + rot: -1.5707963267948966 rad + pos: -110.31337,14.822002 parent: 2 - - uid: 12411 + - uid: 6313 components: - type: Transform - pos: -112.00922,12.65366 + pos: -103.63653,8.502507 parent: 2 -- proto: FloraTree04 - entities: - - uid: 6313 + - uid: 12301 components: - type: Transform - pos: -103.63653,8.502507 + pos: -102.54518,11.399421 parent: 2 - - uid: 17994 + - uid: 12411 components: - type: Transform - pos: -45.152992,-70.46787 + pos: -112.00922,12.65366 parent: 2 -- proto: FloraTree05 - entities: - uid: 17736 components: - type: Transform pos: -47.5,-86.5 parent: 2 - - uid: 18363 + - uid: 17994 components: - type: Transform - pos: -48.199867,-70.03037 + pos: -45.152992,-70.46787 parent: 2 -- proto: FloraTree06 - entities: - - uid: 5137 + - uid: 18363 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -110.31337,14.822002 + pos: -48.199867,-70.03037 parent: 2 - proto: FloraTreeChristmas01 entities: @@ -233449,8 +233436,18 @@ entities: rot: -1.5707963267948966 rad pos: -3.8804474,76.680725 parent: 2 -- proto: FloraTreeConifer02 +- proto: FloraTreeConifer entities: + - uid: 4010 + components: + - type: Transform + pos: 3.9723268,-21.259874 + parent: 2 + - uid: 12413 + components: + - type: Transform + pos: -109.48363,12.478488 + parent: 2 - uid: 12546 components: - type: Transform @@ -233466,32 +233463,25 @@ entities: - type: Transform pos: 11.541351,-34.097363 parent: 2 -- proto: FloraTreeConifer03 +- proto: FloraTreeLarge entities: - - uid: 4010 + - uid: 3020 components: - type: Transform - pos: 3.9723268,-21.259874 + rot: 1.5707963267948966 rad + pos: -104.535194,9.839908 parent: 2 - - uid: 12413 + - uid: 3045 components: - type: Transform - pos: -109.48363,12.478488 + rot: 3.141592653589793 rad + pos: -113.58195,14.568138 parent: 2 -- proto: FloraTreeLarge01 - entities: - uid: 4916 components: - type: Transform pos: -108.64553,5.2354045 parent: 2 - - uid: 12412 - components: - - type: Transform - pos: -14.473694,78.22761 - parent: 2 -- proto: FloraTreeLarge02 - entities: - uid: 5121 components: - type: Transform @@ -233502,23 +233492,12 @@ entities: - type: Transform pos: -7.5129395,88.87286 parent: 2 -- proto: FloraTreeLarge03 - entities: - - uid: 3020 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -104.535194,9.839908 - parent: 2 -- proto: FloraTreeLarge05 - entities: - - uid: 3045 + - uid: 12412 components: - type: Transform - rot: 3.141592653589793 rad - pos: -113.58195,14.568138 + pos: -14.473694,78.22761 parent: 2 -- proto: FloraTreeSnow01 +- proto: FloraTreeSnow entities: - uid: 4654 components: @@ -233526,47 +233505,33 @@ entities: rot: -1.5707963267948966 rad pos: -11.567062,73.37131 parent: 2 - - uid: 12548 + - uid: 10744 components: - type: Transform - pos: -2.230877,73.24125 + rot: -1.5707963267948966 rad + pos: -103.07316,-0.95973897 parent: 2 - - uid: 22049 + - uid: 10745 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 5.50176,-22.012743 + rot: -1.5707963267948966 rad + pos: -101.87725,-1.2934687 parent: 2 - - uid: 22874 + - uid: 12152 components: - type: Transform - pos: 14.596069,-29.308952 + pos: 6.8808966,22.337303 parent: 2 - - uid: 57666 + - uid: 12302 components: - type: Transform - pos: 38.913868,-22.297705 + pos: 4.1431875,77.87177 parent: 2 -- proto: FloraTreeSnow03 - entities: - uid: 12303 components: - type: Transform pos: -111.12604,3.4612715 parent: 2 - - uid: 22155 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,-22.5 - parent: 2 -- proto: FloraTreeSnow04 - entities: - - uid: 12152 - components: - - type: Transform - pos: 6.8808966,22.337303 - parent: 2 - uid: 12415 components: - type: Transform @@ -233582,6 +233547,11 @@ entities: - type: Transform pos: -13.3198395,78.461 parent: 2 + - uid: 12548 + components: + - type: Transform + pos: -2.230877,73.24125 + parent: 2 - uid: 12580 components: - type: Transform @@ -233593,47 +233563,48 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,23.5 parent: 2 - - uid: 57667 + - uid: 17728 components: - type: Transform - pos: 41.78,-22.229233 + pos: 5.486345,23.977928 parent: 2 -- proto: FloraTreeSnow05 - entities: - - uid: 10745 + - uid: 17996 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -101.87725,-1.2934687 + rot: 1.5707963267948966 rad + pos: -6.5,22.5 parent: 2 - - uid: 17728 + - uid: 22049 components: - type: Transform - pos: 5.486345,23.977928 + rot: 1.5707963267948966 rad + pos: 5.50176,-22.012743 parent: 2 - - uid: 17996 + - uid: 22155 components: - type: Transform rot: 1.5707963267948966 rad - pos: -6.5,22.5 + pos: -2.5,-22.5 parent: 2 - - uid: 57681 + - uid: 22874 components: - type: Transform - pos: 40.498287,-22.665224 + pos: 14.596069,-29.308952 parent: 2 -- proto: FloraTreeSnow06 - entities: - - uid: 10744 + - uid: 57666 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -103.07316,-0.95973897 + pos: 38.913868,-22.297705 parent: 2 - - uid: 12302 + - uid: 57667 components: - type: Transform - pos: 4.1431875,77.87177 + pos: 41.78,-22.229233 + parent: 2 + - uid: 57681 + components: + - type: Transform + pos: 40.498287,-22.665224 parent: 2 - proto: FloraTreeStumpConifer entities: @@ -236360,6 +236331,13 @@ entities: - type: Transform pos: -59.42467,-86.37983 parent: 2 +- proto: GameMasterCircuitBoard + entities: + - uid: 16169 + components: + - type: Transform + pos: 25.4994,6.5410814 + parent: 2 - proto: Garlands entities: - uid: 3323 @@ -375854,6 +375832,13 @@ entities: - type: Transform pos: -51.5,44.5 parent: 2 +- proto: VendingMachinePride + entities: + - uid: 19380 + components: + - type: Transform + pos: -33.5,30.5 + parent: 2 - proto: VendingMachinePwrGame entities: - uid: 21975 diff --git a/Resources/Maps/Next/next_awesome.yml b/Resources/Maps/Next/next_awesome.yml index fdb4d557e8e..d8fded191d3 100644 --- a/Resources/Maps/Next/next_awesome.yml +++ b/Resources/Maps/Next/next_awesome.yml @@ -110083,11 +110083,6 @@ entities: parent: 16898 - proto: VendingMachineCigs entities: - - uid: 14176 - components: - - type: Transform - pos: 21.5,12.5 - parent: 2 - uid: 14177 components: - type: Transform @@ -110275,6 +110270,13 @@ entities: - type: Transform pos: 9.5,23.5 parent: 2 +- proto: VendingMachinePride + entities: + - uid: 7822 + components: + - type: Transform + pos: 21.5,12.5 + parent: 2 - proto: VendingMachineRoboDrobe entities: - uid: 14207 diff --git a/Resources/Maps/Next/next_bagel.yml b/Resources/Maps/Next/next_bagel.yml index 540f4df5673..9aa05f5d590 100644 --- a/Resources/Maps/Next/next_bagel.yml +++ b/Resources/Maps/Next/next_bagel.yml @@ -501,6 +501,351 @@ entities: chunkCollection: version: 2 nodes: + - node: + cleanable: True + zIndex: 1 + color: '#FFFFFFFF' + decals: + 55: -7,-24 + 56: 11,-29 + 58: 13,-28 + 59: 16,-38 + 60: 21,-38 + 61: 37,-22 + 62: 44,-37 + 63: 44,-38 + 67: 30,-12 + 68: 31,-12 + 69: 33,-12 + 70: -45,9 + 71: -44,9 + 72: -45,8 + 79: -7,9 + 81: 17,12 + 82: 16,13 + 83: 17,14 + 84: 15,16 + 85: 11,11 + 89: 11,15 + 91: 1,-42 + 92: 1,-35 + 93: 15,-17 + 94: 13,-17 + 95: 17,-9 + 98: -37,0 + 100: -17,-1 + 101: -17,-2 + 102: -15,-12 + 103: -1,-24 + 104: 0,-28 + 106: 19,-30 + 107: 19,-13 + 108: 20,-11 + 111: -1,-31 + 119: -11,-43 + 120: -13,-43 + 121: -10,-43 + 122: -9,-43 + 123: -7,-43 + 124: -6,-42 + 125: -15,-40 + 135: -47,-33 + 136: -45,-35 + 137: -50,-30 + 152: -38,-13 + 153: -38,-14 + 154: -38,-18 + 155: -39,-19 + 283: -23,-12 + 284: -32,-11 + 359: 11,-21 + 360: 12,-21 + 374: 16,-9 + 409: -26,31 + 410: -27,30 + 411: -23,31 + 412: -23,29 + 413: -21,29 + 414: -18,29 + 415: -22,27 + 416: -24,30 + 417: -29,31 + 448: -16,12 + 449: -16,23 + 450: -23,24 + 451: -39,24 + 452: -42,22 + 453: -43,21 + 460: -58,20 + 461: -59,18 + 462: -60,17 + 463: -59,25 + 464: -60,24 + 465: -56,24 + 466: -57,20 + 511: -38,8 + 512: -38,6 + 513: -38,5 + 514: -39,12 + 585: 47,-1 + 586: 48,-2 + 587: 49,-2 + 588: 51,1 + 589: 50,1 + 591: 48,2 + 592: 47,0 + 597: 55,12 + 598: 54,11 + 599: 53,11 + 600: 55,13 + 601: 55,9 + 602: 49,14 + 603: 50,13 + 607: 37,4 + 608: 36,5 + 675: -22,25 + 676: -17,18 + 677: -37,4 + 678: -37,-11 + 679: -37,-15 + 681: -17,-14 + 682: -17,-7 + 683: -16,-5 + 691: -16,7 + 693: -16,4 + 694: -15,9 + 695: -16,0 + 828: -9,-25 + 829: -8,-25 + 830: -8,-25 + 835: -4,-24 + 836: -1,-25 + 858: -33,-20 + 859: -33,-17 + 860: -32,-20 + 895: -6,-23 + 896: -25,-23 + 897: -34,-23 + 898: -37,-24 + 1068: -10,-55 + 1069: -14,-56 + 1070: -19,-55 + 1071: -7,-54 + 1072: -2,-54 + 1073: -3,-57 + 1074: 2,-59 + 1075: -3,-64 + 1076: 0,-61 + 1077: -3,-66 + 1078: -3,-71 + 1079: -1,-73 + 1080: 2,-71 + 1081: 1,-55 + 1082: -1,-47 + 1083: 0,-45 + 1153: 15,25 + 1154: 16,27 + 1156: 38,24 + 1163: 41,20 + 1164: 52,14 + 1165: 48,18 + 1166: 49,16 + 1167: 45,7 + 1168: 20,8 + 1169: 32,7 + 1170: 34,8 + 1171: 16,8 + 1172: 5,8 + 1173: -7,9 + 1174: -8,8 + 1216: 7,-24 + 1218: 18,-28 + 1219: 21,-35 + 1220: 19,-34 + 1629: -38,9 + 1630: -39,8 + 1631: -39,7 + 1632: -39,-1 + 1641: -8,-14 + 1642: -9,-13 + 1657: -9,-16 + 1658: -8,-16 + 1659: -8,-16 + 1981: -39,-12 + 1982: -39,-8 + 1983: -40,-7 + 1984: -39,-8 + 1986: -39,-9 + 1987: -39,-3 + 1988: -39,3 + 2218: 1,13 + 2219: 0,14 + 2220: 0,15 + 2221: 0,15 + 2222: 1,15 + 2223: 3,14 + 2224: 5,15 + 2225: 7,13 + 2226: 9,14 + 2227: 11,12 + 2228: 11,14 + 2229: 5,17 + 2230: 4,17 + 2231: 4,18 + 2232: -4,17 + 2233: -4,19 + 2234: -3,20 + 2235: -2,17 + 2272: 3,19 + 2273: 4,20 + 2275: -4,21 + 2276: -3,22 + 2278: -2,21 + 2279: -2,20 + 2281: -5,28 + 2283: -11,28 + 2284: -12,29 + 2285: -13,30 + 2286: -13,31 + 2287: -12,32 + 2288: -22,31 + 2289: -30,30 + 2292: 51,-38 + 2293: 51,-38 + 2302: 49,-39 + 2418: -52,-35 + 2419: -52,-35 + 2420: -52,-32 + 2421: -49,-31 + 2422: -49,-31 + 2423: -48,-32 + 2424: -48,-32 + 2425: -45,-33 + 2426: -45,-33 + 2427: -45,-33 + 2428: -46,-32 + 2429: -46,-32 + 2430: -46,-32 + 2528: 28,21 + 2529: 31,18 + 2530: 31,12 + 2531: 27,12 + 2895: 44,9 + 2896: 46,8 + 2897: 44,10 + 2898: 45,12 + 3069: 37,1 + 3070: 37,-1 + 3071: 38,0 + 3072: 36,0 + 3073: 36,-1 + 3074: 40,0 + 3109: 46,-1 + 3110: 46,1 + 3111: 47,2 + 3112: 48,1 + 3115: 46,2 + 3116: 40,2 + 3128: 49,6 + 3129: 48,7 + 3132: 41,8 + 3133: 40,9 + 3134: 39,8 + 3135: 41,13 + 3136: 41,15 + 3137: 40,16 + 3138: 56,7 + 3139: 41,1 + 3140: 41,0 + 3141: 42,2 + 3142: 40,-1 + 3153: 56,12 + 3154: 54,15 + 3155: 49,17 + 3156: 55,7 + 3157: 49,9 + 3158: 50,11 + 3159: 37,7 + 3486: 43,-19 + 3487: 43,-23 + 3488: 41,-24 + 3573: 35,-23 + 3574: 34,-25 + 3576: 33,-22 + 3729: -33,8 + 3730: -34,9 + 3731: -35,8 + 3732: -35,7 + 3733: -37,8 + 4407: 33,23 + 4408: 34,23 + 4409: 37,23 + 4410: 38,25 + 4411: 37,25 + 4412: 19,25 + 4413: 20,25 + 4414: 19,23 + 4415: 24,25 + 4417: 28,23 + 4418: 29,24 + 4419: 27,23 + 4420: 33,27 + 4421: 33,28 + 4423: 35,33 + 4424: 33,38 + 4425: 35,40 + 4426: 35,44 + 4427: 35,45 + 4428: 33,46 + 4429: 53,44 + 4430: 53,45 + 4431: 55,46 + 4432: 53,48 + 4433: 55,41 + 4434: 53,41 + 4435: 53,40 + 4436: 54,39 + 4437: 54,38 + 4438: 53,35 + 4439: 53,34 + 4440: 53,28 + 4441: 55,30 + 4442: 55,25 + 4443: 56,25 + 4444: 57,24 + 4445: 55,20 + 4446: 54,20 + 4447: 49,20 + 4448: 51,25 + 4449: 50,24 + 4452: 50,25 + 4453: 48,25 + 4454: 48,24 + 4455: 47,25 + 4456: 46,25 + 4628: -24,-19 + 4631: -27,-19 + 4632: -28,-20 + 4633: -29,-19 + 4634: -27,-20 + 4635: -30,-20 + 4636: -30,-15 + 4637: -29,-16 + 4638: -24,-15 + 4639: -23,-8 + 4640: -23,-7 + 4641: -24,-5 + 4642: -31,-7 + 4643: -19,-20 + 4644: -21,-19 + 4660: 16,-15 + 4661: 17,-14 + 4662: 17,-13 + 4663: 17,-17 + 4664: 16,-16 + 4665: 16,-18 + 4666: 16,-12 + 4667: 15,-21 - node: angle: -3.141592653589793 rad color: '#FFFFFFFF' @@ -2621,6 +2966,13 @@ entities: 52: 18,-51 53: 17,-51 54: 17,-51 + 126: -15,-43 + 127: -16,-43 + 128: -14,-43 + 129: -16,-41 + 130: -16,-42 + 131: -15,-40 + 132: -12,-42 2431: -45,-32 2432: -46,-32 2433: -46,-33 @@ -2798,13 +3150,6 @@ entities: 3862: -9,-12 3863: -11,-12 3864: -10,-12 - 126: -15,-43 - 127: -16,-43 - 128: -14,-43 - 129: -16,-41 - 130: -16,-42 - 131: -15,-40 - 132: -12,-42 - node: cleanable: True zIndex: 1 @@ -2813,11 +3158,14 @@ entities: decals: 36: 0,-3 37: 2,-2 - 3062: 37,-2 - 3063: 37,2 64: 53,-38 65: 60,-28 86: 13,11 + 112: -16,-43 + 113: -14,-43 + 114: -14,-44 + 115: -16,-42 + 116: -16,-40 133: -51,-30 149: -39,-14 455: -59,19 @@ -2850,17 +3198,14 @@ entities: 2764: -59,26 2765: -60,26 2894: 45,9 + 3062: 37,-2 + 3063: 37,2 3279: -59,20 3280: -59,22 3281: -59,22 3811: -12,-16 3813: -12,-15 3854: -13,-16 - 112: -16,-43 - 113: -14,-43 - 114: -14,-44 - 115: -16,-42 - 116: -16,-40 - node: cleanable: True zIndex: 1 @@ -2874,358 +3219,13 @@ entities: 3494: 8,14 3855: -11,-17 3856: -11,-14 - - node: - cleanable: True - zIndex: 1 - color: '#FFFFFFFF' - decals: - 283: -23,-12 - 284: -32,-11 - 511: -38,8 - 512: -38,6 - 513: -38,5 - 514: -39,12 - 858: -33,-20 - 859: -33,-17 - 860: -32,-20 - 3069: 37,1 - 3070: 37,-1 - 3071: 38,0 - 3072: 36,0 - 3073: 36,-1 - 3074: 40,0 - 55: -7,-24 - 56: 11,-29 - 58: 13,-28 - 59: 16,-38 - 60: 21,-38 - 61: 37,-22 - 62: 44,-37 - 63: 44,-38 - 67: 30,-12 - 68: 31,-12 - 69: 33,-12 - 70: -45,9 - 71: -44,9 - 72: -45,8 - 79: -7,9 - 81: 17,12 - 82: 16,13 - 83: 17,14 - 84: 15,16 - 85: 11,11 - 89: 11,15 - 91: 1,-42 - 92: 1,-35 - 93: 15,-17 - 94: 13,-17 - 95: 17,-9 - 98: -37,0 - 100: -17,-1 - 101: -17,-2 - 102: -15,-12 - 103: -1,-24 - 104: 0,-28 - 106: 19,-30 - 135: -47,-33 - 136: -45,-35 - 137: -50,-30 - 152: -38,-13 - 153: -38,-14 - 154: -38,-18 - 155: -39,-19 - 359: 11,-21 - 360: 12,-21 - 374: 16,-9 - 409: -26,31 - 410: -27,30 - 411: -23,31 - 412: -23,29 - 413: -21,29 - 414: -18,29 - 415: -22,27 - 416: -24,30 - 417: -29,31 - 448: -16,12 - 449: -16,23 - 450: -23,24 - 451: -39,24 - 452: -42,22 - 453: -43,21 - 460: -58,20 - 461: -59,18 - 462: -60,17 - 463: -59,25 - 464: -60,24 - 465: -56,24 - 466: -57,20 - 585: 47,-1 - 586: 48,-2 - 587: 49,-2 - 588: 51,1 - 589: 50,1 - 591: 48,2 - 592: 47,0 - 597: 55,12 - 598: 54,11 - 599: 53,11 - 600: 55,13 - 601: 55,9 - 602: 49,14 - 603: 50,13 - 607: 37,4 - 608: 36,5 - 675: -22,25 - 676: -17,18 - 677: -37,4 - 678: -37,-11 - 679: -37,-15 - 681: -17,-14 - 682: -17,-7 - 683: -16,-5 - 691: -16,7 - 693: -16,4 - 694: -15,9 - 695: -16,0 - 828: -9,-25 - 829: -8,-25 - 830: -8,-25 - 835: -4,-24 - 836: -1,-25 - 895: -6,-23 - 896: -25,-23 - 897: -34,-23 - 898: -37,-24 - 1068: -10,-55 - 1069: -14,-56 - 1070: -19,-55 - 1071: -7,-54 - 1072: -2,-54 - 1073: -3,-57 - 1074: 2,-59 - 1075: -3,-64 - 1076: 0,-61 - 1077: -3,-66 - 1078: -3,-71 - 1079: -1,-73 - 1080: 2,-71 - 1081: 1,-55 - 1082: -1,-47 - 1083: 0,-45 - 1153: 15,25 - 1154: 16,27 - 1156: 38,24 - 1163: 41,20 - 1164: 52,14 - 1165: 48,18 - 1166: 49,16 - 1167: 45,7 - 1168: 20,8 - 1169: 32,7 - 1170: 34,8 - 1171: 16,8 - 1172: 5,8 - 1173: -7,9 - 1174: -8,8 - 1216: 7,-24 - 1218: 18,-28 - 1219: 21,-35 - 1220: 19,-34 - 1629: -38,9 - 1630: -39,8 - 1631: -39,7 - 1632: -39,-1 - 1641: -8,-14 - 1642: -9,-13 - 1657: -9,-16 - 1658: -8,-16 - 1659: -8,-16 - 1981: -39,-12 - 1982: -39,-8 - 1983: -40,-7 - 1984: -39,-8 - 1986: -39,-9 - 1987: -39,-3 - 1988: -39,3 - 2218: 1,13 - 2219: 0,14 - 2220: 0,15 - 2221: 0,15 - 2222: 1,15 - 2223: 3,14 - 2224: 5,15 - 2225: 7,13 - 2226: 9,14 - 2227: 11,12 - 2228: 11,14 - 2229: 5,17 - 2230: 4,17 - 2231: 4,18 - 2232: -4,17 - 2233: -4,19 - 2234: -3,20 - 2235: -2,17 - 2272: 3,19 - 2273: 4,20 - 2275: -4,21 - 2276: -3,22 - 2278: -2,21 - 2279: -2,20 - 2281: -5,28 - 2283: -11,28 - 2284: -12,29 - 2285: -13,30 - 2286: -13,31 - 2287: -12,32 - 2288: -22,31 - 2289: -30,30 - 2292: 51,-38 - 2293: 51,-38 - 2302: 49,-39 - 2418: -52,-35 - 2419: -52,-35 - 2420: -52,-32 - 2421: -49,-31 - 2422: -49,-31 - 2423: -48,-32 - 2424: -48,-32 - 2425: -45,-33 - 2426: -45,-33 - 2427: -45,-33 - 2428: -46,-32 - 2429: -46,-32 - 2430: -46,-32 - 2528: 28,21 - 2529: 31,18 - 2530: 31,12 - 2531: 27,12 - 2895: 44,9 - 2896: 46,8 - 2897: 44,10 - 2898: 45,12 - 3109: 46,-1 - 3110: 46,1 - 3111: 47,2 - 3112: 48,1 - 3115: 46,2 - 3116: 40,2 - 3128: 49,6 - 3129: 48,7 - 3132: 41,8 - 3133: 40,9 - 3134: 39,8 - 3135: 41,13 - 3136: 41,15 - 3137: 40,16 - 3138: 56,7 - 3139: 41,1 - 3140: 41,0 - 3141: 42,2 - 3142: 40,-1 - 3153: 56,12 - 3154: 54,15 - 3155: 49,17 - 3156: 55,7 - 3157: 49,9 - 3158: 50,11 - 3159: 37,7 - 3486: 43,-19 - 3487: 43,-23 - 3488: 41,-24 - 3573: 35,-23 - 3574: 34,-25 - 3576: 33,-22 - 3729: -33,8 - 3730: -34,9 - 3731: -35,8 - 3732: -35,7 - 3733: -37,8 - 4407: 33,23 - 4408: 34,23 - 4409: 37,23 - 4410: 38,25 - 4411: 37,25 - 4412: 19,25 - 4413: 20,25 - 4414: 19,23 - 4415: 24,25 - 4417: 28,23 - 4418: 29,24 - 4419: 27,23 - 4420: 33,27 - 4421: 33,28 - 4423: 35,33 - 4424: 33,38 - 4425: 35,40 - 4426: 35,44 - 4427: 35,45 - 4428: 33,46 - 4429: 53,44 - 4430: 53,45 - 4431: 55,46 - 4432: 53,48 - 4433: 55,41 - 4434: 53,41 - 4435: 53,40 - 4436: 54,39 - 4437: 54,38 - 4438: 53,35 - 4439: 53,34 - 4440: 53,28 - 4441: 55,30 - 4442: 55,25 - 4443: 56,25 - 4444: 57,24 - 4445: 55,20 - 4446: 54,20 - 4447: 49,20 - 4448: 51,25 - 4449: 50,24 - 4452: 50,25 - 4453: 48,25 - 4454: 48,24 - 4455: 47,25 - 4456: 46,25 - 4628: -24,-19 - 4631: -27,-19 - 4632: -28,-20 - 4633: -29,-19 - 4634: -27,-20 - 4635: -30,-20 - 4636: -30,-15 - 4637: -29,-16 - 4638: -24,-15 - 4639: -23,-8 - 4640: -23,-7 - 4641: -24,-5 - 4642: -31,-7 - 4643: -19,-20 - 4644: -21,-19 - 4660: 16,-15 - 4661: 17,-14 - 4662: 17,-13 - 4663: 17,-17 - 4664: 16,-16 - 4665: 16,-18 - 4666: 16,-12 - 4667: 15,-21 - 107: 19,-13 - 108: 20,-11 - 111: -1,-31 - 119: -11,-43 - 120: -13,-43 - 121: -10,-43 - 122: -9,-43 - 123: -7,-43 - 124: -6,-42 - 125: -15,-40 - node: cleanable: True zIndex: 1 color: '#FFFFFFFF' id: DirtLight decals: - 31: -2,-3 + 31: 50,-33 38: 3,-2 39: 4,-2 40: -1,-3 @@ -3236,21 +3236,13 @@ entities: color: '#FFFFFFFF' id: DirtMedium decals: - 32: -2,-4 - 33: -3,-4 + 32: 52,-33 + 33: 51,-33 34: -6,-3 35: -4,-4 42: 11,-3 43: 5,-3 44: -4,-3 - 508: -38,7 - 509: -39,10 - 510: -39,11 - 3064: 36,-2 - 3065: 38,-2 - 3066: 36,2 - 3067: 38,2 - 3068: 37,1 57: 11,-28 66: 35,-12 78: -7,10 @@ -3259,6 +3251,8 @@ entities: 88: 10,15 90: -1,-42 99: -37,-1 + 117: -16,-42 + 118: -12,-43 134: -50,-33 150: -39,-15 151: -39,-16 @@ -3267,6 +3261,9 @@ entities: 408: -25,31 458: -58,21 459: -59,25 + 508: -38,7 + 509: -39,10 + 510: -39,11 582: 50,2 584: 49,0 690: -16,6 @@ -3297,6 +3294,11 @@ entities: 2700: -64,-10 2701: -62,-9 2702: -60,-12 + 3064: 36,-2 + 3065: 38,-2 + 3066: 36,2 + 3067: 38,2 + 3068: 37,1 4405: 31,22 4406: 32,22 4416: 29,23 @@ -3306,8 +3308,6 @@ entities: 4630: -28,-19 4658: 17,-16 4659: 17,-15 - 117: -16,-42 - 118: -12,-43 - node: cleanable: True color: '#FED83DFF' @@ -5284,17 +5284,17 @@ entities: color: '#FFFFFFFF' id: Rust decals: - 34: 10,-44 - 35: 10,-44 - 36: 11,-47 - 37: 15,-46 - 38: 16,-45 - 39: 16,-45 - 40: 18,-45 - 41: 13,-44 - 42: 13,-44 - 43: 13,-45 - 44: 18,-47 + 34: -6,-3 + 35: -4,-4 + 36: 0,-3 + 37: 2,-2 + 38: 3,-2 + 39: 4,-2 + 40: -1,-3 + 41: 11,-4 + 42: 11,-3 + 43: 5,-3 + 44: -4,-3 138: -45,-35 - node: cleanable: True @@ -49411,6 +49411,13 @@ entities: - type: Transform pos: 23.743336,21.526909 parent: 60 +- proto: CaptainDrobe + entities: + - uid: 6419 + components: + - type: Transform + pos: -7.5,-6.5 + parent: 60 - proto: CaptainIDCard entities: - uid: 60213 @@ -69017,13 +69024,6 @@ entities: actions: !type:Container ents: - 13159 -- proto: DresserCaptainFilled - entities: - - uid: 6419 - components: - - type: Transform - pos: -7.5,-6.5 - parent: 60 - proto: DresserChiefEngineerFilled entities: - uid: 944 @@ -131846,6 +131846,13 @@ entities: rot: -1.5707963267948966 rad pos: 25.5,-28.5 parent: 60 +- proto: SpawnMobGorillaLargo + entities: + - uid: 13102 + components: + - type: Transform + pos: 45.5,13.5 + parent: 60 - proto: SpawnMobMcGriff entities: - uid: 4710 @@ -131899,13 +131906,6 @@ entities: - type: Transform pos: 40.5,-8.5 parent: 60 -- proto: SpawnMobRaccoonMorticia - entities: - - uid: 13102 - components: - - type: Transform - pos: 45.5,13.5 - parent: 60 - proto: SpawnMobShiva entities: - uid: 19794 @@ -139292,6 +139292,13 @@ entities: - type: Transform pos: 32.5,-30.5 parent: 60 +- proto: VendingMachinePride + entities: + - uid: 2278 + components: + - type: Transform + pos: 21.5,-26.5 + parent: 60 - proto: VendingMachineRestockDonut entities: - uid: 5660 diff --git a/Resources/Maps/Next/next_box.yml b/Resources/Maps/Next/next_box.yml index 6b5d34fcf29..39fef6019f0 100644 --- a/Resources/Maps/Next/next_box.yml +++ b/Resources/Maps/Next/next_box.yml @@ -13169,7 +13169,7 @@ entities: pos: 24.5,16.5 parent: 8364 - type: Door - secondsUntilStateChange: -37852.17 + secondsUntilStateChange: -37890.195 state: Opening - type: DeviceLinkSource lastSignals: @@ -59033,6 +59033,13 @@ entities: - type: Transform pos: 74.72912,-20.240425 parent: 8364 +- proto: CaptainDrobe + entities: + - uid: 5341 + components: + - type: Transform + pos: 6.5,-20.5 + parent: 8364 - proto: CaptainIDCard entities: - uid: 5329 @@ -83025,13 +83032,6 @@ entities: - type: Transform pos: 20.5,4.5 parent: 8364 -- proto: DresserCaptainFilled - entities: - - uid: 5341 - components: - - type: Transform - pos: 6.5,-20.5 - parent: 8364 - proto: DresserChiefEngineerFilled entities: - uid: 5638 @@ -86367,7 +86367,7 @@ entities: pos: -34.5,-14.5 parent: 8364 - type: Door - secondsUntilStateChange: -32040.709 + secondsUntilStateChange: -32078.734 state: Closing - uid: 15010 components: @@ -86860,7 +86860,7 @@ entities: pos: -4.5,-71.5 parent: 8364 - type: Door - secondsUntilStateChange: -23788.44 + secondsUntilStateChange: -23826.465 state: Closing - proto: Fireplace entities: @@ -145861,6 +145861,13 @@ entities: - type: Transform pos: 43.5,0.5 parent: 8364 +- proto: SpawnMobGorillaLargo + entities: + - uid: 25879 + components: + - type: Transform + pos: -30.5,-26.5 + parent: 8364 - proto: SpawnMobLizard entities: - uid: 20687 @@ -145933,13 +145940,6 @@ entities: - type: Transform pos: 44.5,-18.5 parent: 8364 -- proto: SpawnMobRaccoonMorticia - entities: - - uid: 25879 - components: - - type: Transform - pos: -30.5,-26.5 - parent: 8364 - proto: SpawnMobShiva entities: - uid: 16718 @@ -154573,6 +154573,13 @@ entities: - type: Transform pos: 45.5,-6.5 parent: 8364 +- proto: VendingMachinePride + entities: + - uid: 16209 + components: + - type: Transform + pos: 30.5,-10.5 + parent: 8364 - proto: VendingMachineRoboDrobe entities: - uid: 11316 diff --git a/Resources/Maps/Next/next_cute.yml b/Resources/Maps/Next/next_cute.yml index 45498f04443..e4a726878bb 100644 --- a/Resources/Maps/Next/next_cute.yml +++ b/Resources/Maps/Next/next_cute.yml @@ -3673,11 +3673,6 @@ entities: 6880: 364,404 6881: 363,404 6882: 362,404 - - node: - zIndex: 1 - color: '#3535358E' - id: QuarterTileOverlayGreyscale - decals: 7010: 416,365 7011: 416,364 7012: 416,363 @@ -4216,11 +4211,6 @@ entities: 6876: 363,402 6877: 360,402 6878: 359,402 - - node: - zIndex: 1 - color: '#3535358E' - id: QuarterTileOverlayGreyscale180 - decals: 7007: 414,363 7008: 414,364 7009: 414,365 @@ -5060,11 +5050,6 @@ entities: 6793: 381,402 6794: 382,402 6795: 363,402 - - node: - zIndex: 1 - color: '#D3D3D32D' - id: QuarterTileOverlayGreyscale270 - decals: 7015: 416,363 7016: 416,364 7017: 416,365 @@ -5607,11 +5592,6 @@ entities: 1040: 356,404 1041: 355,404 1042: 354,404 - - node: - zIndex: 1 - color: '#D3D3D32D' - id: QuarterTileOverlayGreyscale90 - decals: 7019: 414,365 7020: 414,364 7021: 414,363 @@ -42347,6 +42327,18 @@ entities: - type: Transform pos: 357.5,397.5 parent: 1 +- proto: CaptainDrobe + entities: + - uid: 5759 + components: + - type: Transform + pos: 365.5,411.5 + parent: 1 + - uid: 21524 + components: + - type: Transform + pos: 11.5,23.5 + parent: 5072 - proto: CaptainIDCard entities: - uid: 5760 @@ -55483,18 +55475,6 @@ entities: - type: Transform pos: 369.5,414.5 parent: 1 -- proto: DresserCaptainFilled - entities: - - uid: 5759 - components: - - type: Transform - pos: 365.5,411.5 - parent: 1 - - uid: 21524 - components: - - type: Transform - pos: 11.5,23.5 - parent: 5072 - proto: DresserChiefEngineerFilled entities: - uid: 6246 @@ -116413,7 +116393,6 @@ entities: - type: EntityStorage air: volume: 200 - immutable: False temperature: 293.14673 moles: - 1.7459903 @@ -116428,11 +116407,13 @@ entities: - 0 - 0 - 0 + closeSound: !type:SoundPathSpecifier + path: /Audio/Effects/closetclose.ogg + openSound: !type:SoundPathSpecifier + path: /Audio/Effects/closetopen.ogg - type: ContainerContainer containers: entity_storage: !type:Container - showEnts: False - occludes: True ents: - 18288 - 18286 @@ -124864,6 +124845,13 @@ entities: - type: Transform pos: 408.5,380.5 parent: 1 +- proto: VendingMachinePride + entities: + - uid: 6060 + components: + - type: Transform + pos: 407.5,376.5 + parent: 1 - proto: VendingMachineRoboDrobe entities: - uid: 7432 @@ -143175,13 +143163,6 @@ entities: - type: Transform pos: 409.5,376.5 parent: 1 -- proto: WardrobePinkFilled - entities: - - uid: 6060 - components: - - type: Transform - pos: 407.5,376.5 - parent: 1 - proto: WardrobePrisonFilled entities: - uid: 5034 @@ -144360,7 +144341,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -91392.336 + secondsUntilStateChange: -91487.87 state: Opening - type: Airlock autoClose: False diff --git a/Resources/Maps/Next/next_delta.yml b/Resources/Maps/Next/next_delta.yml index 972ea0b17c7..d52ce98919a 100644 --- a/Resources/Maps/Next/next_delta.yml +++ b/Resources/Maps/Next/next_delta.yml @@ -146373,64 +146373,52 @@ entities: - type: Transform pos: -51.5,-42.5 parent: 2 -- proto: FloraGreyStalagmite2 +- proto: FloraGreyStalagmite entities: - uid: 39071 components: - type: Transform pos: -22.5,12.5 parent: 38436 -- proto: FloraGreyStalagmite3 - entities: - uid: 39072 components: - type: Transform pos: -17.5,18.5 parent: 38436 -- proto: FloraGreyStalagmite5 - entities: - uid: 39073 components: - type: Transform pos: -17.5,15.5 parent: 38436 -- proto: FloraGreyStalagmite6 - entities: - uid: 39074 components: - type: Transform pos: -23.5,17.5 parent: 38436 -- proto: FloraRockSolid01 +- proto: FloraRockSolid entities: - uid: 39075 components: - type: Transform pos: -5.5,23.5 parent: 38436 -- proto: FloraRockSolid02 - entities: - uid: 39076 components: - type: Transform pos: -0.5,20.5 parent: 38436 -- proto: FloraRockSolid03 - entities: - uid: 39077 components: - type: Transform pos: -6.5,16.5 parent: 38436 -- proto: FloraStalagmite3 +- proto: FloraStalagmite entities: - uid: 39078 components: - type: Transform pos: -20.5,18.5 parent: 38436 -- proto: FloraStalagmite6 - entities: - uid: 39079 components: - type: Transform @@ -146441,67 +146429,55 @@ entities: - type: Transform pos: -26.5,14.5 parent: 38436 -- proto: FloraTreeConifer01 +- proto: FloraTreeConifer entities: - uid: 18490 components: - type: Transform pos: 73.14714,-17.472494 parent: 2 - - uid: 40824 - components: - - type: Transform - pos: 71.34376,-23.3246 - parent: 2 -- proto: FloraTreeConifer02 - entities: - uid: 18492 components: - type: Transform pos: 69.89961,-17.378748 parent: 2 -- proto: FloraTreeConifer03 - entities: - uid: 18512 components: - type: Transform pos: 69.354515,-20.331871 parent: 2 -- proto: FloraTreeSnow02 - entities: - - uid: 18488 + - uid: 40824 components: - type: Transform - pos: 72.775,-20.33187 + pos: 71.34376,-23.3246 parent: 2 -- proto: FloraTreeSnow03 +- proto: FloraTreeSnow entities: - - uid: 40825 + - uid: 2501 components: - type: Transform - pos: 73.26751,-23.321184 + pos: 69.67376,-23.258684 parent: 2 -- proto: FloraTreeSnow04 - entities: - uid: 18486 components: - type: Transform pos: 74.4625,-19.722494 parent: 2 -- proto: FloraTreeSnow05 - entities: - - uid: 2501 + - uid: 18488 components: - type: Transform - pos: 69.67376,-23.258684 + pos: 72.775,-20.33187 parent: 2 -- proto: FloraTreeSnow06 - entities: - uid: 18493 components: - type: Transform pos: 71.36875,-19.816244 parent: 2 + - uid: 40825 + components: + - type: Transform + pos: 73.26751,-23.321184 + parent: 2 - proto: FoamCutlass entities: - uid: 18494 @@ -242807,6 +242783,13 @@ entities: - type: Transform pos: -31.5,55.5 parent: 2 +- proto: VendingMachinePride + entities: + - uid: 14758 + components: + - type: Transform + pos: -9.5,36.5 + parent: 2 - proto: VendingMachineRestockSecTech entities: - uid: 14963 diff --git a/Resources/Maps/Next/next_glacier.yml b/Resources/Maps/Next/next_glacier.yml index ede4c5ea13a..24cd2f2f24e 100644 --- a/Resources/Maps/Next/next_glacier.yml +++ b/Resources/Maps/Next/next_glacier.yml @@ -15433,10 +15433,6 @@ entities: 30516: -50.14418,-52.27571 30517: -50.034805,-51.728836 32638: -54.971264,-16.201826 - - node: - color: '#FFFFFF7F' - id: grasssnow - decals: 33985: 20.13257,38.762512 - node: angle: 1.5707963267948966 rad @@ -15557,13 +15553,6 @@ entities: decals: 29888: -118.83782,34.7343 29902: -64.88205,22.684923 - - node: - color: '#FFFFFF7F' - id: grasssnow02 - decals: - 33958: 1.0715597,67.06138 - 33975: 16.041418,30.980015 - 33986: 21.10132,38.825012 - node: color: '#FFFFFF7F' id: grasssnow02 @@ -15600,6 +15589,9 @@ entities: 32636: -54.033764,-16.592451 33111: -97.00549,47.672955 33121: -100.299446,44.85365 + 33958: 1.0715597,67.06138 + 33975: 16.041418,30.980015 + 33986: 21.10132,38.825012 - node: color: '#FFFFFF85' id: grasssnow02 @@ -15764,10 +15756,6 @@ entities: 33273: -73.90753,44.7715 33274: -68.04816,43.1465 33653: 3.9304934,-13.979507 - - node: - color: '#FFFFFF7F' - id: grasssnow03 - decals: 33990: 21.773195,38.825012 - node: angle: 1.5707963267948966 rad @@ -15837,13 +15825,6 @@ entities: 30850: 90.85002,-35.72918 30851: 93.0219,-34.82293 31808: -52.52818,23.743565 - - node: - color: '#FFFFFF7F' - id: grasssnow04 - decals: - 33959: 1.7590597,67.2645 - 33977: 14.807043,31.636265 - 33992: 21.07007,37.262512 - node: color: '#FFFFFF7F' id: grasssnow04 @@ -15872,6 +15853,9 @@ entities: 33423: 13.820593,-28.786037 33924: 31.089584,26.127357 33927: 33.006252,26.169025 + 33959: 1.7590597,67.2645 + 33977: 14.807043,31.636265 + 33992: 21.07007,37.262512 - node: angle: 1.5707963267948966 rad color: '#FFFFFF7F' @@ -15934,11 +15918,6 @@ entities: id: grasssnow05 decals: 29899: -83.166824,28.95964 - - node: - color: '#FFFFFF7F' - id: grasssnow05 - decals: - 33955: -1.0065653,66.0145 - node: color: '#FFFFFF7F' id: grasssnow05 @@ -15952,6 +15931,7 @@ entities: 30164: -58.744392,-21.099476 30166: -60.056892,-22.5526 32494: -39.94499,70.880775 + 33955: -1.0065653,66.0145 - node: angle: 1.5707963267948966 rad color: '#FFFFFF8F' @@ -16041,11 +16021,6 @@ entities: 29978: -50.22574,-44.473995 29984: -43.780273,-43.402813 30042: -45.013783,-38.9848 - - node: - color: '#FFFFFF7F' - id: grasssnow06 - decals: - 33976: 16.166418,30.886265 - node: color: '#FFFFFF7F' id: grasssnow06 @@ -16060,6 +16035,7 @@ entities: 30883: -32.899,45.97389 32540: -38.48021,74.12073 33654: 3.1648686,-14.307632 + 33976: 16.166418,30.886265 - node: color: '#FFFFFF8F' id: grasssnow06 @@ -16121,12 +16097,6 @@ entities: 29887: -119.08782,33.95305 29889: -115.15032,36.749924 29893: -82.104324,30.426716 - - node: - color: '#FFFFFF7F' - id: grasssnow07 - decals: - 33956: -1.0065653,65.04575 - 33987: 20.085695,37.809387 - node: color: '#FFFFFF7F' id: grasssnow07 @@ -16185,6 +16155,8 @@ entities: 33344: 37.771328,-30.232307 33650: 0.15095997,-14.010757 33928: 32.922916,25.86347 + 33956: -1.0065653,65.04575 + 33987: 20.085695,37.809387 - node: angle: 1.5707963267948966 rad color: '#FFFFFF7F' @@ -16358,12 +16330,6 @@ entities: 29892: -82.041824,31.53609 29897: -84.260574,28.11589 29898: -84.30745,28.67839 - - node: - color: '#FFFFFF7F' - id: grasssnow08 - decals: - 33945: -4.1101694,49.75526 - 33991: 20.648195,37.387512 - node: color: '#FFFFFF7F' id: grasssnow08 @@ -16417,6 +16383,8 @@ entities: 33422: 14.601843,-29.254787 33920: 23.04592,25.851162 33925: 31.103474,25.870413 + 33945: -4.1101694,49.75526 + 33991: 20.648195,37.387512 - node: angle: 1.5707963267948966 rad color: '#FFFFFF7F' @@ -16616,14 +16584,6 @@ entities: id: grasssnow09 decals: 31341: 52.013435,-20.952555 - - node: - color: '#FFFFFF7F' - id: grasssnow09 - decals: - 33946: -3.0945444,49.13026 - 33954: -0.92844033,67.077 - 33974: 15.025793,31.15189 - 33988: 21.07007,37.903137 - node: color: '#FFFFFF7F' id: grasssnow09 @@ -16669,6 +16629,10 @@ entities: 33919: 23.094532,26.06644 33921: 24.066303,26.094217 33926: 31.978474,26.106525 + 33946: -3.0945444,49.13026 + 33954: -0.92844033,67.077 + 33974: 15.025793,31.15189 + 33988: 21.07007,37.903137 - node: angle: 1.5707963267948966 rad color: '#FFFFFF7F' @@ -16800,17 +16764,6 @@ entities: id: grasssnow10 decals: 29900: -80.97317,28.02214 - - node: - color: '#FFFFFF7F' - id: grasssnow10 - decals: - 33947: -3.3132944,49.69276 - 33953: -1.0534403,64.40513 - 33957: -0.06906533,67.03013 - 33960: 2.7434347,67.03013 - 33973: 14.103918,30.96439 - 33984: 20.148195,37.418762 - 33989: 21.929445,38.403137 - node: color: '#FFFFFF7F' id: grasssnow10 @@ -16853,6 +16806,13 @@ entities: 33420: 12.867468,-29.786037 33651: 0.74470997,-13.807632 33922: 24.781582,26.00394 + 33947: -3.3132944,49.69276 + 33953: -1.0534403,64.40513 + 33957: -0.06906533,67.03013 + 33960: 2.7434347,67.03013 + 33973: 14.103918,30.96439 + 33984: 20.148195,37.418762 + 33989: 21.929445,38.403137 - node: angle: 1.5707963267948966 rad color: '#FFFFFF7F' @@ -17169,10 +17129,6 @@ entities: 33125: -96.999725,51.026855 33425: 14.429968,-28.864162 33923: 24.010748,26.135885 - - node: - color: '#FFFFFF7F' - id: grasssnow11 - decals: 33961: 1.5246847,67.17075 - node: angle: 1.5707963267948966 rad @@ -17382,10 +17338,6 @@ entities: 33118: -103.143196,42.244274 33335: -71.62793,43.732677 33352: 45.59363,-30.794807 - - node: - color: '#FFFFFF7F' - id: grasssnow12 - decals: 33993: 21.366945,37.137512 - node: angle: 0.4363323129985824 rad @@ -17567,11 +17519,6 @@ entities: decals: 29895: -83.6512,29.14714 29901: -81.06692,29.006516 - - node: - color: '#FFFFFF7F' - id: grasssnow13 - decals: - 33994: 21.804445,37.543762 - node: color: '#FFFFFF7F' id: grasssnow13 @@ -17617,6 +17564,7 @@ entities: 33159: -99.38901,44.251427 33337: -67.35749,40.67981 33348: 45.28113,-29.779182 + 33994: 21.804445,37.543762 - node: angle: 1.5707963267948966 rad color: '#FFFFFF7F' @@ -132063,6 +132011,13 @@ entities: - type: Transform pos: 18.764523,6.3330803 parent: 2 +- proto: CaptainDrobe + entities: + - uid: 17488 + components: + - type: Transform + pos: 18.5,-9.5 + parent: 2 - proto: CaptainIDCard entities: - uid: 13729 @@ -159087,13 +159042,6 @@ entities: - type: Transform pos: 43.5,28.5 parent: 41263 -- proto: DresserCaptainFilled - entities: - - uid: 17488 - components: - - type: Transform - pos: 18.5,-9.5 - parent: 2 - proto: DresserChiefEngineerFilled entities: - uid: 17489 @@ -160295,13 +160243,6 @@ entities: - type: Transform pos: 13.361622,37.857277 parent: 2 -- proto: DungeonMasterCircuitBoard - entities: - - uid: 17660 - components: - - type: Transform - pos: 0.3986317,11.512893 - parent: 2 - proto: EggBoxBroken entities: - uid: 17661 @@ -172860,7 +172801,7 @@ entities: rot: -1.5707963267948966 rad pos: 58.5,39.5 parent: 41263 -- proto: FloraGreyStalagmite1 +- proto: FloraGreyStalagmite entities: - uid: 18990 components: @@ -172933,18 +172874,6 @@ entities: - type: Transform pos: -24.818995,68.5339 parent: 2 - - uid: 42843 - components: - - type: Transform - pos: 23.331152,59.555054 - parent: 41263 - - uid: 46670 - components: - - type: Transform - pos: 2.9027252,16.723743 - parent: 46021 -- proto: FloraGreyStalagmite2 - entities: - uid: 19004 components: - type: Transform @@ -173088,38 +173017,6 @@ entities: rot: 3.141592653589793 rad pos: -31.385712,46.401 parent: 2 - - uid: 42844 - components: - - type: Transform - pos: 34.905663,45.504845 - parent: 41263 - - uid: 46671 - components: - - type: Transform - pos: -2.15423,15.014379 - parent: 46021 - - uid: 46672 - components: - - type: Transform - pos: -3.4250636,15.896323 - parent: 46021 - - uid: 46673 - components: - - type: Transform - pos: -2.7931192,15.243546 - parent: 46021 - - uid: 46674 - components: - - type: Transform - pos: -4.0014524,16.597712 - parent: 46021 - - uid: 46675 - components: - - type: Transform - pos: 0.73605835,15.202909 - parent: 46021 -- proto: FloraGreyStalagmite3 - entities: - uid: 19032 components: - type: Transform @@ -173268,23 +173165,6 @@ entities: - type: Transform pos: -97.79074,45.386734 parent: 2 - - uid: 42845 - components: - - type: Transform - pos: 20.475252,51.434723 - parent: 41263 - - uid: 42846 - components: - - type: Transform - pos: 35.327538,45.73922 - parent: 41263 - - uid: 46676 - components: - - type: Transform - pos: 1.6735585,16.161243 - parent: 46021 -- proto: FloraGreyStalagmite4 - entities: - uid: 19061 components: - type: Transform @@ -173452,28 +173332,6 @@ entities: - type: Transform pos: -97.462616,45.542984 parent: 2 - - uid: 42847 - components: - - type: Transform - pos: 23.456152,59.60193 - parent: 41263 - - uid: 42848 - components: - - type: Transform - pos: 31.564457,56.39302 - parent: 41263 - - uid: 42849 - components: - - type: Transform - pos: 34.608788,45.661095 - parent: 41263 - - uid: 46677 - components: - - type: Transform - pos: -1.3150636,15.209854 - parent: 46021 -- proto: FloraGreyStalagmite5 - entities: - uid: 19093 components: - type: Transform @@ -173645,33 +173503,6 @@ entities: - type: Transform pos: -53.606304,25.29044 parent: 2 - - uid: 42850 - components: - - type: Transform - pos: 31.423832,56.61177 - parent: 41263 - - uid: 46678 - components: - - type: Transform - pos: -3.1958969,16.132435 - parent: 46021 - - uid: 46679 - components: - - type: Transform - pos: -3.0431192,15.50049 - parent: 46021 - - uid: 46680 - components: - - type: Transform - pos: 2.5173085,16.307076 - parent: 46021 - - uid: 46681 - components: - - type: Transform - pos: 0.9756417,15.859159 - parent: 46021 -- proto: FloraGreyStalagmite6 - entities: - uid: 19126 components: - type: Transform @@ -173848,11 +173679,111 @@ entities: rot: 3.141592653589793 rad pos: -31.432587,46.5885 parent: 2 + - uid: 42843 + components: + - type: Transform + pos: 23.331152,59.555054 + parent: 41263 + - uid: 42844 + components: + - type: Transform + pos: 34.905663,45.504845 + parent: 41263 + - uid: 42845 + components: + - type: Transform + pos: 20.475252,51.434723 + parent: 41263 + - uid: 42846 + components: + - type: Transform + pos: 35.327538,45.73922 + parent: 41263 + - uid: 42847 + components: + - type: Transform + pos: 23.456152,59.60193 + parent: 41263 + - uid: 42848 + components: + - type: Transform + pos: 31.564457,56.39302 + parent: 41263 + - uid: 42849 + components: + - type: Transform + pos: 34.608788,45.661095 + parent: 41263 + - uid: 42850 + components: + - type: Transform + pos: 31.423832,56.61177 + parent: 41263 - uid: 42851 components: - type: Transform pos: 20.490877,51.512848 parent: 41263 + - uid: 46670 + components: + - type: Transform + pos: 2.9027252,16.723743 + parent: 46021 + - uid: 46671 + components: + - type: Transform + pos: -2.15423,15.014379 + parent: 46021 + - uid: 46672 + components: + - type: Transform + pos: -3.4250636,15.896323 + parent: 46021 + - uid: 46673 + components: + - type: Transform + pos: -2.7931192,15.243546 + parent: 46021 + - uid: 46674 + components: + - type: Transform + pos: -4.0014524,16.597712 + parent: 46021 + - uid: 46675 + components: + - type: Transform + pos: 0.73605835,15.202909 + parent: 46021 + - uid: 46676 + components: + - type: Transform + pos: 1.6735585,16.161243 + parent: 46021 + - uid: 46677 + components: + - type: Transform + pos: -1.3150636,15.209854 + parent: 46021 + - uid: 46678 + components: + - type: Transform + pos: -3.1958969,16.132435 + parent: 46021 + - uid: 46679 + components: + - type: Transform + pos: -3.0431192,15.50049 + parent: 46021 + - uid: 46680 + components: + - type: Transform + pos: 2.5173085,16.307076 + parent: 46021 + - uid: 46681 + components: + - type: Transform + pos: 0.9756417,15.859159 + parent: 46021 - uid: 46682 components: - type: Transform @@ -173923,7 +173854,7 @@ entities: - type: Transform pos: -2.871292,15.584854 parent: 46021 -- proto: FloraRockSolid01 +- proto: FloraRockSolid entities: - uid: 19160 components: @@ -173977,26 +173908,6 @@ entities: - type: Transform pos: -38.9414,-62.758217 parent: 2 - - uid: 46696 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.1647723,-14.46128 - parent: 46021 - - uid: 46697 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -12.793405,-0.03288406 - parent: 46021 - - uid: 46698 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -5.435548,18.587032 - parent: 46021 -- proto: FloraRockSolid02 - entities: - uid: 19170 components: - type: Transform @@ -174022,26 +173933,6 @@ entities: - type: Transform pos: -39.41015,-62.406654 parent: 2 - - uid: 46699 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -10.060729,14.309612 - parent: 46021 - - uid: 46700 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 9.304405,14.12389 - parent: 46021 - - uid: 46701 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 17.583126,-1.1800494 - parent: 46021 -- proto: FloraRockSolid03 - entities: - uid: 19175 components: - type: Transform @@ -174099,6 +173990,42 @@ entities: rot: 1.5707963267948966 rad pos: -92.49116,20.613113 parent: 2 + - uid: 46696 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.1647723,-14.46128 + parent: 46021 + - uid: 46697 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.793405,-0.03288406 + parent: 46021 + - uid: 46698 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.435548,18.587032 + parent: 46021 + - uid: 46699 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.060729,14.309612 + parent: 46021 + - uid: 46700 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.304405,14.12389 + parent: 46021 + - uid: 46701 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.583126,-1.1800494 + parent: 46021 - uid: 46702 components: - type: Transform @@ -174111,7 +174038,7 @@ entities: rot: 3.141592653589793 rad pos: -11.457189,8.426202 parent: 46021 -- proto: FloraStalagmite1 +- proto: FloraStalagmite entities: - uid: 19186 components: @@ -174191,23 +174118,6 @@ entities: - type: Transform pos: -101.00443,45.692207 parent: 2 - - uid: 42852 - components: - - type: Transform - pos: 18.602024,44.66945 - parent: 41263 - - uid: 42853 - components: - - type: Transform - pos: 26.86792,45.48922 - parent: 41263 - - uid: 42854 - components: - - type: Transform - pos: 38.547604,51.595234 - parent: 41263 -- proto: FloraStalagmite2 - entities: - uid: 19201 components: - type: Transform @@ -174291,33 +174201,6 @@ entities: - type: Transform pos: -96.53568,51.379707 parent: 2 - - uid: 42855 - components: - - type: Transform - pos: 18.945774,44.41945 - parent: 41263 - - uid: 42856 - components: - - type: Transform - pos: 28.571045,50.528847 - parent: 41263 - - uid: 42857 - components: - - type: Transform - pos: 22.393652,53.711304 - parent: 41263 - - uid: 42858 - components: - - type: Transform - pos: 26.39917,45.473595 - parent: 41263 - - uid: 42859 - components: - - type: Transform - pos: 38.360104,51.251484 - parent: 41263 -- proto: FloraStalagmite3 - entities: - uid: 19217 components: - type: Transform @@ -174413,13 +174296,6 @@ entities: - type: Transform pos: -34.453922,63.72381 parent: 2 - - uid: 42860 - components: - - type: Transform - pos: 16.490875,49.686523 - parent: 41263 -- proto: FloraStalagmite4 - entities: - uid: 19235 components: - type: Transform @@ -174501,8 +174377,6 @@ entities: - type: Transform pos: -85.55982,67.215515 parent: 2 -- proto: FloraStalagmite5 - entities: - uid: 19250 components: - type: Transform @@ -174581,23 +174455,6 @@ entities: - type: Transform pos: -85.30982,67.090515 parent: 2 - - uid: 42861 - components: - - type: Transform - pos: 28.43042,50.810097 - parent: 41263 - - uid: 42862 - components: - - type: Transform - pos: 22.612402,53.60193 - parent: 41263 - - uid: 42863 - components: - - type: Transform - pos: 17.352024,53.821056 - parent: 41263 -- proto: FloraStalagmite6 - entities: - uid: 19265 components: - type: Transform @@ -174693,20 +174550,78 @@ entities: - type: Transform pos: -96.53568,51.629707 parent: 2 + - uid: 42852 + components: + - type: Transform + pos: 18.602024,44.66945 + parent: 41263 + - uid: 42853 + components: + - type: Transform + pos: 26.86792,45.48922 + parent: 41263 + - uid: 42854 + components: + - type: Transform + pos: 38.547604,51.595234 + parent: 41263 + - uid: 42855 + components: + - type: Transform + pos: 18.945774,44.41945 + parent: 41263 + - uid: 42856 + components: + - type: Transform + pos: 28.571045,50.528847 + parent: 41263 + - uid: 42857 + components: + - type: Transform + pos: 22.393652,53.711304 + parent: 41263 + - uid: 42858 + components: + - type: Transform + pos: 26.39917,45.473595 + parent: 41263 + - uid: 42859 + components: + - type: Transform + pos: 38.360104,51.251484 + parent: 41263 + - uid: 42860 + components: + - type: Transform + pos: 16.490875,49.686523 + parent: 41263 + - uid: 42861 + components: + - type: Transform + pos: 28.43042,50.810097 + parent: 41263 + - uid: 42862 + components: + - type: Transform + pos: 22.612402,53.60193 + parent: 41263 + - uid: 42863 + components: + - type: Transform + pos: 17.352024,53.821056 + parent: 41263 - uid: 42864 components: - type: Transform pos: 16.834625,49.38965 parent: 41263 -- proto: FloraTree03 +- proto: FloraTree entities: - uid: 42865 components: - type: Transform pos: 48.13744,72.03712 parent: 41263 -- proto: FloraTree04 - entities: - uid: 42866 components: - type: Transform @@ -174717,8 +174632,14 @@ entities: - type: Transform pos: 51.090565,68.58399 parent: 41263 -- proto: FloraTreeConifer01 +- proto: FloraTreeConifer entities: + - uid: 19283 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.0007944,49.72401 + parent: 2 - uid: 19284 components: - type: Transform @@ -174946,8 +174867,6 @@ entities: - type: Transform pos: -13.295714,-27.691767 parent: 2 -- proto: FloraTreeConifer02 - entities: - uid: 19328 components: - type: Transform @@ -175245,14 +175164,6 @@ entities: - type: Transform pos: -111.79667,41.53836 parent: 2 -- proto: FloraTreeConifer03 - entities: - - uid: 19283 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.0007944,49.72401 - parent: 2 - uid: 19386 components: - type: Transform @@ -175594,7 +175505,7 @@ entities: - type: Transform pos: -110.41386,53.5618 parent: 2 -- proto: FloraTreeSnow01 +- proto: FloraTreeSnow entities: - uid: 19452 components: @@ -175695,76 +175606,6 @@ entities: - type: Transform pos: -39.136925,74.5426 parent: 2 - - uid: 42868 - components: - - type: Transform - pos: 35.461685,25.972685 - parent: 41263 - - uid: 42869 - components: - - type: Transform - pos: 45.441742,36.27958 - parent: 41263 - - uid: 42870 - components: - - type: Transform - pos: 41.364914,39.217342 - parent: 41263 - - uid: 42871 - components: - - type: Transform - pos: 82.886475,33.7469 - parent: 41263 - - uid: 46704 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -10.482787,-8.363316 - parent: 46021 - - uid: 46705 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -7.515173,-12.550816 - parent: 46021 - - uid: 46706 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.546423,-10.441441 - parent: 46021 - - uid: 46707 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -6.8862715,-14.740809 - parent: 46021 - - uid: 46708 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.613717,-15.459559 - parent: 46021 - - uid: 46709 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 18.317617,-0.6030139 - parent: 46021 - - uid: 46710 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 15.959325,8.089431 - parent: 46021 - - uid: 46711 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -9.798578,15.1384 - parent: 46021 -- proto: FloraTreeSnow02 - entities: - uid: 19470 components: - type: Transform @@ -175817,34 +175658,6 @@ entities: - type: Transform pos: -84.178604,-13.843458 parent: 2 - - uid: 42872 - components: - - type: Transform - pos: 27.656998,32.331406 - parent: 41263 - - uid: 42873 - components: - - type: Transform - pos: 39.50061,24.062729 - parent: 41263 - - uid: 42874 - components: - - type: Transform - pos: 40.66179,43.436092 - parent: 41263 - - uid: 42875 - components: - - type: Transform - pos: 80.0271,39.44221 - parent: 41263 - - uid: 46712 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.6699524,-15.2067795 - parent: 46021 -- proto: FloraTreeSnow03 - entities: - uid: 19480 components: - type: Transform @@ -175962,64 +175775,6 @@ entities: rot: 3.141592653589793 rad pos: -38.907673,-73.38629 parent: 2 - - uid: 42876 - components: - - type: Transform - pos: 26.930435,34.675156 - parent: 41263 - - uid: 42877 - components: - - type: Transform - pos: 40.091255,29.652372 - parent: 41263 - - uid: 42878 - components: - - type: Transform - pos: 37.770393,40.55935 - parent: 41263 - - uid: 42879 - components: - - type: Transform - pos: 29.976799,36.357967 - parent: 41263 - - uid: 42880 - components: - - type: Transform - pos: 44.046707,42.08844 - parent: 41263 - - uid: 42881 - components: - - type: Transform - pos: 77.65142,29.880468 - parent: 41263 - - uid: 42882 - components: - - type: Transform - pos: 82.34077,41.155254 - parent: 41263 - - uid: 42883 - components: - - type: Transform - pos: 73.45946,31.62696 - parent: 41263 - - uid: 42884 - components: - - type: Transform - pos: 60.604717,29.297094 - parent: 41263 - - uid: 42885 - components: - - type: Transform - pos: 28.914082,40.18123 - parent: 41263 - - uid: 46713 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -0.050729156,-15.1911545 - parent: 46021 -- proto: FloraTreeSnow04 - entities: - uid: 19502 components: - type: Transform @@ -176175,41 +175930,6 @@ entities: - type: Transform pos: -118.64645,44.93149 parent: 2 - - uid: 42886 - components: - - type: Transform - pos: 46.438892,20.758368 - parent: 41263 - - uid: 42887 - components: - - type: Transform - pos: 58.75167,33.85061 - parent: 41263 - - uid: 42888 - components: - - type: Transform - pos: 56.40831,32.870625 - parent: 41263 - - uid: 46714 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 11.236332,-15.355529 - parent: 46021 - - uid: 46715 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 8.406036,12.064729 - parent: 46021 - - uid: 46716 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.286016,17.132244 - parent: 46021 -- proto: FloraTreeSnow05 - entities: - uid: 19531 components: - type: Transform @@ -176320,43 +176040,6 @@ entities: - type: Transform pos: -115.621185,40.81054 parent: 2 - - uid: 42889 - components: - - type: Transform - pos: 48.876392,19.492743 - parent: 41263 - - uid: 42890 - components: - - type: Transform - pos: 51.47974,31.558582 - parent: 41263 - - uid: 42891 - components: - - type: Transform - pos: 34.17211,37.061092 - parent: 41263 - - uid: 42892 - components: - - type: Transform - pos: 61.517296,38.374046 - parent: 41263 - - uid: 42893 - components: - - type: Transform - pos: 69.596664,23.876787 - parent: 41263 - - uid: 42894 - components: - - type: Transform - pos: 84.49702,39.538067 - parent: 41263 - - uid: 42895 - components: - - type: Transform - pos: 70.69383,44.77529 - parent: 41263 -- proto: FloraTreeSnow06 - entities: - uid: 19552 components: - type: Transform @@ -176469,6 +176152,146 @@ entities: - type: Transform pos: -114.66025,51.4746 parent: 2 + - uid: 42868 + components: + - type: Transform + pos: 35.461685,25.972685 + parent: 41263 + - uid: 42869 + components: + - type: Transform + pos: 45.441742,36.27958 + parent: 41263 + - uid: 42870 + components: + - type: Transform + pos: 41.364914,39.217342 + parent: 41263 + - uid: 42871 + components: + - type: Transform + pos: 82.886475,33.7469 + parent: 41263 + - uid: 42872 + components: + - type: Transform + pos: 27.656998,32.331406 + parent: 41263 + - uid: 42873 + components: + - type: Transform + pos: 39.50061,24.062729 + parent: 41263 + - uid: 42874 + components: + - type: Transform + pos: 40.66179,43.436092 + parent: 41263 + - uid: 42875 + components: + - type: Transform + pos: 80.0271,39.44221 + parent: 41263 + - uid: 42876 + components: + - type: Transform + pos: 26.930435,34.675156 + parent: 41263 + - uid: 42877 + components: + - type: Transform + pos: 40.091255,29.652372 + parent: 41263 + - uid: 42878 + components: + - type: Transform + pos: 37.770393,40.55935 + parent: 41263 + - uid: 42879 + components: + - type: Transform + pos: 29.976799,36.357967 + parent: 41263 + - uid: 42880 + components: + - type: Transform + pos: 44.046707,42.08844 + parent: 41263 + - uid: 42881 + components: + - type: Transform + pos: 77.65142,29.880468 + parent: 41263 + - uid: 42882 + components: + - type: Transform + pos: 82.34077,41.155254 + parent: 41263 + - uid: 42883 + components: + - type: Transform + pos: 73.45946,31.62696 + parent: 41263 + - uid: 42884 + components: + - type: Transform + pos: 60.604717,29.297094 + parent: 41263 + - uid: 42885 + components: + - type: Transform + pos: 28.914082,40.18123 + parent: 41263 + - uid: 42886 + components: + - type: Transform + pos: 46.438892,20.758368 + parent: 41263 + - uid: 42887 + components: + - type: Transform + pos: 58.75167,33.85061 + parent: 41263 + - uid: 42888 + components: + - type: Transform + pos: 56.40831,32.870625 + parent: 41263 + - uid: 42889 + components: + - type: Transform + pos: 48.876392,19.492743 + parent: 41263 + - uid: 42890 + components: + - type: Transform + pos: 51.47974,31.558582 + parent: 41263 + - uid: 42891 + components: + - type: Transform + pos: 34.17211,37.061092 + parent: 41263 + - uid: 42892 + components: + - type: Transform + pos: 61.517296,38.374046 + parent: 41263 + - uid: 42893 + components: + - type: Transform + pos: 69.596664,23.876787 + parent: 41263 + - uid: 42894 + components: + - type: Transform + pos: 84.49702,39.538067 + parent: 41263 + - uid: 42895 + components: + - type: Transform + pos: 70.69383,44.77529 + parent: 41263 - uid: 42896 components: - type: Transform @@ -176489,6 +176312,84 @@ entities: - type: Transform pos: 78.260796,25.778906 parent: 41263 + - uid: 46704 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.482787,-8.363316 + parent: 46021 + - uid: 46705 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.515173,-12.550816 + parent: 46021 + - uid: 46706 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.546423,-10.441441 + parent: 46021 + - uid: 46707 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.8862715,-14.740809 + parent: 46021 + - uid: 46708 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.613717,-15.459559 + parent: 46021 + - uid: 46709 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.317617,-0.6030139 + parent: 46021 + - uid: 46710 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 15.959325,8.089431 + parent: 46021 + - uid: 46711 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.798578,15.1384 + parent: 46021 + - uid: 46712 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.6699524,-15.2067795 + parent: 46021 + - uid: 46713 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.050729156,-15.1911545 + parent: 46021 + - uid: 46714 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.236332,-15.355529 + parent: 46021 + - uid: 46715 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.406036,12.064729 + parent: 46021 + - uid: 46716 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.286016,17.132244 + parent: 46021 - uid: 46717 components: - type: Transform @@ -178766,6 +178667,13 @@ entities: rot: 1.5707963267948966 rad pos: -11.5,41.5 parent: 2 +- proto: GameMasterCircuitBoard + entities: + - uid: 17660 + components: + - type: Transform + pos: 0.3986317,11.512893 + parent: 2 - proto: Garlands entities: - uid: 19817 @@ -215518,7 +215426,7 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: LightTree01 +- proto: LightTree entities: - uid: 24300 components: @@ -215542,8 +215450,6 @@ entities: - type: Transform pos: -34.833126,69.374954 parent: 2 -- proto: LightTree02 - entities: - uid: 24304 components: - type: MetaData @@ -215579,8 +215485,6 @@ entities: rot: 1.5707963267948966 rad pos: -66.46024,13.412575 parent: 2 -- proto: LightTree03 - entities: - uid: 24310 components: - type: Transform @@ -215593,8 +215497,6 @@ entities: rot: -1.5707963267948966 rad pos: -36.436974,41.125042 parent: 2 -- proto: LightTree04 - entities: - uid: 24312 components: - type: Transform @@ -215637,8 +215539,6 @@ entities: - type: Transform pos: -42.114376,70.437454 parent: 2 -- proto: LightTree05 - entities: - uid: 24320 components: - type: Transform @@ -215661,8 +215561,6 @@ entities: - type: Transform pos: 63.373383,19.394375 parent: 2 -- proto: LightTree06 - entities: - uid: 24324 components: - type: Transform @@ -258032,6 +257930,13 @@ entities: - type: Transform pos: 7.5,37.5 parent: 2 +- proto: VendingMachinePride + entities: + - uid: 48025 + components: + - type: Transform + pos: 36.5,25.5 + parent: 2 - proto: VendingMachineRestockBooze entities: - uid: 29310 diff --git a/Resources/Maps/Next/next_marathon.yml b/Resources/Maps/Next/next_marathon.yml index a6ad4633a4a..d794c173b49 100644 --- a/Resources/Maps/Next/next_marathon.yml +++ b/Resources/Maps/Next/next_marathon.yml @@ -1981,19 +1981,13 @@ entities: 232: -49,40 245: -34,57 246: -31,59 - 697: 53,19 - 698: 53,20 - - node: - cleanable: True - zIndex: 1 - color: '#FFFFFFFF' - id: DirtHeavy - decals: 401: -26,29 402: -33,32 403: -28,32 404: -28,31 405: -31,30 + 697: 53,19 + 698: 53,20 828: -76,-57 829: -76,-56 830: -77,-55 @@ -2050,22 +2044,6 @@ entities: 260: -40,42 262: -48,42 263: -37,40 - 641: -19,-44 - 642: -17,-42 - 643: -19,-42 - 644: -23,-43 - 645: -4,-41 - 646: 1,-40 - 647: 0,-39 - 648: 2,-39 - 649: 1,-34 - 650: 1,-31 - 693: 43,22 - 694: 45,22 - 695: 52,19 - 696: 51,20 - 699: 50,19 - 705: 45,23 411: -32,30 412: -27,30 413: -26,31 @@ -2077,11 +2055,27 @@ entities: 419: -32,27 420: -26,28 421: -33,27 + 641: -19,-44 + 642: -17,-42 + 643: -19,-42 + 644: -23,-43 + 645: -4,-41 + 646: 1,-40 + 647: 0,-39 + 648: 2,-39 + 649: 1,-34 + 650: 1,-31 682: 20,-11 683: 21,-10 684: 17,-11 685: 17,-12 686: 19,-8 + 693: 43,22 + 694: 45,22 + 695: 52,19 + 696: 51,20 + 699: 50,19 + 705: 45,23 838: -78,-53 839: -76,-53 840: -78,-56 @@ -2186,10 +2180,16 @@ entities: 244: -35,58 253: -36,54 261: -48,41 + 406: -27,29 + 407: -26,30 + 408: -30,30 + 409: -32,29 + 410: -31,32 637: 1,-39 638: -23,-44 639: -18,-42 640: -16,-41 + 681: 21,-11 691: 46,23 692: 43,21 700: 52,19 @@ -2197,12 +2197,6 @@ entities: 702: 46,23 703: 46,22 704: 44,23 - 406: -27,29 - 407: -26,30 - 408: -30,30 - 409: -32,29 - 410: -31,32 - 681: 21,-11 832: -78,-54 833: -79,-55 834: -79,-53 @@ -6433,18 +6427,18 @@ entities: 2: 34952 6,-6: 2: 61440 - 6: 224 + 4: 224 6,-5: 0: 112 2: 2184 6,-8: 3: 224 - 4: 57344 - 6,-7: - 4: 224 5: 57344 + 6,-7: + 5: 224 + 6: 57344 6,-9: - 4: 57568 + 5: 57568 7,-5: 2: 4080 7,-8: @@ -6876,7 +6870,7 @@ entities: 3,16: 2: 242 12,11: - 4: 2 + 5: 2 14,9: 2: 39304 0: 17476 @@ -7548,7 +7542,7 @@ entities: temperature: 293.15 moles: - 0 - - 0 + - 6666.982 - 0 - 0 - 0 @@ -7562,7 +7556,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 6666.982 + - 0 - 0 - 0 - 0 @@ -7577,7 +7571,6 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 - 6666.982 - 0 - 0 @@ -7589,6 +7582,7 @@ entities: - 0 - 0 - 0 + - 0 chunkSize: 4 - type: BecomesStation id: NextMarathon @@ -11565,7 +11559,7 @@ entities: pos: 34.5,45.5 parent: 30 - type: Door - secondsUntilStateChange: -3847.4316 + secondsUntilStateChange: -3902.6897 state: Opening - type: DeviceLinkSource lastSignals: @@ -44375,6 +44369,13 @@ entities: - type: Transform pos: 2.6220274,21.009964 parent: 30 +- proto: CaptainDrobe + entities: + - uid: 4989 + components: + - type: Transform + pos: -17.5,30.5 + parent: 30 - proto: CarbonDioxideCanister entities: - uid: 8772 @@ -61543,13 +61544,6 @@ entities: - type: Transform pos: -29.5,-45.5 parent: 30 -- proto: DresserCaptainFilled - entities: - - uid: 4989 - components: - - type: Transform - pos: -17.5,30.5 - parent: 30 - proto: DresserChiefEngineerFilled entities: - uid: 10741 @@ -121012,6 +121006,13 @@ entities: rot: -1.5707963267948966 rad pos: -27.5,5.5 parent: 30 +- proto: SpawnMobGorillaLargo + entities: + - uid: 8383 + components: + - type: Transform + pos: 26.5,1.5 + parent: 30 - proto: SpawnMobKangarooWillow entities: - uid: 10987 @@ -121070,13 +121071,6 @@ entities: - type: Transform pos: -22.5,-5.5 parent: 30 -- proto: SpawnMobRaccoonMorticia - entities: - - uid: 8383 - components: - - type: Transform - pos: 26.5,1.5 - parent: 30 - proto: SpawnMobShiva entities: - uid: 4405 @@ -128274,6 +128268,13 @@ entities: - type: Transform pos: -28.5,13.5 parent: 30 +- proto: VendingMachinePride + entities: + - uid: 21387 + components: + - type: Transform + pos: 2.5,6.5 + parent: 30 - proto: VendingMachineRoboDrobe entities: - uid: 12778 diff --git a/Resources/Maps/Next/next_maus.yml b/Resources/Maps/Next/next_maus.yml index 8d739f4384d..5f3e9e3904c 100644 --- a/Resources/Maps/Next/next_maus.yml +++ b/Resources/Maps/Next/next_maus.yml @@ -62078,15 +62078,6 @@ entities: - type: Transform pos: -61.4215,-26.052023 parent: 2 -- proto: DungeonMasterCircuitBoard - entities: - - uid: 19007 - components: - - type: Transform - parent: 19000 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: EmergencyLight entities: - uid: 771 @@ -66463,7 +66454,7 @@ entities: rot: -0.9599310885968813 rad pos: -6.925659,1.9904461 parent: 17265 -- proto: FloraStalagmite4 +- proto: FloraStalagmite entities: - uid: 7216 components: @@ -66478,7 +66469,7 @@ entities: - type: Transform pos: -49.19194,-17.961992 parent: 2 -- proto: FloraTreeConifer02 +- proto: FloraTreeConifer entities: - uid: 450 components: @@ -66490,31 +66481,27 @@ entities: - type: Transform pos: -32.562675,-77.786354 parent: 2 -- proto: FloraTreeSnow01 +- proto: FloraTreeSnow entities: - - uid: 10267 + - uid: 449 components: - type: Transform - pos: -70.04553,-26.336075 + pos: -32.149952,-42.162617 parent: 2 -- proto: FloraTreeSnow02 - entities: - - uid: 14214 + - uid: 10267 components: - type: Transform - pos: -35.517467,4.708497 + pos: -70.04553,-26.336075 parent: 2 -- proto: FloraTreeSnow03 - entities: - - uid: 449 + - uid: 14213 components: - type: Transform - pos: -32.149952,-42.162617 + pos: -32.061207,3.883422 parent: 2 - - uid: 14213 + - uid: 14214 components: - type: Transform - pos: -32.061207,3.883422 + pos: -35.517467,4.708497 parent: 2 - proto: FoamBlade entities: @@ -67368,6 +67355,15 @@ entities: - type: Transform pos: -49.5,-38.5 parent: 2 +- proto: GameMasterCircuitBoard + entities: + - uid: 19007 + components: + - type: Transform + parent: 19000 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: Garlands entities: - uid: 4788 @@ -92788,26 +92784,22 @@ entities: rot: -0.8726646259971648 rad pos: -37.862,-17.65678 parent: 2 -- proto: LightTree03 +- proto: LightTree entities: - uid: 446 components: - type: Transform pos: -31.997433,-42.791363 parent: 2 -- proto: LightTree04 - entities: - - uid: 14218 + - uid: 11560 components: - type: Transform - pos: -7.647705,-25.998001 + pos: -35.963203,-42.434574 parent: 2 -- proto: LightTree05 - entities: - - uid: 11560 + - uid: 14218 components: - type: Transform - pos: -35.963203,-42.434574 + pos: -7.647705,-25.998001 parent: 2 - proto: LightTubeCrystalBlue entities: @@ -118874,6 +118866,13 @@ entities: - type: Transform pos: -39.5,-30.5 parent: 2 +- proto: VendingMachinePride + entities: + - uid: 3142 + components: + - type: Transform + pos: -31.5,-39.5 + parent: 2 - proto: VendingMachineRoboDrobe entities: - uid: 12630 diff --git a/Resources/Maps/Next/next_omega.yml b/Resources/Maps/Next/next_omega.yml index 078e6b20744..086546a6fc6 100644 --- a/Resources/Maps/Next/next_omega.yml +++ b/Resources/Maps/Next/next_omega.yml @@ -1118,19 +1118,17 @@ entities: color: '#FFFFFFFF' id: Dirt decals: - 2025: -42,-18 1030: -44,-28 1031: -45,-29 1032: -43,-27 1033: -44,-30 + 2025: -42,-18 - node: cleanable: True zIndex: 1 color: '#FFFFFFFF' id: DirtHeavy decals: - 2026: -41,-18 - 2027: -40,-19 801: 7,-33 802: 8,-32 809: 5,-39 @@ -1143,14 +1141,8 @@ entities: 1537: -47,-8 1538: -47,-7 1539: -47,-10 - 2510: -51,-16 - 2511: -49,-18 - 2512: -49,-16 - 2513: -51,-18 - 2514: -51,-17 - 2515: -49,-17 - 2516: -49,-16 - 2520: -49,-5 + 2026: -41,-18 + 2027: -40,-19 2478: -48,0 2479: -50,1 2480: -57,3 @@ -1159,6 +1151,14 @@ entities: 2483: -54,0 2494: -54,6 2495: -55,8 + 2510: -51,-16 + 2511: -49,-18 + 2512: -49,-16 + 2513: -51,-18 + 2514: -51,-17 + 2515: -49,-17 + 2516: -49,-16 + 2520: -49,-5 - node: cleanable: True zIndex: 1 @@ -1184,14 +1184,6 @@ entities: color: '#FFFFFFFF' id: DirtLight decals: - 2028: -40,-18 - 910: 20,27 - 911: 19,26 - 912: 17,26 - 913: 16,24 - 914: 16,30 - 915: 17,32 - 916: 16,35 804: 8,-34 805: 8,-36 806: 13,-39 @@ -1227,6 +1219,13 @@ entities: 843: -6,-28 844: -6,-33 845: -11,-38 + 910: 20,27 + 911: 19,26 + 912: 17,26 + 913: 16,24 + 914: 16,30 + 915: 17,32 + 916: 16,35 1536: -47,-9 1543: -46,-13 1544: -45,-12 @@ -1238,6 +1237,7 @@ entities: 1550: -46,-7 1551: -45,-6 1552: -40,-6 + 2028: -40,-18 2517: -50,-16 2518: -50,-18 2519: -51,-16 @@ -1247,11 +1247,11 @@ entities: color: '#FFFFFFFF' id: DirtMedium decals: - 2031: -41,-19 803: 8,-33 1540: -46,-10 1541: -46,-9 1542: -46,-12 + 2031: -41,-19 - node: color: '#FFFFFFFF' id: FlowersBROne @@ -4470,7 +4470,7 @@ entities: 4: 2184 -13,4: 3: 2184 - 6: 546 + 5: 546 -12,5: 0: 1 1: 3856 @@ -4479,7 +4479,7 @@ entities: -11,5: 1: 784 -11,4: - 5: 546 + 6: 546 -11,6: 0: 49152 -11,3: @@ -4809,9 +4809,9 @@ entities: temperature: 293.15 moles: - 0 - - 6666.982 - 0 - 0 + - 6666.982 - 0 - 0 - 0 @@ -4824,9 +4824,9 @@ entities: temperature: 293.15 moles: - 0 + - 6666.982 - 0 - 0 - - 6666.982 - 0 - 0 - 0 @@ -28191,6 +28191,13 @@ entities: - type: Transform pos: 7.5679626,-16.149172 parent: 4812 +- proto: CaptainDrobe + entities: + - uid: 7064 + components: + - type: Transform + pos: -12.5,29.5 + parent: 4812 - proto: CaptainIDCard entities: - uid: 2588 @@ -38448,13 +38455,6 @@ entities: - type: Transform pos: -26.5,-40.5 parent: 4812 -- proto: DresserCaptainFilled - entities: - - uid: 7064 - components: - - type: Transform - pos: -12.5,29.5 - parent: 4812 - proto: DresserChiefEngineerFilled entities: - uid: 12479 @@ -73584,6 +73584,13 @@ entities: - type: Transform pos: -15.5,22.5 parent: 4812 +- proto: SpawnMobGorillaLargo + entities: + - uid: 3281 + components: + - type: Transform + pos: 17.5,19.5 + parent: 4812 - proto: SpawnMobMcGriff entities: - uid: 12632 @@ -73617,13 +73624,6 @@ entities: - type: Transform pos: -19.5,-16.5 parent: 4812 -- proto: SpawnMobRaccoonMorticia - entities: - - uid: 3281 - components: - - type: Transform - pos: 17.5,19.5 - parent: 4812 - proto: SpawnMobShiva entities: - uid: 4808 @@ -78369,6 +78369,13 @@ entities: - type: Transform pos: 25.5,-32.5 parent: 4812 +- proto: VendingMachinePride + entities: + - uid: 13914 + components: + - type: Transform + pos: -5.5,10.5 + parent: 4812 - proto: VendingMachineRoboDrobe entities: - uid: 6223 diff --git a/Resources/Maps/Next/next_packed.yml b/Resources/Maps/Next/next_packed.yml index df18983bfc2..2a852bd1c8e 100644 --- a/Resources/Maps/Next/next_packed.yml +++ b/Resources/Maps/Next/next_packed.yml @@ -3065,20 +3065,24 @@ entities: color: '#FFFFFFFF' id: DirtHeavy decals: - 2895: 41,34 - 2901: 39,34 - 2906: 46,27 - 2922: 49,33 426: 40,-41 427: 40,-40 484: 31,-36 1485: 18,21 1507: 23,23 2260: 55,-15 + 2895: 41,34 + 2901: 39,34 + 2906: 46,27 + 2922: 49,33 2995: 54,32 2996: 53,37 2997: 58,36 + 3007: 59,34 + 3008: 59,38 3009: 58,32 + 3010: 59,32 + 3011: 59,40 3029: 38,22 3041: 54,47 3132: 58,31 @@ -3162,10 +3166,6 @@ entities: 5182: 5,-21 5253: 30,-26 5256: 30,-25 - 3010: 59,32 - 3011: 59,40 - 3007: 59,34 - 3008: 59,38 - node: cleanable: True zIndex: 1 @@ -3177,6 +3177,9 @@ entities: 2932: 37,19 2933: 38,17 3000: 55,34 + 3001: 54,35 + 3002: 56,38 + 3003: 54,39 3024: 37,31 3025: 40,30 3033: 59,36 @@ -3201,6 +3204,7 @@ entities: 3435: 6,31 3437: 8,30 3457: 6,23 + 3592: 4,40 3608: 4,38 3609: 6,37 3865: 70,-2 @@ -3281,22 +3285,12 @@ entities: 5184: 7,-19 5238: 31,-24 5254: 31,-26 - 3001: 54,35 - 3002: 56,38 - 3003: 54,39 - 3592: 4,40 - node: cleanable: True zIndex: 1 color: '#FFFFFFFF' id: DirtLight decals: - 2896: 39,35 - 2897: 41,36 - 2900: 41,33 - 2902: 39,36 - 2903: 40,34 - 2908: 49,35 429: 42,-41 430: 42,-40 431: 46,-41 @@ -3367,6 +3361,12 @@ entities: 2267: 57,-16 2268: 57,-15 2269: 57,-14 + 2896: 39,35 + 2897: 41,36 + 2900: 41,33 + 2902: 39,36 + 2903: 40,34 + 2908: 49,35 2935: 39,18 2982: 54,34 2983: 55,37 @@ -3382,6 +3382,8 @@ entities: 2993: 53,34 2994: 53,33 2999: 55,35 + 3004: 57,39 + 3006: 55,32 3012: 55,38 3013: 46,33 3015: 36,30 @@ -3489,18 +3491,12 @@ entities: 5210: 19,-37 5212: 19,-29 5236: 31,-25 - 3004: 57,39 - 3006: 55,32 - node: cleanable: True zIndex: 1 color: '#FFFFFFFF' id: DirtMedium decals: - 2891: 33,30 - 2898: 40,33 - 2899: 39,35 - 2918: 58,40 421: 38,-41 422: 39,-40 423: 45,-41 @@ -3518,6 +3514,10 @@ entities: 1506: 23,21 2261: 56,-14 2262: 55,-16 + 2891: 33,30 + 2898: 40,33 + 2899: 39,35 + 2918: 58,40 2936: 37,18 2975: 53,32 2976: 56,34 @@ -3526,6 +3526,9 @@ entities: 2979: 56,32 2981: 55,31 3019: 37,30 + 3020: 39,30 + 3021: 43,30 + 3022: 38,31 3023: 42,31 3043: 56,47 3291: 8,25 @@ -3589,9 +3592,6 @@ entities: 5211: 22,-36 5237: 31,-25 5257: 30,-24 - 3020: 39,30 - 3021: 43,30 - 3022: 38,31 - node: color: '#FFFFFFFF' id: FlowersBRThree @@ -33069,6 +33069,13 @@ entities: - type: Transform pos: 59.5,38.5 parent: 2 +- proto: CaptainDrobe + entities: + - uid: 10279 + components: + - type: Transform + pos: 37.5,40.5 + parent: 2 - proto: CaptainIDCard entities: - uid: 1255 @@ -43970,13 +43977,6 @@ entities: actions: !type:Container ents: - 5500 -- proto: DresserCaptainFilled - entities: - - uid: 10279 - components: - - type: Transform - pos: 37.5,40.5 - parent: 2 - proto: DresserChiefEngineerFilled entities: - uid: 7376 @@ -70747,13 +70747,6 @@ entities: - type: Transform pos: 30.5,12.5 parent: 2 -- proto: PottedPlant1 - entities: - - uid: 6619 - components: - - type: Transform - pos: 32.48526,-7.8502135 - parent: 2 - proto: PottedPlant19 entities: - uid: 2615 @@ -79757,6 +79750,13 @@ entities: - type: Transform pos: 31.5,41.5 parent: 2 +- proto: SpawnMobGorillaLargo + entities: + - uid: 14740 + components: + - type: Transform + pos: 5.5,15.5 + parent: 2 - proto: SpawnMobMcGriff entities: - uid: 2493 @@ -79822,13 +79822,6 @@ entities: - type: Transform pos: 73.5,-1.5 parent: 2 -- proto: SpawnMobRaccoonMorticia - entities: - - uid: 14740 - components: - - type: Transform - pos: 5.5,15.5 - parent: 2 - proto: SpawnMobShiva entities: - uid: 8444 @@ -84658,6 +84651,13 @@ entities: - type: Transform pos: 44.5,-4.5 parent: 2 +- proto: VendingMachinePride + entities: + - uid: 6619 + components: + - type: Transform + pos: 32.5,-7.5 + parent: 2 - proto: VendingMachineRoboDrobe entities: - uid: 5376 diff --git a/Resources/Maps/Next/next_paper.yml b/Resources/Maps/Next/next_paper.yml index 885d6136f51..088620ae6dd 100644 --- a/Resources/Maps/Next/next_paper.yml +++ b/Resources/Maps/Next/next_paper.yml @@ -41509,6 +41509,13 @@ entities: - type: Transform pos: 62.638855,49.326077 parent: 2 +- proto: CaptainDrobe + entities: + - uid: 7972 + components: + - type: Transform + pos: 25.5,20.5 + parent: 2 - proto: CaptainIDCard entities: - uid: 5714 @@ -55517,13 +55524,6 @@ entities: - type: Transform pos: 3.5,38.5 parent: 2 -- proto: DresserCaptainFilled - entities: - - uid: 7972 - components: - - type: Transform - pos: 25.5,20.5 - parent: 2 - proto: DresserChiefEngineerFilled entities: - uid: 7973 @@ -55858,7 +55858,7 @@ entities: - type: Label currentLabel: кофейный ликёр - type: PressurizedSolution - sprayFizzinessThresholdRoll: 0.46758845 + sprayFizzinessThresholdRoll: 0.6058455 - type: NameModifier baseName: бутылка кофейного ликёра - type: ContainerContainer @@ -56118,7 +56118,7 @@ entities: - type: Label currentLabel: ром - type: PressurizedSolution - sprayFizzinessThresholdRoll: 0.6627686 + sprayFizzinessThresholdRoll: 0.0023886226 - type: NameModifier baseName: кубинский пряный ром капитана Пита - type: ContainerContainer @@ -56160,7 +56160,7 @@ entities: - type: Label currentLabel: текила - type: PressurizedSolution - sprayFizzinessThresholdRoll: 0.81597775 + sprayFizzinessThresholdRoll: 0.7330376 - type: NameModifier baseName: бутылка текилы Каккаво гарантированного качества - type: ContainerContainer @@ -56201,7 +56201,7 @@ entities: - type: Label currentLabel: вермут - type: PressurizedSolution - sprayFizzinessThresholdRoll: 0.050000224 + sprayFizzinessThresholdRoll: 0.7837714 - type: NameModifier baseName: бутылка вермута Золотой глаз - type: ContainerContainer @@ -56224,7 +56224,7 @@ entities: - type: Label currentLabel: водка - type: PressurizedSolution - sprayFizzinessThresholdRoll: 0.18356583 + sprayFizzinessThresholdRoll: 0.6675811 - type: NameModifier baseName: бутылка водки - type: ContainerContainer @@ -56274,7 +56274,7 @@ entities: - type: Label currentLabel: вино - type: PressurizedSolution - sprayFizzinessThresholdRoll: 0.18143766 + sprayFizzinessThresholdRoll: 0.6887679 - type: NameModifier baseName: особое двухбородое бородатое вино - type: ContainerContainer @@ -59885,7 +59885,7 @@ entities: pos: 39.5,13.5 parent: 2 - type: Door - secondsUntilStateChange: -9009.188 + secondsUntilStateChange: -9122.892 state: Closing - type: DeviceNetwork deviceLists: @@ -108305,6 +108305,13 @@ entities: - type: Transform pos: 40.5,51.5 parent: 2 +- proto: VendingMachinePride + entities: + - uid: 8775 + components: + - type: Transform + pos: 14.5,42.5 + parent: 2 - proto: VendingMachineRestockChemVend entities: - uid: 15673 diff --git a/Resources/Maps/Next/next_pearl.yml b/Resources/Maps/Next/next_pearl.yml index 640bbbd0fe9..0aee57fa037 100644 --- a/Resources/Maps/Next/next_pearl.yml +++ b/Resources/Maps/Next/next_pearl.yml @@ -56538,6 +56538,13 @@ entities: - type: Transform pos: 47.417274,78.27045 parent: 1 +- proto: CaptainDrobe + entities: + - uid: 13159 + components: + - type: Transform + pos: 78.5,143.5 + parent: 1 - proto: CaptainIDCard entities: - uid: 1095 @@ -69978,13 +69985,6 @@ entities: - type: Transform pos: 89.5,21.5 parent: 1 -- proto: DresserCaptainFilled - entities: - - uid: 13159 - components: - - type: Transform - pos: 78.5,143.5 - parent: 1 - proto: DresserChiefEngineerFilled entities: - uid: 10989 @@ -141602,6 +141602,13 @@ entities: - type: Transform pos: 110.5,87.5 parent: 1 +- proto: VendingMachinePride + entities: + - uid: 23824 + components: + - type: Transform + pos: 117.5,103.5 + parent: 1 - proto: VendingMachineRoboDrobe entities: - uid: 15028 diff --git a/Resources/Maps/Next/next_pilgrim.yml b/Resources/Maps/Next/next_pilgrim.yml index b934649646d..29f870a8d64 100644 --- a/Resources/Maps/Next/next_pilgrim.yml +++ b/Resources/Maps/Next/next_pilgrim.yml @@ -37775,7 +37775,7 @@ entities: pos: -11.5,1.5 parent: 2 - type: Door - secondsUntilStateChange: -28877.414 + secondsUntilStateChange: -28919.738 state: Opening - type: DeviceLinkSource lastSignals: @@ -162562,6 +162562,8 @@ entities: pos: 110.00068,25.757057 parent: 2 - type: GhostRole + mindRoles: + - MindRoleGhostRoleNeutral description: Вы — голова. Это всё... Придумайте сами! name: Говорящая голова вульпканина - type: GhostTakeoverAvailable @@ -162783,7 +162785,7 @@ entities: pos: -18.5,-29.5 parent: 2 - type: Door - secondsUntilStateChange: -157062.89 + secondsUntilStateChange: -157105.22 state: Closing - uid: 9988 components: @@ -217597,6 +217599,13 @@ entities: - type: Transform pos: -24.5,-8.5 parent: 2 +- proto: VendingMachinePride + entities: + - uid: 21795 + components: + - type: Transform + pos: 5.5,-0.5 + parent: 2 - proto: VendingMachineRoboDrobe entities: - uid: 26630 @@ -290403,7 +290412,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -85884.25 + secondsUntilStateChange: -85926.57 state: Opening - type: Airlock autoClose: False diff --git a/Resources/Maps/Next/next_silly.yml b/Resources/Maps/Next/next_silly.yml index 682508516ea..1a94d98adfe 100644 --- a/Resources/Maps/Next/next_silly.yml +++ b/Resources/Maps/Next/next_silly.yml @@ -16546,6 +16546,13 @@ entities: - type: Transform pos: -27.398703,-9.212158 parent: 2 +- proto: CaptainDrobe + entities: + - uid: 2227 + components: + - type: Transform + pos: -2.5,1.5 + parent: 2 - proto: CaptainIDCard entities: - uid: 1438 @@ -22622,13 +22629,6 @@ entities: - type: Transform pos: -52.5,18.5 parent: 2 -- proto: DresserCaptainFilled - entities: - - uid: 2227 - components: - - type: Transform - pos: -2.5,1.5 - parent: 2 - proto: DresserChiefEngineerFilled entities: - uid: 2228 @@ -24513,7 +24513,7 @@ entities: - type: Transform pos: 4.5,40.5 parent: 2 -- proto: FloraRockSolid01 +- proto: FloraRockSolid entities: - uid: 2441 components: @@ -24540,8 +24540,6 @@ entities: - type: Transform pos: 15.976806,19.524523 parent: 2 -- proto: FloraRockSolid02 - entities: - uid: 2446 components: - type: Transform @@ -24572,8 +24570,6 @@ entities: - type: Transform pos: -31.601288,5.4406104 parent: 2 -- proto: FloraRockSolid03 - entities: - uid: 2452 components: - type: Transform @@ -24604,7 +24600,7 @@ entities: - type: Transform pos: -42.213253,23.096977 parent: 2 -- proto: FloraTree04 +- proto: FloraTree entities: - uid: 2458 components: @@ -24612,7 +24608,7 @@ entities: rot: 3.141592653589793 rad pos: 31.144978,-7.414804 parent: 2 -- proto: FloraTreeConifer01 +- proto: FloraTreeConifer entities: - uid: 2459 components: @@ -24640,20 +24636,6 @@ entities: rot: -1.5707963267948966 rad pos: -29.563026,15.907944 parent: 2 - - uid: 6136 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 20.506912,1.9241943 - parent: 5654 - - uid: 6137 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.539032,13.804901 - parent: 5654 -- proto: FloraTreeConifer02 - entities: - uid: 2464 components: - type: Transform @@ -24700,6 +24682,39 @@ entities: rot: -1.5707963267948966 rad pos: -32.778744,22.854723 parent: 2 + - uid: 2473 + components: + - type: Transform + pos: 25.955736,-21.06659 + parent: 2 + - uid: 2474 + components: + - type: Transform + pos: 18.575415,-19.02507 + parent: 2 + - uid: 2475 + components: + - type: Transform + pos: 20.615295,-22.508595 + parent: 2 + - uid: 2476 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -22.406776,20.712933 + parent: 2 + - uid: 6136 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 20.506912,1.9241943 + parent: 5654 + - uid: 6137 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.539032,13.804901 + parent: 5654 - uid: 6138 components: - type: Transform @@ -24724,53 +24739,60 @@ entities: rot: 1.5707963267948966 rad pos: 2.4440918,15.3072815 parent: 5654 -- proto: FloraTreeConifer03 +- proto: FloraTreeLarge entities: - - uid: 2473 + - uid: 2477 components: - type: Transform - pos: 25.955736,-21.06659 + rot: 3.141592653589793 rad + pos: 29.886478,-8.789006 parent: 2 - - uid: 2474 +- proto: FloraTreeSnow + entities: + - uid: 2478 components: - type: Transform - pos: 18.575415,-19.02507 + pos: -4.6157284,24.39824 parent: 2 - - uid: 2475 + - uid: 2479 components: - type: Transform - pos: 20.615295,-22.508595 + pos: 4.4055395,36.219936 parent: 2 - - uid: 2476 + - uid: 2480 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -22.406776,20.712933 + pos: 6.089901,20.812166 parent: 2 -- proto: FloraTreeLarge02 - entities: - - uid: 2477 + - uid: 2481 components: - type: Transform - rot: 3.141592653589793 rad - pos: 29.886478,-8.789006 + pos: -48.499516,13.604767 parent: 2 -- proto: FloraTreeSnow01 - entities: - - uid: 2478 + - uid: 2482 components: - type: Transform - pos: -4.6157284,24.39824 + pos: -0.009152412,22.533655 parent: 2 - - uid: 2479 + - uid: 2483 components: - type: Transform - pos: 4.4055395,36.219936 + pos: -27.599247,-9.65305 parent: 2 - - uid: 2480 + - uid: 2484 components: - type: Transform - pos: 6.089901,20.812166 + pos: -43.924747,18.251827 + parent: 2 + - uid: 2485 + components: + - type: Transform + pos: 5.819991,-21.431513 + parent: 2 + - uid: 2486 + components: + - type: Transform + pos: 11.939298,38.05486 parent: 2 - uid: 6142 components: @@ -24778,8 +24800,6 @@ entities: rot: 1.5707963267948966 rad pos: -8.302155,-8.77597 parent: 5654 -- proto: FloraTreeSnow02 - entities: - uid: 6143 components: - type: Transform @@ -24792,21 +24812,12 @@ entities: rot: 1.5707963267948966 rad pos: -3.676361,12.397369 parent: 5654 -- proto: FloraTreeSnow03 - entities: - - uid: 2481 - components: - - type: Transform - pos: -48.499516,13.604767 - parent: 2 - uid: 6145 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.8744507,-17.837097 parent: 5654 -- proto: FloraTreeSnow04 - entities: - uid: 6146 components: - type: Transform @@ -24819,13 +24830,6 @@ entities: rot: 1.5707963267948966 rad pos: 17.631882,-6.705353 parent: 5654 -- proto: FloraTreeSnow05 - entities: - - uid: 2482 - components: - - type: Transform - pos: -0.009152412,22.533655 - parent: 2 - uid: 6148 components: - type: Transform @@ -24862,28 +24866,6 @@ entities: rot: 1.5707963267948966 rad pos: -6.9085693,11.348236 parent: 5654 -- proto: FloraTreeSnow06 - entities: - - uid: 2483 - components: - - type: Transform - pos: -27.599247,-9.65305 - parent: 2 - - uid: 2484 - components: - - type: Transform - pos: -43.924747,18.251827 - parent: 2 - - uid: 2485 - components: - - type: Transform - pos: 5.819991,-21.431513 - parent: 2 - - uid: 2486 - components: - - type: Transform - pos: 11.939298,38.05486 - parent: 2 - uid: 6154 components: - type: Transform @@ -43150,6 +43132,13 @@ entities: - type: Transform pos: 12.5,-12.5 parent: 2 +- proto: VendingMachinePride + entities: + - uid: 7468 + components: + - type: Transform + pos: 5.5,-10.5 + parent: 2 - proto: VendingMachineRestockChemVend entities: - uid: 292 diff --git a/Resources/Maps/Next/next_tushkan.yml b/Resources/Maps/Next/next_tushkan.yml index ef38bfd702f..d233d0cdec7 100644 --- a/Resources/Maps/Next/next_tushkan.yml +++ b/Resources/Maps/Next/next_tushkan.yml @@ -35143,15 +35143,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: DungeonMasterCircuitBoard - entities: - - uid: 3332 - components: - - type: Transform - parent: 41 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: EggplantSeeds entities: - uid: 8149 @@ -38094,6 +38085,15 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage +- proto: GameMasterCircuitBoard + entities: + - uid: 3332 + components: + - type: Transform + parent: 41 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: Garlands entities: - uid: 64 @@ -67686,7 +67686,7 @@ entities: - type: Transform pos: -14.5,36.5 parent: 2 -- proto: ShadowTree03 +- proto: ShadowTree entities: - uid: 5457 components: @@ -74560,6 +74560,13 @@ entities: - type: Transform pos: -2.5,22.5 parent: 2 +- proto: VendingMachinePride + entities: + - uid: 11235 + components: + - type: Transform + pos: 7.5,6.5 + parent: 2 - proto: VendingMachineRoboDrobe entities: - uid: 5497