From 5ab59e59e26305a1d19cf3e59840607eecfa9fc4 Mon Sep 17 00:00:00 2001 From: KyuPolaris Date: Fri, 6 Sep 2024 18:27:10 +1000 Subject: [PATCH 1/6] Crescent Air Alarms --- Resources/Maps/_NF/Shuttles/crescent.yml | 681 ++++++++++++++++++----- 1 file changed, 556 insertions(+), 125 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/crescent.yml b/Resources/Maps/_NF/Shuttles/crescent.yml index 0b06692f79f..ad4cc3ac234 100644 --- a/Resources/Maps/_NF/Shuttles/crescent.yml +++ b/Resources/Maps/_NF/Shuttles/crescent.yml @@ -32,7 +32,7 @@ entities: name: Crescent - type: Transform pos: -0.22537023,-0.7676166 - parent: invalid + parent: 1226 - type: MapGrid chunks: 0,0: @@ -728,7 +728,7 @@ entities: 4,3: 1: 17 0: 61440 - 4: 68 + 2: 68 -1,-1: 0: 65024 -4,0: @@ -747,12 +747,12 @@ entities: 0: 64733 -5,3: 0: 61663 - 7: 32 + 3: 32 -4,4: 0: 52431 1: 4096 -4,-1: - 2: 8192 + 4: 8192 0: 32768 -3,0: 0: 20667 @@ -762,11 +762,11 @@ entities: 0: 1615 -3,3: 0: 256 - 3: 61166 + 5: 61166 -3,-1: 0: 8192 -3,4: - 3: 14 + 5: 14 0: 26112 -2,0: 0: 62139 @@ -792,20 +792,20 @@ entities: 5,2: 0: 4095 5,3: - 5: 17 + 6: 17 0: 61440 - 6: 68 + 7: 68 5,4: 0: 15 1: 16896 6,0: - 2: 4096 + 4: 4096 6,2: 0: 26230 6,3: 0: 63239 6,1: - 2: 32 + 4: 32 0: 8192 6,4: 0: 65319 @@ -814,16 +814,16 @@ entities: 7,3: 0: 12544 1: 2 - 2: 52416 + 4: 52416 7,4: 0: 4353 - 2: 204 + 4: 204 -8,3: - 2: 26208 + 4: 26208 0: 32768 1: 8 -8,4: - 2: 102 + 4: 102 -7,3: 0: 61900 -7,2: @@ -891,28 +891,28 @@ entities: 0: 4403 -7,9: 0: 204 - 2: 32768 + 4: 32768 -6,9: 0: 51 - 2: 28672 + 4: 28672 -6,10: - 2: 18039 + 4: 18039 -6,11: - 2: 68 + 4: 68 5,8: 1: 32768 5,9: 1: 136 - 2: 49152 + 4: 49152 5,10: - 2: 19660 + 4: 19660 5,11: - 2: 68 + 4: 68 6,9: 1: 51 - 2: 12288 + 4: 12288 6,10: - 2: 17 + 4: 17 -4,5: 0: 3276 -3,5: @@ -933,9 +933,9 @@ entities: 0: 26191 -1,7: 0: 6 - 2: 28160 + 4: 28160 -1,8: - 2: 2 + 4: 2 0,5: 0: 16371 0,6: @@ -1002,12 +1002,12 @@ entities: - 0 - 0 - volume: 2500 - immutable: True + temperature: 293.15 moles: - 0 - 0 - 0 - - 0 + - 2500 - 0 - 0 - 0 @@ -1017,14 +1017,14 @@ entities: - 0 - 0 - volume: 2500 - temperature: 340 + temperature: 293.15 moles: - - 21.824879 - - 82.10312 + - 21.6852 + - 81.57766 + - 0 - 0 - 0 - 0 - - 82.10312 - 0 - 0 - 0 @@ -1032,12 +1032,12 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.15 + immutable: True moles: - 0 - 0 - 0 - - 2500 + - 0 - 0 - 0 - 0 @@ -1047,14 +1047,14 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.15 + temperature: 340 moles: - - 0 - - 2500 - - 0 + - 21.824879 + - 82.10312 - 0 - 0 - 0 + - 82.10312 - 0 - 0 - 0 @@ -1064,8 +1064,8 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 2500 - 0 + - 2500 - 0 - 0 - 0 @@ -1079,8 +1079,8 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 21.6852 - - 81.57766 + - 2500 + - 0 - 0 - 0 - 0 @@ -1096,6 +1096,18 @@ entities: - type: RadiationGridResistance - type: BecomesStation id: Crescent + - uid: 1226 + components: + - type: MetaData + name: Map Entity + - type: Transform + - type: Map + mapPaused: True + - type: PhysicsMap + - type: GridTree + - type: MovedGrids + - type: Broadphase + - type: OccluderTree - proto: ActionToggleLight entities: - uid: 1130 @@ -1104,6 +1116,203 @@ entities: parent: 2230 - type: InstantAction container: 2230 +- proto: AirAlarm + entities: + - uid: 1229 + components: + - type: MetaData + name: Science Air Alarm + - type: Transform + rot: -1.5707963267948966 rad + pos: 30.5,27.5 + parent: 1 + - type: DeviceList + devices: + - 2080 + - 2037 + - 2038 + - 2067 + - 2088 + - 2089 + - 2069 + - 2036 + - uid: 1237 + components: + - type: MetaData + name: Engineering Air Alarm + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,6.5 + parent: 1 + - type: DeviceList + devices: + - 2081 + - 2082 + - 2052 + - 2106 + - uid: 1239 + components: + - type: MetaData + name: Service Air Alarm + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-1.5 + parent: 1 + - type: DeviceList + devices: + - 2076 + - 2048 + - 2047 + - 2095 + - 2049 + - 2090 + - 2091 + - 2050 + - 2051 + - 2093 + - uid: 1240 + components: + - type: MetaData + name: Chem Lab Air Alarm + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,10.5 + parent: 1 + - type: DeviceList + devices: + - 2045 + - 2101 + - 2068 + - 2018 + - 2014 + - 2073 + - uid: 1241 + components: + - type: MetaData + name: Bio/Cryo Air Alarm + - type: Transform + rot: 1.5707963267948966 rad + pos: -29.5,28.5 + parent: 1 + - type: DeviceList + devices: + - 2045 + - 2101 + - 2068 + - 2018 + - 2014 + - 2073 + - 2097 + - 2031 + - 2027 + - 2096 + - 2026 + - 2060 + - 2086 + - 2084 + - 2042 + - 2102 + - uid: 1278 + components: + - type: MetaData + name: Hallways Air Alarm + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,11.5 + parent: 1 + - type: DeviceList + devices: + - 2109 + - 2058 + - 2107 + - 2056 + - 2057 + - 2108 + - 2020 + - 2083 + - 2013 + - 1108 + - 2104 + - 2035 + - 2094 + - 2044 + - 2019 + - 2103 + - 2098 + - 2022 + - uid: 1281 + components: + - type: Transform + pos: 6.5,26.5 + parent: 1 + - type: DeviceList + devices: + - 2064 + - 2055 + - 2062 + - 2024 + - 2065 + - 2053 + - 897 + - 898 + - 2054 + - 2063 + - 2015 + - 2087 + - uid: 2253 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,35.5 + parent: 1 + - type: DeviceList + devices: + - 2041 + - 2099 + - uid: 2254 + components: + - type: MetaData + name: Dorms Air Alarm + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,11.5 + parent: 1 + - type: DeviceList + devices: + - 2079 + - 2032 + - 2077 + - 2016 + - 2078 + - 2030 + - 2074 + - 2025 + - 2075 + - 2017 + - 2066 + - 2029 + - 3685 + - 2070 + - 2033 + - 2071 + - 2034 + - 2072 + - uid: 2255 + components: + - type: MetaData + name: Misc. Air Alarm + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,23.5 + parent: 1 + - type: DeviceList + devices: + - 2085 + - 2021 + - 2061 + - 2028 + - 2023 + - 2100 - proto: Airlock entities: - uid: 2 @@ -2677,9 +2886,6 @@ entities: - type: Transform pos: 24.5,38.5 parent: 1 - - type: DeviceLinkSink - links: - - 2604 - proto: BlastDoorOpen entities: - uid: 197 @@ -2689,8 +2895,6 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 1 - links: - - 2600 - uid: 198 components: - type: Transform @@ -2698,8 +2902,6 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 1 - links: - - 2600 - uid: 199 components: - type: Transform @@ -2707,16 +2909,11 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 1 - links: - - 2600 - uid: 200 components: - type: Transform pos: 29.5,25.5 parent: 1 - - type: DeviceLinkSink - links: - - 2605 - proto: BluespaceBeaker entities: - uid: 202 @@ -14552,6 +14749,9 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,14.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1281 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2013 @@ -14560,6 +14760,9 @@ entities: rot: -1.5707963267948966 rad pos: 14.5,14.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2014 @@ -14568,6 +14771,10 @@ entities: rot: 1.5707963267948966 rad pos: -24.5,12.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1240 + - 1241 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2015 @@ -14576,6 +14783,9 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,13.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1281 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2016 @@ -14583,6 +14793,9 @@ entities: - type: Transform pos: -7.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2017 @@ -14591,6 +14804,9 @@ entities: rot: 3.141592653589793 rad pos: -7.5,19.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2018 @@ -14599,6 +14815,10 @@ entities: rot: 3.141592653589793 rad pos: -17.5,13.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1240 + - 1241 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2019 @@ -14607,6 +14827,9 @@ entities: rot: 3.141592653589793 rad pos: -21.5,15.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2020 @@ -14615,6 +14838,9 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,13.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2021 @@ -14623,6 +14849,11 @@ entities: rot: -1.5707963267948966 rad pos: -8.5,24.5 parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 2255 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2022 @@ -14631,6 +14862,9 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,29.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2023 @@ -14639,6 +14873,11 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,26.5 parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 2255 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2024 @@ -14647,6 +14886,9 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,24.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1281 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2025 @@ -14655,6 +14897,9 @@ entities: rot: 3.141592653589793 rad pos: -10.5,19.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2026 @@ -14663,6 +14908,9 @@ entities: rot: -1.5707963267948966 rad pos: -23.5,29.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1241 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2027 @@ -14670,6 +14918,9 @@ entities: - type: Transform pos: -24.5,35.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1241 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2028 @@ -14678,6 +14929,11 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,26.5 parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 2255 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2029 @@ -14686,6 +14942,9 @@ entities: rot: 3.141592653589793 rad pos: -4.5,19.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2030 @@ -14693,6 +14952,9 @@ entities: - type: Transform pos: -10.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2031 @@ -14700,6 +14962,9 @@ entities: - type: Transform pos: -27.5,28.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1241 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2032 @@ -14707,6 +14972,9 @@ entities: - type: Transform pos: -4.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2033 @@ -14714,6 +14982,9 @@ entities: - type: Transform pos: 7.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2034 @@ -14721,6 +14992,9 @@ entities: - type: Transform pos: 10.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2035 @@ -14729,6 +15003,9 @@ entities: rot: -1.5707963267948966 rad pos: 26.5,16.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2036 @@ -14737,6 +15014,9 @@ entities: rot: -1.5707963267948966 rad pos: 28.5,21.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1229 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2037 @@ -14745,6 +15025,9 @@ entities: rot: -1.5707963267948966 rad pos: 29.5,26.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1229 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2038 @@ -14753,6 +15036,9 @@ entities: rot: 1.5707963267948966 rad pos: 25.5,25.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1229 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2039 @@ -14776,6 +15062,9 @@ entities: - type: Transform pos: -4.5,39.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2253 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2042 @@ -14784,6 +15073,9 @@ entities: rot: 1.5707963267948966 rad pos: -28.5,22.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1241 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2043 @@ -14800,6 +15092,9 @@ entities: rot: 3.141592653589793 rad pos: -16.5,7.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2045 @@ -14808,6 +15103,10 @@ entities: rot: 1.5707963267948966 rad pos: -20.5,8.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1240 + - 1241 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2046 @@ -14824,6 +15123,9 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,4.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1239 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2048 @@ -14831,6 +15133,9 @@ entities: - type: Transform pos: -1.5,5.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1239 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2049 @@ -14839,6 +15144,9 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,4.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1239 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2050 @@ -14847,6 +15155,9 @@ entities: rot: -1.5707963267948966 rad pos: 8.5,3.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1239 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2051 @@ -14855,6 +15166,9 @@ entities: rot: 3.141592653589793 rad pos: 7.5,1.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1239 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2052 @@ -14863,6 +15177,9 @@ entities: rot: 3.141592653589793 rad pos: 13.5,3.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1237 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2053 @@ -14871,6 +15188,9 @@ entities: rot: 3.141592653589793 rad pos: 11.5,20.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1281 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2054 @@ -14879,6 +15199,9 @@ entities: rot: 3.141592653589793 rad pos: 3.5,19.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1281 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2055 @@ -14886,6 +15209,9 @@ entities: - type: Transform pos: 3.5,29.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1281 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2056 @@ -14894,6 +15220,9 @@ entities: rot: 1.5707963267948966 rad pos: -13.5,17.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2057 @@ -14902,6 +15231,9 @@ entities: rot: 3.141592653589793 rad pos: -5.5,7.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2058 @@ -14909,6 +15241,9 @@ entities: - type: Transform pos: -11.5,22.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#0055CCFF' - uid: 3685 @@ -14916,6 +15251,9 @@ entities: - type: Transform pos: 4.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasVentScrubber @@ -14926,6 +15264,9 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,15.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1281 - type: AtmosPipeColor color: '#990000FF' - uid: 1108 @@ -14933,6 +15274,9 @@ entities: - type: Transform pos: 15.5,16.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#990000FF' - uid: 2060 @@ -14941,6 +15285,9 @@ entities: rot: 1.5707963267948966 rad pos: -23.5,28.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1241 - type: AtmosPipeColor color: '#990000FF' - uid: 2061 @@ -14949,6 +15296,11 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,27.5 parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 2255 - type: AtmosPipeColor color: '#990000FF' - uid: 2062 @@ -14957,6 +15309,9 @@ entities: rot: 1.5707963267948966 rad pos: 3.5,25.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1281 - type: AtmosPipeColor color: '#990000FF' - uid: 2063 @@ -14965,6 +15320,9 @@ entities: rot: 3.141592653589793 rad pos: 4.5,19.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1281 - type: AtmosPipeColor color: '#990000FF' - uid: 2064 @@ -14972,6 +15330,9 @@ entities: - type: Transform pos: 4.5,29.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1281 - type: AtmosPipeColor color: '#990000FF' - uid: 2065 @@ -14980,6 +15341,9 @@ entities: rot: 1.5707963267948966 rad pos: 13.5,20.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1281 - type: AtmosPipeColor color: '#990000FF' - uid: 2066 @@ -14988,6 +15352,9 @@ entities: rot: 3.141592653589793 rad pos: -3.5,19.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#990000FF' - uid: 2067 @@ -14996,6 +15363,9 @@ entities: rot: -1.5707963267948966 rad pos: 26.5,26.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1229 - type: AtmosPipeColor color: '#990000FF' - uid: 2068 @@ -15004,6 +15374,10 @@ entities: rot: 3.141592653589793 rad pos: -18.5,13.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1240 + - 1241 - type: AtmosPipeColor color: '#990000FF' - uid: 2069 @@ -15012,6 +15386,9 @@ entities: rot: -1.5707963267948966 rad pos: 28.5,22.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1229 - type: AtmosPipeColor color: '#990000FF' - uid: 2070 @@ -15019,6 +15396,9 @@ entities: - type: Transform pos: 5.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#990000FF' - uid: 2071 @@ -15026,6 +15406,9 @@ entities: - type: Transform pos: 8.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#990000FF' - uid: 2072 @@ -15033,6 +15416,9 @@ entities: - type: Transform pos: 11.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#990000FF' - uid: 2073 @@ -15041,6 +15427,10 @@ entities: rot: 3.141592653589793 rad pos: -24.5,13.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1240 + - 1241 - type: AtmosPipeColor color: '#990000FF' - uid: 2074 @@ -15049,6 +15439,9 @@ entities: rot: 3.141592653589793 rad pos: -9.5,19.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#990000FF' - uid: 2075 @@ -15057,6 +15450,9 @@ entities: rot: 3.141592653589793 rad pos: -6.5,19.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#990000FF' - uid: 2076 @@ -15065,6 +15461,9 @@ entities: rot: 3.141592653589793 rad pos: -0.5,2.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1239 - type: AtmosPipeColor color: '#990000FF' - uid: 2077 @@ -15072,6 +15471,9 @@ entities: - type: Transform pos: -6.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#990000FF' - uid: 2078 @@ -15079,6 +15481,9 @@ entities: - type: Transform pos: -9.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#990000FF' - uid: 2079 @@ -15086,6 +15491,9 @@ entities: - type: Transform pos: -3.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#990000FF' - uid: 2080 @@ -15094,6 +15502,9 @@ entities: rot: -1.5707963267948966 rad pos: 28.5,27.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1229 - type: AtmosPipeColor color: '#990000FF' - uid: 2081 @@ -15101,6 +15512,9 @@ entities: - type: Transform pos: 17.5,8.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1237 - type: AtmosPipeColor color: '#990000FF' - uid: 2082 @@ -15109,6 +15523,9 @@ entities: rot: 3.141592653589793 rad pos: 14.5,3.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1237 - type: AtmosPipeColor color: '#990000FF' - uid: 2083 @@ -15117,6 +15534,9 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,16.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#990000FF' - uid: 2084 @@ -15124,6 +15544,9 @@ entities: - type: Transform pos: -23.5,25.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1241 - type: AtmosPipeColor color: '#990000FF' - uid: 2085 @@ -15131,6 +15554,11 @@ entities: - type: Transform pos: -9.5,24.5 parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 2255 - type: AtmosPipeColor color: '#990000FF' - uid: 2086 @@ -15138,6 +15566,9 @@ entities: - type: Transform pos: -25.5,25.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1241 - type: AtmosPipeColor color: '#990000FF' - uid: 2087 @@ -15146,6 +15577,9 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,16.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1281 - type: AtmosPipeColor color: '#990000FF' - uid: 2088 @@ -15154,6 +15588,9 @@ entities: rot: 1.5707963267948966 rad pos: 26.5,32.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1229 - type: AtmosPipeColor color: '#990000FF' - uid: 2089 @@ -15162,6 +15599,9 @@ entities: rot: -1.5707963267948966 rad pos: 28.5,32.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1229 - type: AtmosPipeColor color: '#990000FF' - uid: 2090 @@ -15170,6 +15610,9 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,3.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1239 - type: AtmosPipeColor color: '#990000FF' - uid: 2091 @@ -15178,6 +15621,9 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,4.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1239 - type: AtmosPipeColor color: '#990000FF' - uid: 2092 @@ -15194,6 +15640,9 @@ entities: rot: 3.141592653589793 rad pos: 8.5,1.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1239 - type: AtmosPipeColor color: '#990000FF' - uid: 2094 @@ -15202,6 +15651,9 @@ entities: rot: 3.141592653589793 rad pos: -15.5,6.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#990000FF' - uid: 2095 @@ -15210,6 +15662,9 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,3.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1239 - type: AtmosPipeColor color: '#990000FF' - uid: 2096 @@ -15217,6 +15672,9 @@ entities: - type: Transform pos: -22.5,36.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1241 - type: AtmosPipeColor color: '#990000FF' - uid: 2097 @@ -15224,6 +15682,9 @@ entities: - type: Transform pos: -28.5,28.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1241 - type: AtmosPipeColor color: '#990000FF' - uid: 2098 @@ -15232,6 +15693,9 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,30.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#990000FF' - uid: 2099 @@ -15239,6 +15703,9 @@ entities: - type: Transform pos: -6.5,39.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2253 - type: AtmosPipeColor color: '#990000FF' - uid: 2100 @@ -15246,6 +15713,11 @@ entities: - type: Transform pos: 1.5,28.5 parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 2255 - type: AtmosPipeColor color: '#990000FF' - uid: 2101 @@ -15254,6 +15726,10 @@ entities: rot: 1.5707963267948966 rad pos: -20.5,7.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1240 + - 1241 - type: AtmosPipeColor color: '#990000FF' - uid: 2102 @@ -15262,6 +15738,9 @@ entities: rot: 3.141592653589793 rad pos: -25.5,22.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1241 - type: AtmosPipeColor color: '#990000FF' - uid: 2103 @@ -15270,6 +15749,9 @@ entities: rot: 1.5707963267948966 rad pos: -25.5,15.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#990000FF' - uid: 2104 @@ -15278,6 +15760,9 @@ entities: rot: -1.5707963267948966 rad pos: 25.5,15.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#990000FF' - uid: 2105 @@ -15294,6 +15779,9 @@ entities: rot: -1.5707963267948966 rad pos: 25.5,11.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1237 - type: AtmosPipeColor color: '#990000FF' - uid: 2107 @@ -15302,6 +15790,9 @@ entities: rot: -1.5707963267948966 rad pos: -12.5,18.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#990000FF' - uid: 2108 @@ -15309,6 +15800,9 @@ entities: - type: Transform pos: -4.5,8.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#990000FF' - uid: 2109 @@ -15317,6 +15811,9 @@ entities: rot: 3.141592653589793 rad pos: -8.5,21.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#990000FF' - proto: GasVolumePump @@ -16002,6 +16499,13 @@ entities: - type: Physics canCollide: True - type: ActionsContainer +- proto: LeftHandHuman + entities: + - uid: 1238 + components: + - type: Transform + pos: 29.500807,26.554073 + parent: 1 - proto: LockerAtmosphericsFilledHardsuit entities: - uid: 444 @@ -17834,27 +18338,18 @@ entities: - type: Transform pos: 1.5,25.5 parent: 1 - - type: DeviceLinkSink - links: - - 2606 - uid: 2522 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,15.5 parent: 1 - - type: DeviceLinkSink - links: - - 2601 - uid: 2523 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,16.5 parent: 1 - - type: DeviceLinkSink - links: - - 2601 - proto: ShuttersNormalOpen entities: - uid: 2524 @@ -17863,54 +18358,36 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 2603 - uid: 2525 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 2603 - uid: 2526 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,5.5 parent: 1 - - type: DeviceLinkSink - links: - - 2603 - uid: 2527 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 2602 - uid: 2528 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 2602 - uid: 2529 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,5.5 parent: 1 - - type: DeviceLinkSink - links: - - 2602 - uid: 2530 components: - type: Transform @@ -17922,44 +18399,29 @@ entities: - type: Transform pos: 1.5,2.5 parent: 1 - - type: DeviceLinkSink - links: - - 2603 - uid: 2532 components: - type: Transform pos: 2.5,2.5 parent: 1 - - type: DeviceLinkSink - links: - - 2603 - uid: 2533 components: - type: Transform rot: 1.5707963267948966 rad pos: 8.5,15.5 parent: 1 - - type: DeviceLinkSink - links: - - 2608 - uid: 2534 components: - type: Transform rot: 1.5707963267948966 rad pos: 8.5,14.5 parent: 1 - - type: DeviceLinkSink - links: - - 2608 - uid: 2535 components: - type: Transform rot: 1.5707963267948966 rad pos: 8.5,13.5 parent: 1 - - type: DeviceLinkSink - links: - - 2608 - proto: ShuttersWindowOpen entities: - uid: 2536 @@ -17967,73 +18429,46 @@ entities: - type: Transform pos: 3.5,31.5 parent: 1 - - type: DeviceLinkSink - links: - - 2607 - uid: 2537 components: - type: Transform pos: 3.5,32.5 parent: 1 - - type: DeviceLinkSink - links: - - 2607 - uid: 2538 components: - type: Transform pos: 4.5,32.5 parent: 1 - - type: DeviceLinkSink - links: - - 2607 - uid: 2539 components: - type: Transform pos: 5.5,32.5 parent: 1 - - type: DeviceLinkSink - links: - - 2607 - uid: 2540 components: - type: Transform pos: 6.5,32.5 parent: 1 - - type: DeviceLinkSink - links: - - 2607 - uid: 2541 components: - type: Transform pos: 7.5,32.5 parent: 1 - - type: DeviceLinkSink - links: - - 2607 - uid: 2542 components: - type: Transform pos: 8.5,32.5 parent: 1 - - type: DeviceLinkSink - links: - - 2607 - uid: 2543 components: - type: Transform pos: 8.5,31.5 parent: 1 - - type: DeviceLinkSink - links: - - 2607 - uid: 2544 components: - type: Transform pos: 9.5,29.5 parent: 1 - - type: DeviceLinkSink - links: - - 2607 - proto: ShuttleWindow entities: - uid: 606 @@ -18956,8 +19391,6 @@ entities: rot: 3.141592653589793 rad pos: 5.5,17.5 parent: 1 - - type: Physics - canCollide: False - proto: SuitStorageWallmountMercenary entities: - uid: 2471 @@ -18966,8 +19399,6 @@ entities: rot: -1.5707963267948966 rad pos: -10.5,4.5 parent: 1 - - type: Physics - canCollide: False - proto: SurveillanceCameraGeneral entities: - uid: 2681 From d9d0a6420633cac1419e0480d58766276d3bc714 Mon Sep 17 00:00:00 2001 From: Tabitha <64847293+KyuPolaris@users.noreply.github.com> Date: Fri, 6 Sep 2024 19:21:13 +1000 Subject: [PATCH 2/6] Added fire alarms to firelocks --- Resources/Maps/_NF/Shuttles/crescent.yml | 60 ++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/Resources/Maps/_NF/Shuttles/crescent.yml b/Resources/Maps/_NF/Shuttles/crescent.yml index ad4cc3ac234..c622e65bcf2 100644 --- a/Resources/Maps/_NF/Shuttles/crescent.yml +++ b/Resources/Maps/_NF/Shuttles/crescent.yml @@ -1108,6 +1108,7 @@ entities: - type: MovedGrids - type: Broadphase - type: OccluderTree + - type: LoadedMap - proto: ActionToggleLight entities: - uid: 1130 @@ -9420,6 +9421,38 @@ entities: - type: Transform pos: -26.5,19.5 parent: 1 +- proto: FireAlarm + entities: + - uid: 2453 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 25.5,13.5 + parent: 1 + - type: DeviceList + devices: + - 1318 + - 1319 + - uid: 2514 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,14.5 + parent: 1 + - type: DeviceList + devices: + - 1351 + - 1350 + - uid: 2643 + components: + - type: Transform + pos: -3.5,25.5 + parent: 1 + - type: DeviceList + devices: + - 1347 + - 1348 + - 1349 - proto: FireAxeCabinetFilled entities: - uid: 1293 @@ -9564,11 +9597,17 @@ entities: - type: Transform pos: 23.5,15.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2453 - uid: 1319 components: - type: Transform pos: 23.5,16.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2453 - uid: 1320 components: - type: Transform @@ -9709,26 +9748,47 @@ entities: - type: Transform pos: -4.5,28.5 parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 2643 - uid: 1348 components: - type: Transform pos: -5.5,28.5 parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 2643 - uid: 1349 components: - type: Transform pos: -6.5,28.5 parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 2643 - uid: 1350 components: - type: Transform pos: -22.5,16.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2514 - uid: 1351 components: - type: Transform pos: -22.5,15.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2514 - uid: 1352 components: - type: Transform From 66810f06b0d41f9309628a4387ff1c8a01d39802 Mon Sep 17 00:00:00 2001 From: Tabitha <64847293+KyuPolaris@users.noreply.github.com> Date: Sat, 21 Sep 2024 16:23:08 +1000 Subject: [PATCH 3/6] Replaced Tiny Fans with Directional ones + Replaced AME fuel with wall locker --- Resources/Maps/_NF/Shuttles/crescent.yml | 154 ++++++++++++++++------- 1 file changed, 108 insertions(+), 46 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/crescent.yml b/Resources/Maps/_NF/Shuttles/crescent.yml index c622e65bcf2..96c3163b579 100644 --- a/Resources/Maps/_NF/Shuttles/crescent.yml +++ b/Resources/Maps/_NF/Shuttles/crescent.yml @@ -1515,6 +1515,14 @@ entities: - type: Transform pos: 14.5,6.5 parent: 1 +- proto: AirlockExternal + entities: + - uid: 119 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -28.5,15.5 + parent: 1 - proto: AirlockExternalGlass entities: - uid: 37 @@ -1547,11 +1555,12 @@ entities: - type: Transform pos: 29.5,15.5 parent: 1 - - uid: 43 - components: - - type: Transform - pos: -28.5,15.5 - parent: 1 + - type: Door + secondsUntilStateChange: -554.0798 + state: Opening + - type: DeviceLinkSource + lastSignals: + DoorStatus: True - proto: AirlockGlass entities: - uid: 44 @@ -1668,46 +1677,72 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,38.5 parent: 1 + - type: Door + secondsUntilStateChange: -144.74686 + state: Opening + - type: DeviceLinkSource + lastSignals: + DoorStatus: True - uid: 67 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,40.5 parent: 1 + - type: Door + secondsUntilStateChange: -145.31352 + state: Opening + - type: DeviceLinkSource + lastSignals: + DoorStatus: True - uid: 68 components: - type: Transform rot: 3.141592653589793 rad pos: -4.5,42.5 parent: 1 + - type: Door + secondsUntilStateChange: -146.94685 + state: Opening + - type: DeviceLinkSource + lastSignals: + DoorStatus: True - uid: 69 components: - type: Transform rot: 3.141592653589793 rad pos: -6.5,42.5 parent: 1 + - type: Door + secondsUntilStateChange: -147.58018 + state: Opening + - type: DeviceLinkSource + lastSignals: + DoorStatus: True - uid: 70 components: - type: Transform rot: -1.5707963267948966 rad pos: -8.5,40.5 parent: 1 + - type: Door + secondsUntilStateChange: -146.41351 + state: Opening + - type: DeviceLinkSource + lastSignals: + DoorStatus: True - uid: 71 components: - type: Transform rot: -1.5707963267948966 rad pos: -8.5,38.5 parent: 1 - - uid: 72 - components: - - type: Transform - pos: -12.5,-0.5 - parent: 1 - - uid: 73 - components: - - type: Transform - pos: -10.5,-0.5 - parent: 1 + - type: Door + secondsUntilStateChange: -145.94685 + state: Opening + - type: DeviceLinkSource + lastSignals: + DoorStatus: True - proto: AirlockMedical entities: - uid: 74 @@ -1809,6 +1844,30 @@ entities: - type: Transform pos: 29.5,23.5 parent: 1 +- proto: AirlockShuttle + entities: + - uid: 72 + components: + - type: Transform + pos: -10.5,-0.5 + parent: 1 + - type: DeviceLinkSource + lastSignals: + DoorStatus: True + - type: Door + secondsUntilStateChange: -66.8136 + state: Opening + - uid: 73 + components: + - type: Transform + pos: -12.5,-0.5 + parent: 1 + - type: DeviceLinkSource + lastSignals: + DoorStatus: True + - type: Door + secondsUntilStateChange: -175.6135 + state: Opening - proto: AmeController entities: - uid: 91 @@ -1837,16 +1896,6 @@ entities: parent: 91 - type: Physics canCollide: False - - uid: 184 - components: - - type: Transform - pos: 13.240746,2.67622 - parent: 1 - - uid: 442 - components: - - type: Transform - pos: 13.751163,2.6970534 - parent: 1 - uid: 1174 components: - type: Transform @@ -1992,58 +2041,68 @@ entities: - type: Transform pos: 5.5,28.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 119 + - uid: 43 components: - type: Transform - pos: -28.5,15.5 + rot: 1.5707963267948966 rad + pos: 29.5,15.5 parent: 1 - uid: 120 components: - type: Transform - pos: -8.5,38.5 + rot: 1.5707963267948966 rad + pos: -2.5,38.5 parent: 1 - uid: 121 components: - type: Transform - pos: -8.5,40.5 + rot: 1.5707963267948966 rad + pos: -2.5,40.5 parent: 1 - uid: 122 components: - type: Transform - pos: -6.5,42.5 + rot: 3.141592653589793 rad + pos: -4.5,42.5 parent: 1 - uid: 123 components: - type: Transform - pos: -4.5,42.5 + rot: 3.141592653589793 rad + pos: -6.5,42.5 parent: 1 - uid: 124 components: - type: Transform - pos: -2.5,40.5 + rot: -1.5707963267948966 rad + pos: -8.5,40.5 parent: 1 - uid: 125 components: - type: Transform - pos: -2.5,38.5 + rot: -1.5707963267948966 rad + pos: -8.5,38.5 parent: 1 - uid: 126 components: - type: Transform - pos: -12.5,-0.5 + pos: -10.5,-0.5 parent: 1 - uid: 127 components: - type: Transform - pos: -10.5,-0.5 + pos: -12.5,-0.5 parent: 1 - uid: 128 components: - type: Transform - pos: 29.5,15.5 + rot: -1.5707963267948966 rad + pos: -28.5,15.5 parent: 1 +- proto: AtmosDeviceFanTiny + entities: - uid: 129 components: - type: Transform @@ -16804,6 +16863,14 @@ entities: - 0 - 0 - 0 +- proto: LockerWallMaterialsFuelAmeJarFilled + entities: + - uid: 184 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 12.5,2.5 + parent: 1 - proto: MachineAnomalyGenerator entities: - uid: 2242 @@ -17828,11 +17895,6 @@ entities: - type: Transform pos: -22.5,35.5 parent: 1 - - uid: 2409 - components: - - type: Transform - pos: 13.5,2.5 - parent: 1 - uid: 2410 components: - type: Transform @@ -19071,7 +19133,7 @@ entities: - type: Transform pos: 6.5,28.5 parent: 1 -- proto: SignChemistry1 +- proto: SignChem entities: - uid: 2613 components: @@ -19139,14 +19201,14 @@ entities: rot: 1.5707963267948966 rad pos: 3.5,6.5 parent: 1 -- proto: SignHydro3 +- proto: SignHydro1 entities: - uid: 2623 components: - type: Transform pos: 10.5,6.5 parent: 1 -- proto: SignScience1 +- proto: SignScience entities: - uid: 2624 components: @@ -19160,7 +19222,7 @@ entities: - type: Transform pos: 6.5,0.5 parent: 1 -- proto: SignXenolab +- proto: SignXenobio entities: - uid: 2625 components: From e4d347f3c7078e11c8540512bd2113c61f7cc4ee Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 5 Oct 2024 22:29:29 +0300 Subject: [PATCH 4/6] Added the AI but left the rule not open (Need to fix issues) --- Resources/Maps/_NF/Shuttles/crescent.yml | 896 ++++++++---------- .../Prototypes/_NF/Shipyard/crescent.yml | 1 + 2 files changed, 376 insertions(+), 521 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/crescent.yml b/Resources/Maps/_NF/Shuttles/crescent.yml index 96c3163b579..2c7d6a9cc98 100644 --- a/Resources/Maps/_NF/Shuttles/crescent.yml +++ b/Resources/Maps/_NF/Shuttles/crescent.yml @@ -32,12 +32,12 @@ entities: name: Crescent - type: Transform pos: -0.22537023,-0.7676166 - parent: 1226 + parent: invalid - type: MapGrid chunks: 0,0: ind: 0,0 - tiles: ZAAAAAADZAAAAAADZAAAAAADZAAAAAABZAAAAAADZAAAAAABegAAAAAAHgAAAAADHgAAAAAAHgAAAAAAOwAAAAAAOwAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAZAAAAAADZAAAAAACZAAAAAAAZAAAAAACZAAAAAADZAAAAAABegAAAAAAHgAAAAACHgAAAAABHgAAAAADOwAAAAAAOwAAAAAAegAAAAAAHgAAAAABHgAAAAACHgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAADegAAAAAAegAAAAAAOwAAAAAAOwAAAAAAegAAAAAAHgAAAAAAHgAAAAADHgAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAegAAAAAAHgAAAAAAHgAAAAADHgAAAAADPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAHgAAAAACOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAegAAAAAAHgAAAAACHgAAAAABHgAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAegAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAHgAAAAADHgAAAAADHgAAAAAAHgAAAAACHgAAAAABHgAAAAAAHgAAAAACHgAAAAABHgAAAAADHgAAAAABHgAAAAABHgAAAAACHgAAAAACHgAAAAACHgAAAAAAHgAAAAACHgAAAAAAHgAAAAABHgAAAAADHgAAAAABHgAAAAADHgAAAAACHgAAAAACHgAAAAAAHgAAAAABHgAAAAABHgAAAAACHgAAAAAAHgAAAAAAHgAAAAACHgAAAAADHgAAAAABHgAAAAAAHgAAAAACegAAAAAAegAAAAAAHgAAAAADegAAAAAAegAAAAAAaQAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAHgAAAAACHgAAAAAAegAAAAAAHgAAAAACaQAAAAAAegAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAegAAAAAAdwAAAAABdwAAAAACegAAAAAAdwAAAAACdwAAAAAAegAAAAAAHgAAAAABHgAAAAACegAAAAAAHgAAAAACHgAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAACHgAAAAADegAAAAAALgAAAAACHgAAAAAAegAAAAAAdwAAAAACdwAAAAAAdwAAAAABdwAAAAACdwAAAAAAegAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAegAAAAAAHgAAAAACHgAAAAAAegAAAAAALgAAAAAAHgAAAAAAaQAAAAAAdwAAAAAAdwAAAAABdwAAAAADdwAAAAACdwAAAAABegAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAALgAAAAACHgAAAAADegAAAAAAdwAAAAADdwAAAAADdwAAAAACdwAAAAADdwAAAAADegAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAegAAAAAAHgAAAAADHgAAAAABegAAAAAALgAAAAAAHgAAAAACHgAAAAAAdwAAAAAAdwAAAAACdwAAAAADdwAAAAACdwAAAAAAegAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAegAAAAAAHgAAAAAAHgAAAAADHgAAAAAC + tiles: ZAAAAAADZAAAAAADZAAAAAADZAAAAAABZAAAAAADZAAAAAABegAAAAAAHgAAAAADHgAAAAAAHgAAAAAAOwAAAAAAOwAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAZAAAAAADZAAAAAACZAAAAAAAZAAAAAACZAAAAAADZAAAAAABegAAAAAAHgAAAAACHgAAAAABHgAAAAADOwAAAAAAOwAAAAAAegAAAAAAHgAAAAABHgAAAAACHgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAADegAAAAAAegAAAAAAOwAAAAAAOwAAAAAAegAAAAAAHgAAAAAAHgAAAAADHgAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAegAAAAAAHgAAAAAAHgAAAAADHgAAAAADPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAHgAAAAACOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAegAAAAAAHgAAAAACHgAAAAABHgAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAegAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAHgAAAAADHgAAAAADHgAAAAAAHgAAAAACHgAAAAABHgAAAAAAHgAAAAACHgAAAAABHgAAAAADHgAAAAABHgAAAAABHgAAAAACHgAAAAACHgAAAAACHgAAAAAAHgAAAAACHgAAAAAAHgAAAAABHgAAAAADHgAAAAABHgAAAAADHgAAAAACHgAAAAACHgAAAAAAHgAAAAABHgAAAAABHgAAAAACHgAAAAAAHgAAAAAAHgAAAAACHgAAAAADHgAAAAABHgAAAAAAHgAAAAACegAAAAAAegAAAAAAHgAAAAADegAAAAAAegAAAAAAaQAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAHgAAAAACHgAAAAAAegAAAAAAHgAAAAACaQAAAAAAegAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAegAAAAAAdwAAAAABdwAAAAACegAAAAAAdwAAAAACdwAAAAAAegAAAAAAHgAAAAABHgAAAAACegAAAAAAHgAAAAACHgAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAACHgAAAAADegAAAAAALgAAAAACHgAAAAAAegAAAAAAdwAAAAACdwAAAAAAdwAAAAABdwAAAAACdwAAAAAAegAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAegAAAAAAHgAAAAACHgAAAAAAegAAAAAALgAAAAAAHgAAAAAAaQAAAAAAdwAAAAAAdwAAAAABdwAAAAADdwAAAAACdwAAAAABegAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAALgAAAAACHgAAAAADegAAAAAAdwAAAAADdwAAAAADdwAAAAACdwAAAAADdwAAAAADegAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAegAAAAAAHgAAAAADHgAAAAABegAAAAAALgAAAAAAHgAAAAACHgAAAAAAdwAAAAAAdwAAAAACdwAAAAADdwAAAAACdwAAAAAAegAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAegAAAAAAHgAAAAAAHgAAAAADHgAAAAAC version: 6 0,-1: ind: 0,-1 @@ -81,7 +81,7 @@ entities: version: 6 0,1: ind: 0,1 - tiles: LgAAAAABHgAAAAABHgAAAAACdwAAAAACdwAAAAABdwAAAAABdwAAAAAAdwAAAAADegAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAegAAAAAAHgAAAAACHgAAAAABHgAAAAADLgAAAAADHgAAAAABegAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAHgAAAAAAHgAAAAABegAAAAAAdwAAAAAAdwAAAAADdwAAAAACegAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAAHgAAAAACaQAAAAAAegAAAAAAdwAAAAACdwAAAAADdwAAAAACegAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAAHgAAAAACHgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAAHgAAAAACHgAAAAABaQAAAAAAHgAAAAABHgAAAAAAHgAAAAACaQAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAALgAAAAABHgAAAAAAaQAAAAAAHgAAAAACHgAAAAAAHgAAAAADaQAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAALgAAAAACHgAAAAADegAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAABHgAAAAAAegAAAAAAHgAAAAACHgAAAAAAHgAAAAADHgAAAAADHgAAAAABHgAAAAAAHgAAAAADaQAAAAAAHgAAAAACHgAAAAACegAAAAAAegAAAAAAAAAAAAAAaQAAAAAAHgAAAAAAHgAAAAADHgAAAAADHgAAAAABHgAAAAACHgAAAAADHgAAAAABHgAAAAACHgAAAAADHgAAAAACHgAAAAABegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAABegAAAAAAaQAAAAAAHgAAAAADaQAAAAAAHgAAAAACHgAAAAABHgAAAAACaQAAAAAAHgAAAAABegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAABdwAAAAACegAAAAAAHgAAAAAAHgAAAAADHgAAAAABHgAAAAADHgAAAAABHgAAAAABHgAAAAABegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAAAHgAAAAACHgAAAAADHgAAAAACHgAAAAAAHgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAALgAAAAADHgAAAAADHgAAAAACLgAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAALgAAAAABLgAAAAADLgAAAAACLgAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: LgAAAAABHgAAAAABHgAAAAACdwAAAAACdwAAAAABdwAAAAABdwAAAAAAdwAAAAADegAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAegAAAAAAHgAAAAACHgAAAAABHgAAAAADLgAAAAADHgAAAAABegAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAHgAAAAAAHgAAAAABegAAAAAAdwAAAAAAdwAAAAADdwAAAAACegAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAAHgAAAAACaQAAAAAAegAAAAAAdwAAAAACdwAAAAADdwAAAAACegAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAAHgAAAAACHgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAAHgAAAAACHgAAAAABaQAAAAAAHgAAAAABHgAAAAAAHgAAAAACaQAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAALgAAAAABHgAAAAAAaQAAAAAAHgAAAAACHgAAAAAAHgAAAAADaQAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAALgAAAAACHgAAAAADegAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAABHgAAAAAAegAAAAAAHgAAAAACHgAAAAAAHgAAAAADHgAAAAADHgAAAAABHgAAAAAAHgAAAAADaQAAAAAAHgAAAAACHgAAAAACegAAAAAAegAAAAAAAAAAAAAAaQAAAAAAHgAAAAAAHgAAAAADHgAAAAADHgAAAAABHgAAAAACHgAAAAADHgAAAAABHgAAAAACHgAAAAADHgAAAAACHgAAAAABegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAABegAAAAAAaQAAAAAAHgAAAAADaQAAAAAAHgAAAAACHgAAAAABHgAAAAACaQAAAAAAHgAAAAABegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAABdwAAAAACegAAAAAAHgAAAAAAHgAAAAADHgAAAAABHgAAAAADHgAAAAABHgAAAAABHgAAAAABegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAAAHgAAAAACHgAAAAADHgAAAAACHgAAAAAAHgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAALgAAAAADHgAAAAADHgAAAAACLgAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAALgAAAAABLgAAAAADLgAAAAACLgAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,2: ind: -1,2 @@ -557,78 +557,6 @@ entities: 147: -16,13 148: -16,11 149: -16,10 - - node: - color: '#FFFFFFFF' - id: Flowersbr1 - decals: - 0: 9.389877,14.433586 - 1: 9.776596,15.593742 - 2: 10.409409,14.609367 - 3: 9.038315,12.921867 - - node: - color: '#FFFFFFFF' - id: Flowersbr2 - decals: - 277: 11.020526,12.88933 - - node: - color: '#FFFFFFFF' - id: Flowerspv2 - decals: - 4: 9.389877,14.39843 - 5: 10.479721,14.996086 - 6: 10.233627,15.066399 - 7: 10.725815,15.277336 - 8: 10.936752,14.11718 - - node: - color: '#FFFFFFFF' - id: Flowerspv3 - decals: - 278: 10.301776,13.26433 - 279: 9.447609,13.10808 - - node: - color: '#FFFFFFFF' - id: Flowersy1 - decals: - 276: 9.822609,13.243497 - - node: - color: '#FFFFFFFF' - id: Flowersy2 - decals: - 9: 9.189604,13.83593 - 10: 9.927885,14.996086 - 11: 10.490385,14.855461 - 12: 9.119291,15.417961 - 13: 9.330229,15.945305 - 14: 10.701323,15.80468 - 15: 11.19351,13.83593 - - node: - color: '#FFFFFFFF' - id: Flowersy3 - decals: - 266: 8.953577,14.003855 - 267: 10.328577,13.785105 - 268: 11.234827,15.035105 - 269: 11.031702,15.36323 - 270: 8.906702,15.878855 - 271: 9.797327,16.097605 - 272: 10.594202,15.878855 - 273: 9.172327,14.097605 - 274: 8.812952,13.503855 - 275: 11.187952,13.285105 - - node: - color: '#FFFFFFFF' - id: Flowersy4 - decals: - 16: 9.457235,14.082024 - 17: 9.633017,15.066399 - 18: 10.476767,14.503899 - 19: 10.336142,14.39843 - 20: 11.250204,15.80468 - 21: 10.476767,15.628899 - 22: 9.281454,13.83593 - 23: 8.648642,13.062492 - 24: 8.789267,14.820305 - 280: 10.166359,12.941414 - node: color: '#FFFFFFFF' id: WoodTrimThinLineN @@ -688,7 +616,8 @@ entities: 0,4: 0: 43835 1,0: - 0: 63675 + 0: 63539 + 1: 136 1,1: 0: 61631 1,2: @@ -700,7 +629,8 @@ entities: 1,4: 0: 47903 2,0: - 0: 64733 + 1: 17 + 0: 64716 2,1: 0: 62207 2,2: @@ -726,9 +656,9 @@ entities: 4,2: 0: 4095 4,3: - 1: 17 + 2: 17 0: 61440 - 2: 68 + 5: 68 -1,-1: 0: 65024 -4,0: @@ -746,13 +676,12 @@ entities: -4,3: 0: 64733 -5,3: - 0: 61663 - 3: 32 + 0: 61695 -4,4: 0: 52431 - 1: 4096 + 2: 4096 -4,-1: - 4: 8192 + 3: 8192 0: 32768 -3,0: 0: 20667 @@ -762,11 +691,11 @@ entities: 0: 1615 -3,3: 0: 256 - 5: 61166 + 4: 61166 -3,-1: 0: 8192 -3,4: - 5: 14 + 4: 14 0: 26112 -2,0: 0: 62139 @@ -784,7 +713,7 @@ entities: 0: 48015 4,4: 0: 15 - 1: 4608 + 2: 4608 5,0: 0: 29440 5,1: @@ -797,43 +726,43 @@ entities: 7: 68 5,4: 0: 15 - 1: 16896 + 2: 16896 6,0: - 4: 4096 + 3: 4096 6,2: 0: 26230 6,3: 0: 63239 6,1: - 4: 32 + 3: 32 0: 8192 6,4: 0: 65319 7,2: - 1: 4096 + 2: 4096 7,3: 0: 12544 - 1: 2 - 4: 52416 + 2: 2 + 3: 52416 7,4: 0: 4353 - 4: 204 + 3: 204 -8,3: - 4: 26208 + 3: 26208 0: 32768 - 1: 8 + 2: 8 -8,4: - 4: 102 + 3: 102 -7,3: 0: 61900 -7,2: - 1: 4096 + 2: 4096 0: 49356 -7,4: 0: 49037 -7,1: 0: 32768 - 1: 8 + 2: 8 -6,2: 0: 28286 -6,3: @@ -842,12 +771,12 @@ entities: 0: 61166 -6,4: 0: 4383 - 1: 18432 + 2: 18432 -6,0: 0: 34816 -5,4: 0: 15 - 1: 2048 + 2: 2048 -8,5: 0: 34944 -8,6: @@ -879,8 +808,7 @@ entities: 6,7: 0: 28791 6,8: - 0: 639 - 1: 12288 + 0: 12927 7,5: 0: 9008 7,6: @@ -891,28 +819,28 @@ entities: 0: 4403 -7,9: 0: 204 - 4: 32768 + 3: 32768 -6,9: 0: 51 - 4: 28672 + 3: 28672 -6,10: - 4: 18039 + 3: 18039 -6,11: - 4: 68 + 3: 68 5,8: - 1: 32768 + 0: 32768 5,9: - 1: 136 - 4: 49152 + 0: 136 + 3: 49152 5,10: - 4: 19660 + 3: 19660 5,11: - 4: 68 + 3: 68 6,9: - 1: 51 - 4: 12288 + 0: 51 + 3: 12288 6,10: - 4: 17 + 3: 17 -4,5: 0: 3276 -3,5: @@ -933,9 +861,9 @@ entities: 0: 26191 -1,7: 0: 6 - 4: 28160 + 3: 28160 -1,8: - 4: 2 + 3: 2 0,5: 0: 16371 0,6: @@ -987,10 +915,10 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.15 + temperature: 235 moles: - - 0 - - 0 + - 21.824879 + - 82.10312 - 0 - 0 - 0 @@ -1007,7 +935,7 @@ entities: - 0 - 0 - 0 - - 2500 + - 0 - 0 - 0 - 0 @@ -1017,11 +945,8 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.15 + immutable: True moles: - - 21.6852 - - 81.57766 - - 0 - 0 - 0 - 0 @@ -1031,15 +956,18 @@ entities: - 0 - 0 - 0 - - volume: 2500 - immutable: True - moles: - 0 - 0 - 0 + - volume: 2500 + temperature: 340 + moles: + - 21.824879 + - 82.10312 - 0 - 0 - 0 + - 82.10312 - 0 - 0 - 0 @@ -1047,14 +975,14 @@ entities: - 0 - 0 - volume: 2500 - temperature: 340 + temperature: 293.15 moles: - - 21.824879 - - 82.10312 - 0 - 0 - 0 - - 82.10312 + - 2500 + - 0 + - 0 - 0 - 0 - 0 @@ -1096,19 +1024,6 @@ entities: - type: RadiationGridResistance - type: BecomesStation id: Crescent - - uid: 1226 - components: - - type: MetaData - name: Map Entity - - type: Transform - - type: Map - mapPaused: True - - type: PhysicsMap - - type: GridTree - - type: MovedGrids - - type: Broadphase - - type: OccluderTree - - type: LoadedMap - proto: ActionToggleLight entities: - uid: 1130 @@ -1517,6 +1432,12 @@ entities: parent: 1 - proto: AirlockExternal entities: + - uid: 42 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 29.5,15.5 + parent: 1 - uid: 119 components: - type: Transform @@ -1550,17 +1471,6 @@ entities: - type: Transform pos: 27.5,15.5 parent: 1 - - uid: 42 - components: - - type: Transform - pos: 29.5,15.5 - parent: 1 - - type: Door - secondsUntilStateChange: -554.0798 - state: Opening - - type: DeviceLinkSource - lastSignals: - DoorStatus: True - proto: AirlockGlass entities: - uid: 44 @@ -1674,75 +1584,39 @@ entities: - uid: 66 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,38.5 + rot: -1.5707963267948966 rad + pos: -8.5,38.5 parent: 1 - - type: Door - secondsUntilStateChange: -144.74686 - state: Opening - - type: DeviceLinkSource - lastSignals: - DoorStatus: True - uid: 67 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,40.5 + rot: -1.5707963267948966 rad + pos: -8.5,40.5 parent: 1 - - type: Door - secondsUntilStateChange: -145.31352 - state: Opening - - type: DeviceLinkSource - lastSignals: - DoorStatus: True - uid: 68 components: - type: Transform rot: 3.141592653589793 rad - pos: -4.5,42.5 + pos: -6.5,42.5 parent: 1 - - type: Door - secondsUntilStateChange: -146.94685 - state: Opening - - type: DeviceLinkSource - lastSignals: - DoorStatus: True - uid: 69 components: - type: Transform rot: 3.141592653589793 rad - pos: -6.5,42.5 + pos: -4.5,42.5 parent: 1 - - type: Door - secondsUntilStateChange: -147.58018 - state: Opening - - type: DeviceLinkSource - lastSignals: - DoorStatus: True - uid: 70 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,40.5 + rot: 1.5707963267948966 rad + pos: -2.5,40.5 parent: 1 - - type: Door - secondsUntilStateChange: -146.41351 - state: Opening - - type: DeviceLinkSource - lastSignals: - DoorStatus: True - uid: 71 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,38.5 + rot: 1.5707963267948966 rad + pos: -2.5,38.5 parent: 1 - - type: Door - secondsUntilStateChange: -145.94685 - state: Opening - - type: DeviceLinkSource - lastSignals: - DoorStatus: True - proto: AirlockMedical entities: - uid: 74 @@ -1851,23 +1725,11 @@ entities: - type: Transform pos: -10.5,-0.5 parent: 1 - - type: DeviceLinkSource - lastSignals: - DoorStatus: True - - type: Door - secondsUntilStateChange: -66.8136 - state: Opening - uid: 73 components: - type: Transform pos: -12.5,-0.5 parent: 1 - - type: DeviceLinkSource - lastSignals: - DoorStatus: True - - type: Door - secondsUntilStateChange: -175.6135 - state: Opening - proto: AmeController entities: - uid: 91 @@ -2101,19 +1963,23 @@ entities: rot: -1.5707963267948966 rad pos: -28.5,15.5 parent: 1 -- proto: AtmosDeviceFanTiny - entities: - uid: 129 components: - type: Transform + rot: 3.141592653589793 rad pos: 25.5,34.5 parent: 1 - uid: 130 components: - type: Transform - rot: 3.141592653589793 rad + rot: 1.5707963267948966 rad pos: -11.5,14.5 parent: 1 + - uid: 1931 + components: + - type: Transform + pos: 7.5,2.5 + parent: 1 - proto: AtmosFixBlockerMarker entities: - uid: 131 @@ -2126,56 +1992,6 @@ entities: - type: Transform pos: 16.5,12.5 parent: 1 - - uid: 133 - components: - - type: Transform - pos: 23.5,37.5 - parent: 1 - - uid: 134 - components: - - type: Transform - pos: 23.5,36.5 - parent: 1 - - uid: 135 - components: - - type: Transform - pos: 23.5,35.5 - parent: 1 - - uid: 136 - components: - - type: Transform - pos: 24.5,37.5 - parent: 1 - - uid: 137 - components: - - type: Transform - pos: 24.5,36.5 - parent: 1 - - uid: 138 - components: - - type: Transform - pos: 24.5,35.5 - parent: 1 - - uid: 139 - components: - - type: Transform - pos: 25.5,37.5 - parent: 1 - - uid: 140 - components: - - type: Transform - pos: 25.5,36.5 - parent: 1 - - uid: 141 - components: - - type: Transform - pos: 25.5,35.5 - parent: 1 - - uid: 142 - components: - - type: Transform - pos: 24.5,38.5 - parent: 1 - uid: 2220 components: - type: Transform @@ -2536,6 +2352,28 @@ entities: - type: Transform pos: -14.5,-0.5 parent: 1 +- proto: AtmosFixFreezerMarker + entities: + - uid: 1279 + components: + - type: Transform + pos: 8.5,1.5 + parent: 1 + - uid: 1282 + components: + - type: Transform + pos: 7.5,1.5 + parent: 1 + - uid: 1992 + components: + - type: Transform + pos: 7.5,0.5 + parent: 1 + - uid: 2008 + components: + - type: Transform + pos: 8.5,0.5 + parent: 1 - proto: AtmosFixSaunaMarker entities: - uid: 3428 @@ -2995,10 +2833,10 @@ entities: canCollide: False - proto: BookAtmosWaste entities: - - uid: 1441 + - uid: 136 components: - type: Transform - pos: 11.502059,15.687635 + pos: 9.501426,15.640311 parent: 1 - proto: BookshelfFilled entities: @@ -3019,6 +2857,18 @@ entities: - type: Transform pos: -6.5,5.5 parent: 1 +- proto: BorgCharger + entities: + - uid: 1226 + components: + - type: Transform + pos: 11.5,12.5 + parent: 1 + - uid: 1383 + components: + - type: Transform + pos: 9.5,12.5 + parent: 1 - proto: Bucket entities: - uid: 3520 @@ -3033,6 +2883,11 @@ entities: parent: 1 - proto: CableApcExtension entities: + - uid: 135 + components: + - type: Transform + pos: 9.5,15.5 + parent: 1 - uid: 152 components: - type: Transform @@ -5498,6 +5353,21 @@ entities: - type: Transform pos: -11.5,24.5 parent: 1 + - uid: 1071 + components: + - type: Transform + pos: 9.5,14.5 + parent: 1 + - uid: 1402 + components: + - type: Transform + pos: 10.5,14.5 + parent: 1 + - uid: 1675 + components: + - type: Transform + pos: 9.5,16.5 + parent: 1 - uid: 2818 components: - type: Transform @@ -7649,15 +7519,13 @@ entities: - type: Transform pos: -18.450588,5.9712296 parent: 1 -- proto: ClothingUnderSocksBee +- proto: ClothingUnderSocksCoder entities: - - uid: 1214 + - uid: 140 components: - type: Transform - pos: 11.630123,25.476461 + pos: 11.762692,25.400972 parent: 1 -- proto: ClothingUnderSocksCoder - entities: - uid: 1215 components: - type: Transform @@ -7859,52 +7727,16 @@ entities: parent: 1 - proto: CrateEngineeringSolar entities: - - uid: 1242 + - uid: 1271 components: - type: Transform - pos: 25.5,11.5 + pos: 24.5,12.5 parent: 1 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 1243 + - uid: 1274 components: - type: Transform - pos: 26.5,11.5 + pos: 26.5,12.5 parent: 1 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - proto: CrateFoodBarSupply entities: - uid: 1244 @@ -8095,6 +7927,18 @@ entities: rot: -1.5707963267948966 rad pos: -1.5,-1.5 parent: 1 + - uid: 1214 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,10.5 + parent: 1 + - uid: 1242 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,8.5 + parent: 1 - uid: 1254 components: - type: Transform @@ -8112,12 +7956,6 @@ entities: - type: Transform pos: -6.5,25.5 parent: 1 - - uid: 2796 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,8.5 - parent: 1 - uid: 3561 components: - type: Transform @@ -8256,12 +8094,24 @@ entities: parent: 1 - proto: DisposalJunctionFlipped entities: + - uid: 442 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.5,14.5 + parent: 1 - uid: 981 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,16.5 parent: 1 + - uid: 2646 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,14.5 + parent: 1 - uid: 3509 components: - type: Transform @@ -8288,6 +8138,18 @@ entities: parent: 1 - proto: DisposalPipe entities: + - uid: 134 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,8.5 + parent: 1 + - uid: 850 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,19.5 + parent: 1 - uid: 976 components: - type: Transform @@ -8330,6 +8192,18 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-0.5 parent: 1 + - uid: 1209 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,20.5 + parent: 1 + - uid: 1243 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,9.5 + parent: 1 - uid: 1256 components: - type: Transform @@ -8351,6 +8225,24 @@ entities: - type: Transform pos: -23.5,17.5 parent: 1 + - uid: 1280 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,8.5 + parent: 1 + - uid: 1377 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 12.5,14.5 + parent: 1 + - uid: 1441 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,8.5 + parent: 1 - uid: 2281 components: - type: Transform @@ -8362,6 +8254,23 @@ entities: rot: 1.5707963267948966 rad pos: -7.5,25.5 parent: 1 + - uid: 2398 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,8.5 + parent: 1 + - uid: 2638 + components: + - type: Transform + pos: 11.5,15.5 + parent: 1 + - uid: 2639 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,14.5 + parent: 1 - uid: 2641 components: - type: Transform @@ -9170,12 +9079,6 @@ entities: rot: 3.141592653589793 rad pos: 13.5,13.5 parent: 1 - - uid: 3683 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 13.5,14.5 - parent: 1 - uid: 3684 components: - type: Transform @@ -9202,6 +9105,12 @@ entities: rot: -1.5707963267948966 rad pos: -14.5,5.5 parent: 1 + - uid: 892 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,18.5 + parent: 1 - uid: 1053 components: - type: Transform @@ -9225,6 +9134,23 @@ entities: rot: -1.5707963267948966 rad pos: 29.5,21.5 parent: 1 + - uid: 2399 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,10.5 + parent: 1 + - uid: 2644 + components: + - type: Transform + pos: 11.5,16.5 + parent: 1 + - uid: 2645 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 9.5,14.5 + parent: 1 - uid: 3504 components: - type: Transform @@ -9239,14 +9165,8 @@ entities: - uid: 3527 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,12.5 - parent: 1 - - uid: 3529 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 7.5,20.5 + rot: -1.5707963267948966 rad + pos: 3.5,12.5 parent: 1 - uid: 3538 components: @@ -9321,15 +9241,20 @@ entities: - type: Transform pos: 2.5,5.5 parent: 1 - - uid: 3523 + - uid: 2267 components: - type: Transform - pos: 3.5,12.5 + pos: 7.5,18.5 parent: 1 - - uid: 3528 + - uid: 2400 components: - type: Transform - pos: 7.5,20.5 + pos: 11.5,16.5 + parent: 1 + - uid: 3523 + components: + - type: Transform + pos: 3.5,12.5 parent: 1 - uid: 3563 components: @@ -9368,6 +9293,12 @@ entities: parent: 1 - proto: DisposalYJunction entities: + - uid: 142 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,8.5 + parent: 1 - uid: 2640 components: - type: Transform @@ -9376,11 +9307,6 @@ entities: parent: 1 - proto: DogBed entities: - - uid: 892 - components: - - type: Transform - pos: 11.5,16.5 - parent: 1 - uid: 1056 components: - type: Transform @@ -9405,28 +9331,6 @@ entities: - type: Transform pos: 5.5478635,16.701803 parent: 1 -- proto: DrinkWaterCup - entities: - - uid: 1279 - components: - - type: Transform - pos: 7.390334,19.515562 - parent: 1 - - uid: 1280 - components: - - type: Transform - pos: 7.6012716,19.7265 - parent: 1 - - uid: 1282 - components: - - type: Transform - pos: 7.624709,19.421812 - parent: 1 - - uid: 1283 - components: - - type: Transform - pos: 7.7418966,19.562437 - parent: 1 - proto: ElectricGuitarInstrument entities: - uid: 1284 @@ -10031,21 +9935,6 @@ entities: rot: -1.5707963267948966 rad pos: -10.5,16.5 parent: 1 - - uid: 1271 - components: - - type: Transform - pos: 10.5,12.5 - parent: 1 - - uid: 1274 - components: - - type: Transform - pos: 11.5,12.5 - parent: 1 - - uid: 1377 - components: - - type: Transform - pos: 9.5,12.5 - parent: 1 - proto: FloraTree05 entities: - uid: 3488 @@ -15957,6 +15846,13 @@ entities: - type: Transform pos: 26.836712,33.432106 parent: 1 +- proto: GoldenPlunger + entities: + - uid: 133 + components: + - type: Transform + pos: 9.584759,14.754279 + parent: 1 - proto: GravityGeneratorMini entities: - uid: 2114 @@ -16545,11 +16441,6 @@ entities: - type: Transform pos: -24.5,25.5 parent: 1 - - uid: 2223 - components: - - type: Transform - pos: -11.5,-0.5 - parent: 1 - proto: IntercomScience entities: - uid: 2224 @@ -17019,6 +16910,33 @@ entities: - type: Transform pos: -22.698347,35.629475 parent: 1 +- proto: NapkinDrum5 + entities: + - uid: 1382 + components: + - type: Transform + pos: -0.73729867,-0.22818732 + parent: 1 + - uid: 2268 + components: + - type: Transform + pos: 0.35272866,5.6867924 + parent: 1 + - uid: 2272 + components: + - type: Transform + pos: -4.688938,0.762084 + parent: 1 + - uid: 2518 + components: + - type: Transform + pos: 9.2769,20.76033 + parent: 1 + - uid: 2637 + components: + - type: Transform + pos: 4.2787952,0.7933556 + parent: 1 - proto: NitrogenCanister entities: - uid: 2259 @@ -17073,18 +16991,6 @@ entities: rot: -1.5707963267948966 rad pos: 28.5,19.5 parent: 1 -- proto: PartRodMetal - entities: - - uid: 2267 - components: - - type: Transform - pos: 26.415115,12.624596 - parent: 1 - - uid: 2268 - components: - - type: Transform - pos: 26.665115,12.515221 - parent: 1 - proto: PenCap entities: - uid: 2269 @@ -17108,12 +17014,13 @@ entities: - type: Transform pos: 18.5,13.5 parent: 1 -- proto: Plunger +- proto: PlayerStationAi entities: - - uid: 2272 + - uid: 139 components: - type: Transform - pos: 11.50988,14.843103 + rot: -1.5707963267948966 rad + pos: 11.5,14.5 parent: 1 - proto: PlushieAtmosian entities: @@ -17827,6 +17734,12 @@ entities: parent: 1 - proto: Rack entities: + - uid: 141 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 26.5,11.5 + parent: 1 - uid: 1378 components: - type: Transform @@ -17853,21 +17766,6 @@ entities: - type: Transform pos: -20.5,5.5 parent: 1 - - uid: 2398 - components: - - type: Transform - pos: 24.5,12.5 - parent: 1 - - uid: 2399 - components: - - type: Transform - pos: 25.5,12.5 - parent: 1 - - uid: 2400 - components: - - type: Transform - pos: 26.5,12.5 - parent: 1 - uid: 2401 components: - type: Transform @@ -17922,11 +17820,6 @@ entities: rot: 3.141592653589793 rad pos: -10.5,15.5 parent: 1 - - uid: 1071 - components: - - type: Transform - pos: 9.5,13.5 - parent: 1 - uid: 1262 components: - type: Transform @@ -17963,16 +17856,6 @@ entities: rot: 1.5707963267948966 rad pos: -8.5,12.5 parent: 1 - - uid: 1382 - components: - - type: Transform - pos: 10.5,13.5 - parent: 1 - - uid: 1383 - components: - - type: Transform - pos: 11.5,13.5 - parent: 1 - uid: 2414 components: - type: Transform @@ -18415,6 +18298,20 @@ entities: - type: Transform pos: 24.5,22.5 parent: 1 + - type: ContainerContainer + containers: + machine_board: !type:Container + showEnts: False + occludes: True + ents: [] + machine_parts: !type:Container + showEnts: False + occludes: True + ents: [] + blueprint: !type:Container + showEnts: False + occludes: True + ents: [] - proto: SeedExtractor entities: - uid: 2515 @@ -18422,37 +18319,27 @@ entities: - type: Transform pos: 9.5,3.5 parent: 1 -- proto: SheetGlass - entities: - - uid: 2516 - components: - - type: Transform - pos: 25.321365,12.687096 - parent: 1 - - uid: 2517 - components: - - type: Transform - pos: 25.602615,12.515221 - parent: 1 -- proto: SheetPlasma - entities: - - uid: 2518 - components: - - type: Transform - pos: 24.50649,25.640497 - parent: 1 -- proto: SheetSteel +- proto: ServiceTechFab entities: - - uid: 2519 - components: - - type: Transform - pos: 24.258865,12.671471 - parent: 1 - - uid: 2520 + - uid: 2223 components: - type: Transform - pos: 24.571365,12.530846 + pos: 4.5,5.5 parent: 1 + - type: ContainerContainer + containers: + machine_board: !type:Container + showEnts: False + occludes: True + ents: [] + machine_parts: !type:Container + showEnts: False + occludes: True + ents: [] + blueprint: !type:Container + showEnts: False + occludes: True + ents: [] - proto: ShuttersNormal entities: - uid: 2521 @@ -19309,40 +19196,6 @@ entities: - type: Transform pos: -5.5,5.5 parent: 1 -- proto: SpawnMobButterfly - entities: - - uid: 1158 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 9.5,16.5 - parent: 1 - - uid: 2637 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 9.5,13.5 - parent: 1 - - uid: 2638 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,14.5 - parent: 1 - - uid: 2639 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 9.5,15.5 - parent: 1 -- proto: SpawnMobParrot - entities: - - uid: 850 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 11.5,16.5 - parent: 1 - proto: SpawnPointLatejoin entities: - uid: 2651 @@ -19409,6 +19262,14 @@ entities: - type: Transform pos: -8.5,15.5 parent: 1 +- proto: StationAiUploadComputer + entities: + - uid: 138 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,15.5 + parent: 1 - proto: StoolBar entities: - uid: 2668 @@ -19778,10 +19639,11 @@ entities: parent: 1 - proto: TableCounterWood entities: - - uid: 1402 + - uid: 1283 components: - type: Transform - pos: 11.5,15.5 + rot: -1.5707963267948966 rad + pos: 9.5,15.5 parent: 1 - proto: TableGlass entities: @@ -19902,11 +19764,6 @@ entities: - type: Transform pos: 12.5,20.5 parent: 1 - - uid: 2743 - components: - - type: Transform - pos: 7.5,19.5 - parent: 1 - uid: 2744 components: - type: Transform @@ -20121,14 +19978,13 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,10.5 parent: 1 - - uid: 2780 +- proto: ToiletGoldenDirtyWater + entities: + - uid: 137 components: - - type: MetaData - desc: Gaze upon your crew and flex your muscles, from the comfort of your Porcelain Throne! - name: porcelain throne - type: Transform - rot: -1.5707963267948966 rad - pos: 11.5,14.5 + rot: 1.5707963267948966 rad + pos: 9.5,14.5 parent: 1 - proto: TomDrumsInstrument entities: @@ -20144,27 +20000,32 @@ entities: - type: Transform pos: 7.4858627,31.592508 parent: 1 -- proto: ToyRubberDuck +- proto: TrashNapkin entities: - - uid: 1675 + - uid: 2409 components: - type: Transform - pos: 9.481226,12.812635 + pos: 10.844567,14.360178 parent: 1 - - uid: 1931 + - uid: 2516 components: - type: Transform - pos: 9.991643,12.427218 + pos: 10.849197,14.809564 parent: 1 - - uid: 1992 + - uid: 2517 components: - type: Transform - pos: 10.741643,12.760551 + pos: 10.599329,14.953457 parent: 1 - - uid: 2008 + - uid: 2519 + components: + - type: Transform + pos: 10.636234,14.160965 + parent: 1 + - uid: 2520 components: - type: Transform - pos: 11.418726,12.448051 + pos: 10.6321535,14.659507 parent: 1 - proto: UniformShortsRed entities: @@ -20282,13 +20143,6 @@ entities: - type: Transform pos: 0.5,11.5 parent: 1 -- proto: VendingMachineDinnerware - entities: - - uid: 1209 - components: - - type: Transform - pos: 4.5,5.5 - parent: 1 - proto: VendingMachineEngiDrobe entities: - uid: 1131 @@ -23638,10 +23492,10 @@ entities: location: Crescent - proto: WaterCooler entities: - - uid: 3427 + - uid: 1158 components: - type: Transform - pos: 7.5,18.5 + pos: 7.5,19.5 parent: 1 - proto: WaterVaporCanister entities: diff --git a/Resources/Prototypes/_NF/Shipyard/crescent.yml b/Resources/Prototypes/_NF/Shipyard/crescent.yml index 51334244c5b..20517b9aade 100644 --- a/Resources/Prototypes/_NF/Shipyard/crescent.yml +++ b/Resources/Prototypes/_NF/Shipyard/crescent.yml @@ -41,3 +41,4 @@ Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] Mercenary: [ 0, 0 ] +# StationAi: [ 0, 1 ] \ No newline at end of file From d864351b2cfc0aebdd0e3739bf2d3d06486e36f8 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 5 Oct 2024 22:40:16 +0300 Subject: [PATCH 5/6] Update crescent.yml --- Resources/Maps/_NF/Shuttles/crescent.yml | 198 +++++++++++++++++++++++ 1 file changed, 198 insertions(+) diff --git a/Resources/Maps/_NF/Shuttles/crescent.yml b/Resources/Maps/_NF/Shuttles/crescent.yml index 2c7d6a9cc98..aa4b6678581 100644 --- a/Resources/Maps/_NF/Shuttles/crescent.yml +++ b/Resources/Maps/_NF/Shuttles/crescent.yml @@ -19384,6 +19384,61 @@ entities: parent: 1 - proto: SurveillanceCameraGeneral entities: + - uid: 2647 + components: + - type: Transform + pos: -21.5,39.5 + parent: 1 + - uid: 2648 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -29.5,16.5 + parent: 1 + - uid: 2649 + components: + - type: Transform + pos: 22.5,39.5 + parent: 1 + - uid: 2659 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,5.5 + parent: 1 + - uid: 2660 + components: + - type: Transform + pos: 3.5,-1.5 + parent: 1 + - uid: 2661 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,5.5 + parent: 1 + - uid: 2662 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,5.5 + parent: 1 + - uid: 2663 + components: + - type: Transform + pos: -7.5,0.5 + parent: 1 + - uid: 2664 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,4.5 + parent: 1 + - uid: 2666 + components: + - type: Transform + pos: -15.5,1.5 + parent: 1 - uid: 2681 components: - type: Transform @@ -19449,6 +19504,149 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Blastdoor Camera + - uid: 2743 + components: + - type: Transform + pos: -21.5,4.5 + parent: 1 + - uid: 2780 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,9.5 + parent: 1 + - uid: 2796 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -16.5,13.5 + parent: 1 + - uid: 3427 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,12.5 + parent: 1 + - uid: 3528 + components: + - type: Transform + pos: -26.5,18.5 + parent: 1 + - uid: 3529 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,23.5 + parent: 1 + - uid: 3683 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -28.5,30.5 + parent: 1 + - uid: 3693 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,28.5 + parent: 1 + - uid: 3694 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,36.5 + parent: 1 + - uid: 3695 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,25.5 + parent: 1 + - uid: 3696 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,14.5 + parent: 1 + - uid: 3697 + components: + - type: Transform + pos: 27.5,18.5 + parent: 1 + - uid: 3698 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 26.5,25.5 + parent: 1 + - uid: 3699 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 29.5,27.5 + parent: 1 + - uid: 3700 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,32.5 + parent: 1 + - uid: 3701 + components: + - type: Transform + pos: 29.5,21.5 + parent: 1 + - uid: 3702 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 29.5,33.5 + parent: 1 + - uid: 3703 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 13.5,15.5 + parent: 1 + - uid: 3704 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,22.5 + parent: 1 + - uid: 3705 + components: + - type: Transform + pos: 6.5,29.5 + parent: 1 + - uid: 3706 + components: + - type: Transform + pos: 6.5,24.5 + parent: 1 + - uid: 3707 + components: + - type: Transform + pos: -5.5,21.5 + parent: 1 + - uid: 3708 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,16.5 + parent: 1 + - uid: 3709 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,8.5 + parent: 1 + - uid: 3710 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,16.5 + parent: 1 - proto: SurveillanceCameraRouterGeneral entities: - uid: 2687 From 0700c2d5b6a53a48da7ab3446a48ba70dbf3fa5d Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 5 Oct 2024 22:56:52 +0300 Subject: [PATCH 6/6] Update crescent.yml --- Resources/Maps/_NF/Shuttles/crescent.yml | 64 +++++++++++++++++++----- 1 file changed, 52 insertions(+), 12 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/crescent.yml b/Resources/Maps/_NF/Shuttles/crescent.yml index aa4b6678581..a2cef036782 100644 --- a/Resources/Maps/_NF/Shuttles/crescent.yml +++ b/Resources/Maps/_NF/Shuttles/crescent.yml @@ -10972,18 +10972,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 1517 - components: - - type: Transform - anchored: False - rot: 1.5707963267948966 rad - pos: 15.5,7.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - type: Physics - canCollide: True - bodyType: Dynamic - uid: 1518 components: - type: Transform @@ -19384,6 +19372,12 @@ entities: parent: 1 - proto: SurveillanceCameraGeneral entities: + - uid: 1517 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 30.5,13.5 + parent: 1 - uid: 2647 components: - type: Transform @@ -19647,6 +19641,52 @@ entities: rot: 3.141592653589793 rad pos: 7.5,16.5 parent: 1 + - uid: 3711 + components: + - type: Transform + pos: 0.5,7.5 + parent: 1 + - uid: 3712 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,14.5 + parent: 1 + - uid: 3713 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,9.5 + parent: 1 + - uid: 3714 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,5.5 + parent: 1 + - uid: 3715 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 26.5,10.5 + parent: 1 + - uid: 3716 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,35.5 + parent: 1 + - uid: 3717 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -22.5,13.5 + parent: 1 + - uid: 3718 + components: + - type: Transform + pos: 7.5,0.5 + parent: 1 - proto: SurveillanceCameraRouterGeneral entities: - uid: 2687