From 9f844b762ecb2d1275e374b81566a67f80e23511 Mon Sep 17 00:00:00 2001 From: mersen-tyn Date: Fri, 10 Jan 2025 14:11:09 +0900 Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=BB=D0=B8=D0=B2=D0=B0=D0=B5?= =?UTF-8?q?=D0=BC=20=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=B8=D0=B5?= =?UTF-8?q?=20=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D0=BF=D0=BE=20=D0=BA=D0=B0?= =?UTF-8?q?=D1=80=D1=82=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Maps/Corvax/Outpost/corvaxFrontier.yml | 52 +++++++++++++------ Resources/Maps/Corvax/POI/Lab.yml | 18 ------- Resources/Maps/_NF/POI/caseyscasino.yml | 2 + .../Corvax/Maps/Outpost/corvax_frontier.yml | 2 +- .../_NF/PointsOfInterest/anomalousgeode.yml | 2 +- 5 files changed, 40 insertions(+), 36 deletions(-) diff --git a/Resources/Maps/Corvax/Outpost/corvaxFrontier.yml b/Resources/Maps/Corvax/Outpost/corvaxFrontier.yml index 6517e3ee048..89bd851091a 100644 --- a/Resources/Maps/Corvax/Outpost/corvaxFrontier.yml +++ b/Resources/Maps/Corvax/Outpost/corvaxFrontier.yml @@ -53,7 +53,7 @@ entities: - type: Transform rot: 3.141592653589793 rad pos: 0.57384396,0.5624933 - parent: invalid + parent: 7487 - type: MapGrid chunks: 0,0: @@ -5992,6 +5992,18 @@ entities: - type: ContainedSolution containerName: food container: 7411 + - uid: 7487 + components: + - type: MetaData + name: Map Entity + - type: Transform + - type: Map + mapPaused: True + - type: PhysicsMap + - type: GridTree + - type: MovedGrids + - type: Broadphase + - type: OccluderTree - proto: ActionBibleSummon entities: - uid: 5 @@ -6613,7 +6625,7 @@ entities: pos: -8.5,17.5 parent: 1 - type: Door - secondsUntilStateChange: -3399.3044 + secondsUntilStateChange: -3551.7766 state: Opening - type: DeviceLinkSource lastSignals: @@ -7084,7 +7096,7 @@ entities: pos: 38.5,-20.5 parent: 1 - type: Door - secondsUntilStateChange: -82308.62 + secondsUntilStateChange: -82461.086 state: Opening - type: DeviceLinkSource lastSignals: @@ -7095,7 +7107,7 @@ entities: pos: 38.5,-19.5 parent: 1 - type: Door - secondsUntilStateChange: -82308.83 + secondsUntilStateChange: -82461.3 state: Opening - type: DeviceLinkSource lastSignals: @@ -7106,7 +7118,7 @@ entities: pos: 38.5,-18.5 parent: 1 - type: Door - secondsUntilStateChange: -82309.06 + secondsUntilStateChange: -82461.53 state: Opening - type: DeviceLinkSource lastSignals: @@ -7162,7 +7174,7 @@ entities: pos: 22.5,52.5 parent: 1 - type: Door - secondsUntilStateChange: -81724.13 + secondsUntilStateChange: -81876.6 state: Opening - type: DeviceLinkSource lastSignals: @@ -7173,7 +7185,7 @@ entities: pos: 23.5,52.5 parent: 1 - type: Door - secondsUntilStateChange: -81723.45 + secondsUntilStateChange: -81875.92 state: Opening - type: DeviceLinkSource lastSignals: @@ -7184,7 +7196,7 @@ entities: pos: 24.5,52.5 parent: 1 - type: Door - secondsUntilStateChange: -81723.97 + secondsUntilStateChange: -81876.44 state: Opening - type: DeviceLinkSource lastSignals: @@ -23881,7 +23893,7 @@ entities: pos: -1.5,-5.5 parent: 1 - type: Door - secondsUntilStateChange: -2105.072 + secondsUntilStateChange: -2257.5442 state: Closing - type: DeviceNetwork deviceLists: @@ -25451,7 +25463,7 @@ entities: pos: 5.5,-5.5 parent: 1 - type: Door - secondsUntilStateChange: -1238.773 + secondsUntilStateChange: -1391.2451 state: Closing - type: DeviceNetwork deviceLists: @@ -39762,7 +39774,7 @@ entities: pos: 17.5,22.5 parent: 1 - type: Door - secondsUntilStateChange: -173988.38 + secondsUntilStateChange: -174140.84 state: Opening - uid: 4983 components: @@ -39770,7 +39782,7 @@ entities: pos: 19.5,22.5 parent: 1 - type: Door - secondsUntilStateChange: -173988.75 + secondsUntilStateChange: -174141.22 state: Opening - uid: 4984 components: @@ -39783,7 +39795,7 @@ entities: pos: 20.5,18.5 parent: 1 - type: Door - secondsUntilStateChange: -173989.47 + secondsUntilStateChange: -174141.94 state: Opening - uid: 4986 components: @@ -39791,7 +39803,7 @@ entities: pos: 12.5,22.5 parent: 1 - type: Door - secondsUntilStateChange: -175454.44 + secondsUntilStateChange: -175606.9 state: Opening - uid: 4987 components: @@ -39799,7 +39811,7 @@ entities: pos: 14.5,22.5 parent: 1 - type: Door - secondsUntilStateChange: -175453.98 + secondsUntilStateChange: -175606.45 state: Opening - uid: 4989 components: @@ -45937,6 +45949,14 @@ entities: rot: 1.5707963267948966 rad pos: -31.5,-4.5 parent: 1 +- proto: StationAdminBankATMFrontier + entities: + - uid: 7488 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-7.5 + parent: 1 - proto: StationMap entities: - uid: 2150 @@ -52614,7 +52634,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -117768.64 + secondsUntilStateChange: -117921.11 state: Opening - uid: 7074 components: diff --git a/Resources/Maps/Corvax/POI/Lab.yml b/Resources/Maps/Corvax/POI/Lab.yml index c839be46993..4d76c8fad8f 100644 --- a/Resources/Maps/Corvax/POI/Lab.yml +++ b/Resources/Maps/Corvax/POI/Lab.yml @@ -2115,8 +2115,6 @@ entities: pos: 8.5,8.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 324 - uid: 311 @@ -2126,8 +2124,6 @@ entities: pos: 8.5,10.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 324 - uid: 316 @@ -2137,8 +2133,6 @@ entities: pos: 7.5,9.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 324 - uid: 317 @@ -2148,8 +2142,6 @@ entities: pos: 14.5,9.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 324 - uid: 318 @@ -2159,8 +2151,6 @@ entities: pos: 16.5,8.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 324 - uid: 319 @@ -2170,8 +2160,6 @@ entities: pos: 18.5,8.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 324 - uid: 320 @@ -2181,8 +2169,6 @@ entities: pos: 21.5,8.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 324 - uid: 321 @@ -2192,8 +2178,6 @@ entities: pos: 22.5,6.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 324 - uid: 322 @@ -2203,8 +2187,6 @@ entities: pos: 13.5,6.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 324 - proto: FoodBoxDonkpocket diff --git a/Resources/Maps/_NF/POI/caseyscasino.yml b/Resources/Maps/_NF/POI/caseyscasino.yml index 5de0bf7eb14..f274336c5df 100644 --- a/Resources/Maps/_NF/POI/caseyscasino.yml +++ b/Resources/Maps/_NF/POI/caseyscasino.yml @@ -485,6 +485,8 @@ entities: chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance + - type: BecomesStation + id: CaseysCasino - proto: AirAlarm entities: - uid: 1160 diff --git a/Resources/Prototypes/Corvax/Maps/Outpost/corvax_frontier.yml b/Resources/Prototypes/Corvax/Maps/Outpost/corvax_frontier.yml index f5a40cbb8a2..86eb54c5e5c 100644 --- a/Resources/Prototypes/Corvax/Maps/Outpost/corvax_frontier.yml +++ b/Resources/Prototypes/Corvax/Maps/Outpost/corvax_frontier.yml @@ -33,4 +33,4 @@ MailCarrier: [ 1, 1 ] # Others: # Borg: [ 0, 0 ] -# Chaplain: [ 0, 0 ] # Remove this when we fix bible user spawn in some other way. \ No newline at end of file +# Chaplain: [ 0, 0 ] # Remove this when we fix bible user spawn in some other way. diff --git a/Resources/Prototypes/_NF/PointsOfInterest/anomalousgeode.yml b/Resources/Prototypes/_NF/PointsOfInterest/anomalousgeode.yml index 98d0598f9e0..ce05312dc14 100644 --- a/Resources/Prototypes/_NF/PointsOfInterest/anomalousgeode.yml +++ b/Resources/Prototypes/_NF/PointsOfInterest/anomalousgeode.yml @@ -27,7 +27,7 @@ - type: gameMap id: AnomalousGeode mapName: 'Аномальная Жеода' - mapPath: /Maps/_NF/POI/anomalouslab.yml + mapPath: /Maps/_NF/POI/anomalousgeode.yml minPlayers: 0 stations: AnomalousGeode: