From 8365096f5658622c8d457e74de06a44aabe91fdf Mon Sep 17 00:00:00 2001 From: PyotrIgn Date: Wed, 11 Dec 2024 17:26:12 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D0=BD?= =?UTF-8?q?=D0=B8=D0=B9=20=D0=BD=D0=B0=D0=B4=D0=B5=D1=8E=D1=81=D1=8C=20?= =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NewYear/adt_cluster_legacy.yml | 17 +- .../ADTMaps/ADTStations/NewYear/adt_pie.yml | 639 +----------------- 2 files changed, 29 insertions(+), 627 deletions(-) diff --git a/Resources/Maps/ADTMaps/ADTStations/NewYear/adt_cluster_legacy.yml b/Resources/Maps/ADTMaps/ADTStations/NewYear/adt_cluster_legacy.yml index f17c4f12abb..a0d24e25381 100644 --- a/Resources/Maps/ADTMaps/ADTStations/NewYear/adt_cluster_legacy.yml +++ b/Resources/Maps/ADTMaps/ADTStations/NewYear/adt_cluster_legacy.yml @@ -5119,7 +5119,7 @@ entities: pos: 8.5,-12.5 parent: 2 - type: Door - secondsUntilStateChange: -22178.06 + secondsUntilStateChange: -22283.277 state: Opening - type: DeviceLinkSource lastSignals: @@ -5284,7 +5284,7 @@ entities: pos: 31.5,-9.5 parent: 2 - type: Door - secondsUntilStateChange: -18871.777 + secondsUntilStateChange: -18976.994 state: Opening - type: DeviceLinkSource lastSignals: @@ -5689,7 +5689,7 @@ entities: pos: -8.5,-26.5 parent: 2 - type: Door - secondsUntilStateChange: -10758.244 + secondsUntilStateChange: -10863.462 state: Opening - type: DeviceLinkSource lastSignals: @@ -47178,6 +47178,13 @@ entities: - type: Transform pos: 3.5,1.5 parent: 2 +- proto: SpawnPointObserver + entities: + - uid: 9089 + components: + - type: Transform + pos: 0.5,5.5 + parent: 2 - proto: SpawnPointParamedic entities: - uid: 7053 @@ -58110,7 +58117,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -63423.984 + secondsUntilStateChange: -63529.203 state: Opening - type: Airlock autoClose: False @@ -58182,7 +58189,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -63421.984 + secondsUntilStateChange: -63527.203 state: Opening - type: Airlock autoClose: False diff --git a/Resources/Maps/ADTMaps/ADTStations/NewYear/adt_pie.yml b/Resources/Maps/ADTMaps/ADTStations/NewYear/adt_pie.yml index 427c8bec363..9ce194886d4 100644 --- a/Resources/Maps/ADTMaps/ADTStations/NewYear/adt_pie.yml +++ b/Resources/Maps/ADTMaps/ADTStations/NewYear/adt_pie.yml @@ -77,11 +77,11 @@ entities: components: - type: MetaData name: NT-Pie_Station - - type: BecomesStation - id: ADT_PieNewYear - type: Transform pos: -1.375,-0.953125 parent: 1 + - type: BecomesStation + id: ADT_PieNewYear - type: MapGrid chunks: 0,0: @@ -2403,58 +2403,6 @@ entities: - type: ContainedSolution containerName: food container: 3 - # - uid: 8 - # components: - # - type: MetaData - # - type: Transform - # parent: 7 - # - type: Solution - # solution: - # maxVol: 100 - # name: beaker - # reagents: [] - # - type: ContainedSolution - # containerName: beaker - # container: 7 - # - uid: 10 - # components: - # - type: MetaData - # - type: Transform - # parent: 9 - # - type: Solution - # solution: - # maxVol: 100 - # name: beaker - # reagents: [] - # - type: ContainedSolution - # containerName: beaker - # container: 9 - # - uid: 12 - # components: - # - type: MetaData - # - type: Transform - # parent: 11 - # - type: Solution - # solution: - # maxVol: 50 - # name: beaker - # reagents: [] - # - type: ContainedSolution - # containerName: beaker - # container: 11 - # - uid: 14 - # components: - # - type: MetaData - # - type: Transform - # parent: 13 - # - type: Solution - # solution: - # maxVol: 50 - # name: beaker - # reagents: [] - # - type: ContainedSolution - # containerName: beaker - # container: 13 - uid: 17 components: - type: MetaData @@ -3038,84 +2986,6 @@ entities: - type: ContainedSolution containerName: beaker container: 96 - # - uid: 100 - # components: - # - type: MetaData - # - type: Transform - # parent: 99 - # - type: Solution - # solution: - # maxVol: 30 - # name: beaker - # reagents: [] - # - type: ContainedSolution - # containerName: beaker - # container: 99 - # - uid: 102 - # components: - # - type: MetaData - # - type: Transform - # parent: 101 - # - type: Solution - # solution: - # maxVol: 30 - # name: beaker - # reagents: [] - # - type: ContainedSolution - # containerName: beaker - # container: 101 - # - uid: 104 - # components: - # - type: MetaData - # - type: Transform - # parent: 103 - # - type: Solution - # solution: - # maxVol: 30 - # name: beaker - # reagents: [] - # - type: ContainedSolution - # containerName: beaker - # container: 103 - # - uid: 106 - # components: - # - type: MetaData - # - type: Transform - # parent: 105 - # - type: Solution - # solution: - # maxVol: 30 - # name: beaker - # reagents: [] - # - type: ContainedSolution - # containerName: beaker - # container: 105 - # - uid: 108 - # components: - # - type: MetaData - # - type: Transform - # parent: 107 - # - type: Solution - # solution: - # maxVol: 30 - # name: beaker - # reagents: [] - # - type: ContainedSolution - # containerName: beaker - # container: 107 - # - uid: 110 - # components: - # - type: MetaData - # - type: Transform - # parent: 109 - # - type: Solution - # solution: - # maxVol: 30 - # name: beaker - # reagents: [] - # - type: ContainedSolution - # containerName: beaker - # container: 109 - uid: 124 components: - type: MetaData @@ -3165,23 +3035,6 @@ entities: - type: ContainedSolution containerName: food container: 127 - # - uid: 131 - # components: - # - type: MetaData - # name: solution - food - # - type: Transform - # parent: 130 - # - type: Solution - # solution: - # maxVol: 10 - # name: food - # reagents: - # - data: [] - # ReagentId: Fiber - # Quantity: 10 - # - type: ContainedSolution - # containerName: food - # container: 130 - proto: ActionStethoscope entities: - uid: 136 @@ -4251,24 +4104,6 @@ entities: parent: 2 - proto: ADTSparkler entities: - # - uid: 132 - # components: - # - type: Transform - # parent: 129 - # - type: Physics - # canCollide: False - # - uid: 133 - # components: - # - type: Transform - # parent: 129 - # - type: Physics - # canCollide: False - # - uid: 134 - # components: - # - type: Transform - # parent: 129 - # - type: Physics - # canCollide: False - uid: 338 components: - type: Transform @@ -4297,41 +4132,6 @@ entities: - type: Transform pos: -3.249783,13.618068 parent: 2 - # - type: Storage - # storedItems: - # 132: - # position: 0,0 - # _rotation: South - # 133: - # position: 1,0 - # _rotation: South - # 134: - # position: 3,0 - # _rotation: South - # 130: - # position: 2,0 - # _rotation: South - # - type: ContainerContainer - # containers: - # storagebase: !type:Container - # showEnts: False - # occludes: True - # ents: - # - 132 - # - 133 - # - 134 - # - 130 - # - type: UseDelay - # delays: - # default: - # endTime: 26276.7451527 - # startTime: 26275.7451527 - # length: 1 - # quickInsert: - # length: 0.5 - # storage: - # endTime: 26275.7451527 - # startTime: 26275.7451527 - proto: ADTSpawnPointRoboticist entities: - uid: 342 @@ -5479,7 +5279,7 @@ entities: pos: 16.5,-3.5 parent: 2 - type: Door - secondsUntilStateChange: -89782.26 + secondsUntilStateChange: -89811.766 state: Opening - proto: AirlockFreezerLocked entities: @@ -5498,7 +5298,7 @@ entities: pos: 5.5,6.5 parent: 2 - type: Door - secondsUntilStateChange: -51287.383 + secondsUntilStateChange: -51316.89 state: Opening - uid: 517 components: @@ -5507,7 +5307,7 @@ entities: pos: 6.5,6.5 parent: 2 - type: Door - secondsUntilStateChange: -51287.555 + secondsUntilStateChange: -51317.062 state: Opening - uid: 518 components: @@ -5603,7 +5403,7 @@ entities: pos: 19.5,-5.5 parent: 2 - type: Door - secondsUntilStateChange: -9280.666 + secondsUntilStateChange: -9310.173 state: Opening - type: DeviceLinkSource lastSignals: @@ -5694,7 +5494,7 @@ entities: pos: 13.5,8.5 parent: 2 - type: Door - secondsUntilStateChange: -68313.805 + secondsUntilStateChange: -68343.31 state: Opening - uid: 546 components: @@ -6499,92 +6299,6 @@ entities: - type: Transform pos: 22.5,-16.5 parent: 2 -# - proto: BaseChemistryEmptyVial -# entities: -# - uid: 99 -# components: -# - type: Transform -# parent: 98 -# - type: SolutionContainerManager -# solutions: null -# containers: -# - beaker -# - type: Physics -# canCollide: False -# - type: ContainerContainer -# containers: -# solution@beaker: !type:ContainerSlot -# ent: 100 -# - uid: 101 -# components: -# - type: Transform -# parent: 98 -# - type: SolutionContainerManager -# solutions: null -# containers: -# - beaker -# - type: Physics -# canCollide: False -# - type: ContainerContainer -# containers: -# solution@beaker: !type:ContainerSlot -# ent: 102 -# - uid: 103 -# components: -# - type: Transform -# parent: 98 -# - type: SolutionContainerManager -# solutions: null -# containers: -# - beaker -# - type: Physics -# canCollide: False -# - type: ContainerContainer -# containers: -# solution@beaker: !type:ContainerSlot -# ent: 104 -# - uid: 105 -# components: -# - type: Transform -# parent: 98 -# - type: SolutionContainerManager -# solutions: null -# containers: -# - beaker -# - type: Physics -# canCollide: False -# - type: ContainerContainer -# containers: -# solution@beaker: !type:ContainerSlot -# ent: 106 -# - uid: 107 -# components: -# - type: Transform -# parent: 98 -# - type: SolutionContainerManager -# solutions: null -# containers: -# - beaker -# - type: Physics -# canCollide: False -# - type: ContainerContainer -# containers: -# solution@beaker: !type:ContainerSlot -# ent: 108 -# - uid: 109 -# components: -# - type: Transform -# parent: 98 -# - type: SolutionContainerManager -# solutions: null -# containers: -# - beaker -# - type: Physics -# canCollide: False -# - type: ContainerContainer -# containers: -# solution@beaker: !type:ContainerSlot -# ent: 110 - proto: Basketball entities: - uid: 662 @@ -6599,36 +6313,6 @@ entities: - type: Transform pos: 16.961296,-21.465628 parent: 2 -# - proto: Beaker -# entities: -# - uid: 11 -# components: -# - type: Transform -# parent: 6 -# - type: SolutionContainerManager -# solutions: null -# containers: -# - beaker -# - type: Physics -# canCollide: False -# - type: ContainerContainer -# containers: -# solution@beaker: !type:ContainerSlot -# ent: 12 -# - uid: 13 -# components: -# - type: Transform -# parent: 6 -# - type: SolutionContainerManager -# solutions: null -# containers: -# - beaker -# - type: Physics -# canCollide: False -# - type: ContainerContainer -# containers: -# solution@beaker: !type:ContainerSlot -# ent: 14 - proto: Bed entities: - uid: 664 @@ -7367,30 +7051,6 @@ entities: components: - type: Transform parent: 5 - # - type: Storage - # storedItems: - # 7: - # position: 0,0 - # _rotation: South - # 9: - # position: 2,0 - # _rotation: South - # 11: - # position: 0,2 - # _rotation: East - # 13: - # position: 2,2 - # _rotation: East - # - type: ContainerContainer - # containers: - # storagebase: !type:Container - # showEnts: False - # occludes: True - # ents: - # - 7 - # - 9 - # - 11 - # - 13 - type: Physics canCollide: False - type: InsideEntityStorage @@ -7521,18 +7181,6 @@ entities: 348: position: 1,0 _rotation: South - # 349: - # position: 2,0 - # _rotation: South - # 350: - # position: 0,2 - # _rotation: South - # 351: - # position: 1,2 - # _rotation: South - # 352: - # position: 2,2 - # _rotation: South - type: ContainerContainer containers: storagebase: !type:Container @@ -7541,10 +7189,6 @@ entities: ents: - 347 - 348 - # - 349 - # - 350 - # - 351 - # - 352 - type: Physics canCollide: False - type: InsideEntityStorage @@ -7554,18 +7198,6 @@ entities: parent: 343 - type: Storage storedItems: - # 356: - # position: 0,0 - # _rotation: South - # 357: - # position: 1,0 - # _rotation: South - # 358: - # position: 2,0 - # _rotation: South - # 359: - # position: 0,2 - # _rotation: South 354: position: 1,2 _rotation: South @@ -7578,10 +7210,6 @@ entities: showEnts: False occludes: True ents: - # - 356 - # - 357 - # - 358 - # - 359 - 354 - 355 - type: Physics @@ -7602,50 +7230,6 @@ entities: components: - type: Transform parent: 5 - # - type: Storage - # storedItems: - # 112: - # position: 0,0 - # _rotation: South - # 113: - # position: 1,0 - # _rotation: South - # 114: - # position: 2,0 - # _rotation: South - # 115: - # position: 0,1 - # _rotation: South - # 116: - # position: 1,1 - # _rotation: South - # 117: - # position: 2,1 - # _rotation: South - # 118: - # position: 0,2 - # _rotation: South - # 119: - # position: 1,2 - # _rotation: South - # 120: - # position: 2,2 - # _rotation: South - # - type: ContainerContainer - # containers: - # storagebase: !type:Container - # showEnts: False - # occludes: True - # ents: - # - 112 - # - 113 - # # - 114 - # # - 115 - # # - 116 - # # - 117 - # # - 118 - # # - 119 - # # - 120 - type: Physics canCollide: False - type: InsideEntityStorage @@ -7696,38 +7280,6 @@ entities: components: - type: Transform parent: 5 - # - type: Storage - # storedItems: - # 99: - # position: 0,0 - # _rotation: South - # 101: - # position: 1,0 - # _rotation: South - # 103: - # position: 2,0 - # _rotation: South - # 105: - # position: 0,1 - # _rotation: South - # 107: - # position: 1,1 - # _rotation: South - # 109: - # position: 2,1 - # _rotation: South - # - type: ContainerContainer - # containers: - # storagebase: !type:Container - # showEnts: False - # occludes: True - # ents: - # - 99 - # - 101 - # - 103 - # - 105 - # - 107 - # - 109 - type: Physics canCollide: False - type: InsideEntityStorage @@ -15956,20 +15508,6 @@ entities: parent: 2 - proto: ClothingNeckNanoTrasenPin entities: - # - uid: 130 - # components: - # - type: Transform - # parent: 129 - # - type: SolutionContainerManager - # solutions: null - # containers: - # - food - # - type: Physics - # canCollide: False - # - type: ContainerContainer - # containers: - # solution@food: !type:ContainerSlot - # ent: 131 - uid: 2195 components: - type: Transform @@ -17111,7 +16649,7 @@ entities: pos: -4.5,0.5 parent: 2 - type: Door - secondsUntilStateChange: -73131.04 + secondsUntilStateChange: -73160.55 state: Opening - proto: CurtainsBlackOpen entities: @@ -18533,7 +18071,7 @@ entities: pos: -2.5,-7.5 parent: 2 - type: Door - secondsUntilStateChange: -69984.76 + secondsUntilStateChange: -70014.266 state: Closing - type: DeviceNetwork deviceLists: @@ -18740,7 +18278,7 @@ entities: pos: 24.5,2.5 parent: 2 - type: Door - secondsUntilStateChange: -49740 + secondsUntilStateChange: -49769.508 state: Closing - type: DeviceNetwork deviceLists: @@ -26860,36 +26398,6 @@ entities: - type: Transform pos: 10.166733,19.441624 parent: 2 -# - proto: LargeBeaker -# entities: -# - uid: 7 -# components: -# - type: Transform -# parent: 6 -# - type: SolutionContainerManager -# solutions: null -# containers: -# - beaker -# - type: Physics -# canCollide: False -# - type: ContainerContainer -# containers: -# solution@beaker: !type:ContainerSlot -# ent: 8 -# - uid: 9 -# components: -# - type: Transform -# parent: 6 -# - type: SolutionContainerManager -# solutions: null -# containers: -# - beaker -# - type: Physics -# canCollide: False -# - type: ContainerContainer -# containers: -# solution@beaker: !type:ContainerSlot -# ent: 10 - proto: LidSalami entities: - uid: 3539 @@ -27883,38 +27391,6 @@ entities: unspawnedCount: 19 - type: Physics canCollide: False - # - uid: 349 - # components: - # - type: Transform - # parent: 346 - # - type: BallisticAmmoProvider - # unspawnedCount: 19 - # - type: Physics - # canCollide: False - # - uid: 350 - # components: - # - type: Transform - # parent: 346 - # - type: BallisticAmmoProvider - # unspawnedCount: 19 - # - type: Physics - # canCollide: False - # - uid: 351 - # components: - # - type: Transform - # parent: 346 - # - type: BallisticAmmoProvider - # unspawnedCount: 19 - # - type: Physics - # canCollide: False - # - uid: 352 - # components: - # - type: Transform - # parent: 346 - # - type: BallisticAmmoProvider - # unspawnedCount: 19 - # - type: Physics - # canCollide: False - uid: 354 components: - type: Transform @@ -27931,38 +27407,6 @@ entities: unspawnedCount: 19 - type: Physics canCollide: False - # - uid: 356 - # components: - # - type: Transform - # parent: 353 - # - type: BallisticAmmoProvider - # unspawnedCount: 19 - # - type: Physics - # canCollide: False - # - uid: 357 - # components: - # - type: Transform - # parent: 353 - # - type: BallisticAmmoProvider - # unspawnedCount: 19 - # - type: Physics - # canCollide: False - # - uid: 358 - # components: - # - type: Transform - # parent: 353 - # - type: BallisticAmmoProvider - # unspawnedCount: 19 - # - type: Physics - # canCollide: False - # - uid: 359 - # components: - # - type: Transform - # parent: 353 - # - type: BallisticAmmoProvider - # unspawnedCount: 19 - # - type: Physics - # canCollide: False - proto: MagazineRifle entities: - uid: 368 @@ -28881,62 +28325,6 @@ entities: - type: Transform pos: 26.437075,5.894659 parent: 2 -# - proto: PillCanister -# entities: -# - uid: 112 -# components: -# - type: Transform -# parent: 111 -# - type: Physics -# canCollide: False -# - uid: 113 -# components: -# - type: Transform -# parent: 111 -# - type: Physics -# canCollide: False - # - uid: 114 - # components: - # - type: Transform - # parent: 111 - # - type: Physics - # canCollide: False - # - uid: 115 - # components: - # - type: Transform - # parent: 111 - # - type: Physics - # canCollide: False -# - uid: 116 -# components: -# - type: Transform -# parent: 111 -# - type: Physics -# canCollide: False -# - uid: 117 -# components: -# - type: Transform -# parent: 111 -# - type: Physics -# canCollide: False -# - uid: 118 -# components: -# - type: Transform -# parent: 111 -# - type: Physics -# canCollide: False -# - uid: 119 -# components: -# - type: Transform -# parent: 111 -# - type: Physics -# canCollide: False -# - uid: 120 -# components: -# - type: Transform -# parent: 111 -# - type: Physics -# canCollide: False - proto: PlasmaCanister entities: - uid: 3687 @@ -33053,6 +32441,13 @@ entities: - type: Transform pos: 9.5,-16.5 parent: 2 +- proto: SpawnPointSeniorResearcher + entities: + - uid: 7 + components: + - type: Transform + pos: 21.5,-9.5 + parent: 2 - proto: SpawnPointServiceWorker entities: - uid: 4285