From ea5b1d3fb627f1cd0a310b1b5ffd64fd204b056a Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Mon, 22 Jan 2024 17:49:06 +0300 Subject: [PATCH 1/8] updated to current mapping standards --- .../Maps/{ => _NF}/Shuttles/liquidator.yml | 1641 ++++++++++------- .../Prototypes/_NF/Shipyard/liquidator.yml | 17 +- 2 files changed, 1018 insertions(+), 640 deletions(-) rename Resources/Maps/{ => _NF}/Shuttles/liquidator.yml (77%) diff --git a/Resources/Maps/Shuttles/liquidator.yml b/Resources/Maps/_NF/Shuttles/liquidator.yml similarity index 77% rename from Resources/Maps/Shuttles/liquidator.yml rename to Resources/Maps/_NF/Shuttles/liquidator.yml index e1747dda66c..1cdbe197304 100644 --- a/Resources/Maps/Shuttles/liquidator.yml +++ b/Resources/Maps/_NF/Shuttles/liquidator.yml @@ -3,14 +3,14 @@ meta: postmapinit: false tilemap: 0: Space - 27: FloorDark - 60: FloorLino - 62: FloorMetalDiamond - 84: FloorSteel - 92: FloorSteelMono - 96: FloorTechMaint - 112: Lattice - 113: Plating + 28: FloorDark + 61: FloorLino + 63: FloorMetalDiamond + 85: FloorSteel + 93: FloorSteelMono + 97: FloorTechMaint + 113: Lattice + 114: Plating entities: - proto: "" entities: @@ -24,19 +24,19 @@ entities: - chunks: 0,0: ind: 0,0 - tiles: GwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: HAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-1: ind: 0,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAYAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAVAAAAAAAVAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAVAAAAAAAVAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAVQAAAAAAVQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAVQAAAAAAVQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,0: ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAPgAAAAAAcQAAAAAAPgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAYAAAAAAAcQAAAAAAYAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAYAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAPwAAAAAAcgAAAAAAPwAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAA version: 6 type: MapGrid - type: Broadphase @@ -62,14 +62,14 @@ entities: color: '#FFFFFFFF' id: Arrows decals: - 25: -2,-5 - 26: -4,-7 - 27: -4,-5 + 23: -2,-5 + 24: -4,-7 + 25: -4,-5 - node: color: '#0096FFFF' id: BotRightGreyscale decals: - 32: -2,-7 + 30: -2,-7 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerNe @@ -90,126 +90,138 @@ entities: id: BrickTileDarkCornerSw decals: 3: -4,0 - - node: - color: '#FFFFFFFF' - id: BrickTileDarkLineE - decals: - 4: -2,1 - node: color: '#FFFFFFFF' id: BrickTileDarkLineN decals: - 7: -3,2 + 6: -3,2 - node: color: '#FFFFFFFF' id: BrickTileDarkLineS decals: - 5: -3,0 + 4: -3,0 - node: color: '#FFFFFFFF' id: BrickTileDarkLineW decals: - 6: -4,1 + 5: -4,1 - node: color: '#9FED5896' id: BrickTileSteelLineE decals: - 29: -2,-5 + 27: -2,-5 - node: color: '#9FED5896' id: BrickTileSteelLineW decals: - 28: -4,-5 + 26: -4,-5 - node: color: '#9FED5896' id: BrickTileWhiteLineE decals: - 12: -2,-2 - 13: -2,-3 - 14: -2,-4 - 31: -2,-5 + 11: -2,-2 + 12: -2,-3 + 13: -2,-4 + 29: -2,-5 - node: color: '#8932B8FF' id: BrickTileWhiteLineW decals: - 18: 0,-2 - 24: 0,-3 + 17: 0,-2 + 22: 0,-3 - node: color: '#9FED5896' id: BrickTileWhiteLineW decals: - 9: -4,-4 - 10: -4,-3 - 11: -4,-2 - 30: -4,-5 + 8: -4,-4 + 9: -4,-3 + 10: -4,-2 + 28: -4,-5 - node: color: '#F9801DFF' id: BrickTileWhiteLineW decals: - 8: 4,-3 + 7: 4,-3 - node: color: '#FFFFFFFF' id: Caution decals: - 46: 3.0023866,-2.4370086 - 47: 1.9920118,-2.4370086 + 44: 3.0023866,-2.4370086 + 45: 1.9920118,-2.4370086 - node: color: '#8932B8FF' id: CheckerNESW decals: - 15: 1,-1 - 16: 1,0 - 17: 1,1 - 21: 2,-1 - 22: 2,0 - 23: 2,1 + 14: 1,-1 + 15: 1,0 + 16: 1,1 + 19: 2,-1 + 20: 2,0 + 21: 2,1 - node: color: '#A020F0FF' id: CheckerNESW decals: - 41: 1,-2 - 42: 2,-2 + 39: 1,-2 + 40: 2,-2 - node: color: '#FFA500FF' id: ConcreteTrimLineW decals: - 44: 4,-2 - 45: 4,-3 + 42: 4,-2 + 43: 4,-3 - node: color: '#B02E26FF' id: Delivery decals: - 19: -3,-7 + 18: -3,-7 - node: color: '#FFFFFFFF' id: Delivery decals: - 34: 2,-3 - 35: 5,-3 - 36: 4,-3 - 43: 3,-3 + 32: 2,-3 + 33: 5,-3 + 34: 4,-3 + 41: 3,-3 - node: - color: '#3C44AAFF' + color: '#18A2D5FF' id: DeliveryGreyscale decals: - 20: 3,-1 + 46: 5,2 + - node: + color: '#951710FF' + id: DeliveryGreyscale + decals: + 47: 5,1 + - node: + color: '#FFFFFFFF' + id: DeliveryGreyscale + decals: + 48: 5,0 - node: color: '#0096FFFF' id: LoadingAreaGreyscale decals: - 33: -2,-7 + 31: -2,-7 - node: color: '#FFFFFFFF' id: StandClear decals: - 39: 1,2 - 40: 0,2 + 37: 1,2 + 38: 0,2 + - node: + color: '#FFFFFFFF' + id: WarnLineE + decals: + 49: 4,2 + 50: 4,1 + 51: 4,0 - node: color: '#FFFFFFFF' id: WarnLineW decals: - 37: 0,2 - 38: 1,2 + 35: 0,2 + 36: 1,2 type: DecalGrid - version: 2 data: @@ -223,27 +235,29 @@ entities: -1,-1: 0: 65535 0,1: - 0: 255 + 1: 255 1,0: - 0: 62837 - 1: 2 - 2: 512 + 0: 30583 + 1: 32768 1,1: - 0: 2303 + 1: 2303 2,1: - 0: 4369 + 1: 4369 0,-2: - 0: 65534 + 0: 65520 + 1: 14 1,-2: - 0: 4369 + 1: 1 + 0: 4368 1,-1: 0: 30583 -2,1: - 0: 9966 + 1: 9966 -2,0: - 0: 51336 + 1: 16384 + 0: 34952 -1,1: - 0: 255 + 1: 255 -2,-2: 0: 34952 -2,-1: @@ -270,21 +284,6 @@ entities: temperature: 293.15 moles: - 0 - - 6666.982 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 6666.982 - 0 - 0 - 0 @@ -304,43 +303,64 @@ entities: type: BecomesStation - proto: AirAlarm entities: - - uid: 53 + - uid: 4 components: - - rot: -1.5707963267948966 rad - pos: -0.5,-3.5 + - name: engine room air alarm + type: MetaData + - pos: 3.5,-3.5 parent: 1 type: Transform - ShutdownSubscribers: - - 22 - - 173 - 162 - - 200 - - 278 - - 295 - - 69 - 234 - 328 - - 249 - - 366 - - 327 type: DeviceNetwork - devices: - - 200 - - 327 - - 366 - - 249 - 328 - - 22 - - 173 + - 234 - 162 - - 278 + type: DeviceList + - uid: 396 + components: + - rot: -1.5707963267948966 rad + pos: 4.5,-0.5 + parent: 1 + type: Transform + - ShutdownSubscribers: + - 335 - 295 - 69 - - 234 + - 278 + - 460 + - 173 + - 249 + - 457 + - 22 + type: DeviceNetwork + - devices: + - 457 + - 249 + - 460 + - 278 + - 69 + - 295 + - 335 + - 173 + - 22 type: DeviceList -- proto: AirlockCaptainGlassLocked +- proto: AirCanister entities: - - uid: 15 + - uid: 235 + components: + - anchored: True + pos: 5.5,0.5 + parent: 1 + type: Transform + - bodyType: Static + type: Physics +- proto: AirlockCommandGlass + entities: + - uid: 8 components: - rot: 3.141592653589793 rad pos: -3.5,-0.5 @@ -355,21 +375,23 @@ entities: type: Transform - proto: AirlockExternalGlass entities: - - uid: 146 + - uid: 9 components: - - pos: -3.5,-5.5 + - rot: 3.141592653589793 rad + pos: -1.5,-5.5 parent: 1 type: Transform - links: - - 393 + - 107 type: DeviceLinkSink - - uid: 237 + - uid: 11 components: - - pos: -1.5,-5.5 + - rot: 3.141592653589793 rad + pos: -3.5,-5.5 parent: 1 type: Transform - links: - - 393 + - 107 type: DeviceLinkSink - proto: AirlockGlassShuttle entities: @@ -405,34 +427,40 @@ entities: parent: 1 type: Transform - ShutdownSubscribers: - - 53 + - 396 type: DeviceNetwork - - uid: 327 + - uid: 328 components: - rot: -1.5707963267948966 rad - pos: 1.5,-0.5 + pos: 0.5,-4.5 parent: 1 type: Transform - ShutdownSubscribers: - - 53 + - 4 type: DeviceNetwork - - uid: 328 + - uid: 366 components: - rot: -1.5707963267948966 rad - pos: 0.5,-4.5 + pos: -2.5,1.5 + parent: 1 + type: Transform + - uid: 457 + components: + - rot: 1.5707963267948966 rad + pos: 1.5,-1.5 parent: 1 type: Transform - ShutdownSubscribers: - - 53 + - 396 type: DeviceNetwork - - uid: 366 + - uid: 460 components: - - rot: -1.5707963267948966 rad - pos: -2.5,1.5 + - rot: 1.5707963267948966 rad + pos: -1.5,2.5 parent: 1 type: Transform - ShutdownSubscribers: - - 53 + - 396 type: DeviceNetwork - proto: APCBasic entities: @@ -465,23 +493,231 @@ entities: - pos: -1.5,-7.5 parent: 1 type: Transform -- proto: AtmosFixNitrogenMarker +- proto: AtmosFixBlockerMarker entities: - - uid: 376 + - uid: 389 components: - - pos: 5.5,0.5 + - pos: -6.5,7.5 parent: 1 type: Transform -- proto: AtmosFixOxygenMarker - entities: - - uid: 368 + - uid: 391 + components: + - pos: -6.5,6.5 + parent: 1 + type: Transform + - uid: 392 + components: + - pos: -6.5,5.5 + parent: 1 + type: Transform + - uid: 410 + components: + - pos: -6.5,4.5 + parent: 1 + type: Transform + - uid: 411 + components: + - pos: -5.5,6.5 + parent: 1 + type: Transform + - uid: 412 + components: + - pos: 7.5,6.5 + parent: 1 + type: Transform + - uid: 413 + components: + - pos: 8.5,7.5 + parent: 1 + type: Transform + - uid: 414 + components: + - pos: 8.5,6.5 + parent: 1 + type: Transform + - uid: 415 + components: + - pos: 8.5,4.5 + parent: 1 + type: Transform + - uid: 416 + components: + - pos: 8.5,5.5 + parent: 1 + type: Transform + - uid: 417 + components: + - pos: 7.5,4.5 + parent: 1 + type: Transform + - uid: 418 + components: + - pos: 7.5,5.5 + parent: 1 + type: Transform + - uid: 419 + components: + - pos: 6.5,4.5 + parent: 1 + type: Transform + - uid: 420 + components: + - pos: 6.5,5.5 + parent: 1 + type: Transform + - uid: 421 + components: + - pos: 5.5,4.5 + parent: 1 + type: Transform + - uid: 422 + components: + - pos: 5.5,5.5 + parent: 1 + type: Transform + - uid: 423 + components: + - pos: 4.5,4.5 + parent: 1 + type: Transform + - uid: 424 + components: + - pos: 4.5,5.5 + parent: 1 + type: Transform + - uid: 425 + components: + - pos: 3.5,4.5 + parent: 1 + type: Transform + - uid: 426 + components: + - pos: 3.5,5.5 + parent: 1 + type: Transform + - uid: 427 + components: + - pos: 2.5,4.5 + parent: 1 + type: Transform + - uid: 428 components: - - pos: 5.5,2.5 + - pos: 2.5,5.5 + parent: 1 + type: Transform + - uid: 429 + components: + - pos: 1.5,4.5 + parent: 1 + type: Transform + - uid: 430 + components: + - pos: 1.5,5.5 + parent: 1 + type: Transform + - uid: 431 + components: + - pos: 0.5,4.5 + parent: 1 + type: Transform + - uid: 432 + components: + - pos: 0.5,5.5 + parent: 1 + type: Transform + - uid: 433 + components: + - pos: -0.5,4.5 + parent: 1 + type: Transform + - uid: 434 + components: + - pos: -0.5,5.5 + parent: 1 + type: Transform + - uid: 435 + components: + - pos: -1.5,4.5 + parent: 1 + type: Transform + - uid: 436 + components: + - pos: -1.5,5.5 + parent: 1 + type: Transform + - uid: 437 + components: + - pos: -2.5,4.5 + parent: 1 + type: Transform + - uid: 438 + components: + - pos: -2.5,5.5 + parent: 1 + type: Transform + - uid: 439 + components: + - pos: -3.5,4.5 + parent: 1 + type: Transform + - uid: 440 + components: + - pos: -3.5,5.5 + parent: 1 + type: Transform + - uid: 441 + components: + - pos: -4.5,4.5 + parent: 1 + type: Transform + - uid: 442 + components: + - pos: -4.5,5.5 + parent: 1 + type: Transform + - uid: 443 + components: + - pos: -5.5,4.5 + parent: 1 + type: Transform + - uid: 444 + components: + - pos: -5.5,5.5 + parent: 1 + type: Transform + - uid: 445 + components: + - pos: -5.5,3.5 + parent: 1 + type: Transform + - uid: 446 + components: + - pos: 7.5,3.5 + parent: 1 + type: Transform + - uid: 447 + components: + - pos: 1.5,-7.5 + parent: 1 + type: Transform + - uid: 448 + components: + - pos: 2.5,-7.5 + parent: 1 + type: Transform + - uid: 449 + components: + - pos: 3.5,-7.5 + parent: 1 + type: Transform + - uid: 450 + components: + - pos: 4.5,-7.5 parent: 1 type: Transform - proto: BiomassReclaimer entities: - - uid: 206 + - uid: 36 components: - pos: 2.5,-2.5 parent: 1 @@ -518,11 +754,34 @@ entities: - pos: 0.7108896,1.719961 parent: 1 type: Transform -- proto: BoxFolderBase +- proto: BoxCardboard entities: - - uid: 8 + - uid: 285 + components: + - name: external light tube box + type: MetaData + - pos: 0.26414788,1.5837543 + parent: 1 + type: Transform + - storageUsed: 30 + type: Storage + - containers: + storagebase: !type:Container + showEnts: False + occludes: True + ents: + - 288 + - 289 + - 290 + - 299 + - 60 + - 463 + type: ContainerContainer +- proto: BoxFolderRed + entities: + - uid: 15 components: - - pos: -1.6713722,1.8778938 + - pos: -1.6538084,1.929544 parent: 1 type: Transform - proto: BoxLightbulb @@ -546,11 +805,6 @@ entities: - pos: 0.9776434,-0.16575927 parent: 1 type: Transform - - uid: 134 - components: - - pos: -1.9130454,-1.6813397 - parent: 1 - type: Transform - proto: CableApcExtension entities: - uid: 10 @@ -578,11 +832,6 @@ entities: - pos: 0.5,4.5 parent: 1 type: Transform - - uid: 107 - components: - - pos: 2.5,-7.5 - parent: 1 - type: Transform - uid: 115 components: - pos: 0.5,0.5 @@ -593,21 +842,11 @@ entities: - pos: 0.5,-1.5 parent: 1 type: Transform - - uid: 117 - components: - - pos: 4.5,-2.5 - parent: 1 - type: Transform - uid: 119 components: - pos: 1.5,-2.5 parent: 1 type: Transform - - uid: 120 - components: - - pos: 4.5,-7.5 - parent: 1 - type: Transform - uid: 133 components: - pos: 1.5,0.5 @@ -638,11 +877,6 @@ entities: - pos: 1.5,-4.5 parent: 1 type: Transform - - uid: 256 - components: - - pos: 4.5,0.5 - parent: 1 - type: Transform - uid: 257 components: - pos: 0.5,2.5 @@ -668,11 +902,6 @@ entities: - pos: -1.5,-1.5 parent: 1 type: Transform - - uid: 285 - components: - - pos: -3.5,2.5 - parent: 1 - type: Transform - uid: 291 components: - pos: 3.5,-6.5 @@ -733,16 +962,6 @@ entities: - pos: 5.5,4.5 parent: 1 type: Transform - - uid: 334 - components: - - pos: 6.5,4.5 - parent: 1 - type: Transform - - uid: 335 - components: - - pos: 7.5,4.5 - parent: 1 - type: Transform - uid: 336 components: - pos: -0.5,4.5 @@ -753,24 +972,14 @@ entities: - pos: -1.5,4.5 parent: 1 type: Transform - - uid: 338 - components: - - pos: -2.5,4.5 - parent: 1 - type: Transform - - uid: 339 - components: - - pos: -3.5,4.5 - parent: 1 - type: Transform - - uid: 340 + - uid: 338 components: - - pos: -4.5,4.5 + - pos: -2.5,4.5 parent: 1 type: Transform - - uid: 341 + - uid: 339 components: - - pos: -5.5,4.5 + - pos: -3.5,4.5 parent: 1 type: Transform - uid: 344 @@ -783,11 +992,6 @@ entities: - pos: 3.5,-2.5 parent: 1 type: Transform - - uid: 350 - components: - - pos: 5.5,-2.5 - parent: 1 - type: Transform - uid: 351 components: - pos: 0.5,-2.5 @@ -1066,27 +1270,6 @@ entities: - pos: 5.2959647,-1.1305447 parent: 1 type: Transform -- proto: ClosetJanitorFilled - entities: - - uid: 4 - components: - - pos: 3.5,2.5 - parent: 1 - type: Transform -- proto: ClosetL3JanitorFilled - entities: - - uid: 235 - components: - - pos: 2.5,2.5 - parent: 1 - type: Transform -- proto: ClothingBeltJanitorFilled - entities: - - uid: 224 - components: - - pos: 0.6116991,0.51599467 - parent: 1 - type: Transform - proto: ClothingBeltUtilityEngineering entities: - uid: 308 @@ -1108,11 +1291,11 @@ entities: - pos: 0.54084945,0.600981 parent: 1 type: Transform -- proto: ClothingHeadHatPurplesoft +- proto: ClothingHeadHatHoodRad entities: - - uid: 193 + - uid: 458 components: - - pos: 0.55501914,0.45933747 + - pos: 2.3156083,-4.526062 parent: 1 type: Transform - proto: ClothingOuterCoatLabChem @@ -1122,6 +1305,13 @@ entities: - pos: 4.5874624,-1.5838027 parent: 1 type: Transform +- proto: ClothingOuterSuitRad + entities: + - uid: 372 + components: + - pos: 2.7446132,-4.4060936 + parent: 1 + type: Transform - proto: ClothingShoesBootsMag entities: - uid: 262 @@ -1143,30 +1333,16 @@ entities: - pos: 0.4846384,0.38614094 parent: 1 type: Transform -- proto: ClothingUniformJumpskirtJanitor - entities: - - uid: 97 - components: - - pos: 0.32829833,0.57265174 - parent: 1 - type: Transform -- proto: ClothingUniformJumpsuitJanitor - entities: - - uid: 179 - components: - - pos: 0.7108896,0.45933747 - parent: 1 - type: Transform -- proto: ComputerShuttle +- proto: ComputerTabletopShuttle entities: - - uid: 26 + - uid: 464 components: - pos: -3.5,2.5 parent: 1 type: Transform -- proto: ComputerStationRecords +- proto: ComputerTabletopStationRecords entities: - - uid: 273 + - uid: 459 components: - pos: -2.5,2.5 parent: 1 @@ -1185,6 +1361,156 @@ entities: bank-ATM-cashSlot: !type:ContainerSlot {} type: ContainerContainer - type: ItemSlots +- proto: DisposalBend + entities: + - uid: 206 + components: + - rot: 1.5707963267948966 rad + pos: -2.5,-1.5 + parent: 1 + type: Transform + - uid: 211 + components: + - pos: 3.5,-1.5 + parent: 1 + type: Transform + - uid: 376 + components: + - pos: 0.5,4.5 + parent: 1 + type: Transform +- proto: DisposalJunctionFlipped + entities: + - uid: 171 + components: + - rot: 1.5707963267948966 rad + pos: 0.5,-1.5 + parent: 1 + type: Transform +- proto: DisposalPipe + entities: + - uid: 12 + components: + - rot: 1.5707963267948966 rad + pos: -0.5,4.5 + parent: 1 + type: Transform + - uid: 21 + components: + - rot: 1.5707963267948966 rad + pos: -1.5,4.5 + parent: 1 + type: Transform + - uid: 66 + components: + - rot: 1.5707963267948966 rad + pos: -0.5,-1.5 + parent: 1 + type: Transform + - uid: 131 + components: + - rot: 1.5707963267948966 rad + pos: 2.5,-1.5 + parent: 1 + type: Transform + - uid: 136 + components: + - pos: 0.5,1.5 + parent: 1 + type: Transform + - uid: 145 + components: + - pos: 0.5,-0.5 + parent: 1 + type: Transform + - uid: 146 + components: + - rot: 1.5707963267948966 rad + pos: -1.5,-1.5 + parent: 1 + type: Transform + - uid: 160 + components: + - rot: 1.5707963267948966 rad + pos: -4.5,4.5 + parent: 1 + type: Transform + - uid: 164 + components: + - rot: 1.5707963267948966 rad + pos: -3.5,4.5 + parent: 1 + type: Transform + - uid: 176 + components: + - rot: 3.141592653589793 rad + pos: -2.5,-3.5 + parent: 1 + type: Transform + - uid: 191 + components: + - pos: -2.5,-2.5 + parent: 1 + type: Transform + - uid: 200 + components: + - rot: 1.5707963267948966 rad + pos: 1.5,-1.5 + parent: 1 + type: Transform + - uid: 245 + components: + - pos: 0.5,3.5 + parent: 1 + type: Transform + - uid: 334 + components: + - rot: 1.5707963267948966 rad + pos: -2.5,4.5 + parent: 1 + type: Transform + - uid: 367 + components: + - pos: 0.5,0.5 + parent: 1 + type: Transform + - uid: 368 + components: + - pos: 0.5,2.5 + parent: 1 + type: Transform + - uid: 403 + components: + - rot: 1.5707963267948966 rad + pos: -5.5,4.5 + parent: 1 + type: Transform +- proto: DisposalTrunk + entities: + - uid: 163 + components: + - rot: 1.5707963267948966 rad + pos: -6.5,4.5 + parent: 1 + type: Transform + - uid: 350 + components: + - rot: 3.141592653589793 rad + pos: -2.5,-4.5 + parent: 1 + type: Transform +- proto: DisposalUnit + entities: + - uid: 196 + components: + - pos: -2.5,-4.5 + parent: 1 + type: Transform + - uid: 332 + components: + - pos: -6.5,4.5 + parent: 1 + type: Transform - proto: Dropper entities: - uid: 255 @@ -1196,14 +1522,8 @@ entities: entities: - uid: 6 components: - - rot: -1.5707963267948966 rad - pos: 5.5,2.5 - parent: 1 - type: Transform - - uid: 367 - components: - - rot: -1.5707963267948966 rad - pos: 5.5,0.5 + - rot: 3.141592653589793 rad + pos: -2.5,-6.5 parent: 1 type: Transform - uid: 379 @@ -1236,11 +1556,64 @@ entities: pos: 3.5,4.5 parent: 1 type: Transform - - uid: 392 +- proto: ExteriorLightTube + entities: + - uid: 60 components: - - pos: -2.5,-7.5 - parent: 1 + - flags: InContainer + type: MetaData + - parent: 285 + type: Transform + - canCollide: False + type: Physics + - uid: 288 + components: + - flags: InContainer + type: MetaData + - parent: 285 + type: Transform + - canCollide: False + type: Physics + - uid: 289 + components: + - flags: InContainer + type: MetaData + - parent: 285 + type: Transform + - canCollide: False + type: Physics + - uid: 290 + components: + - flags: InContainer + type: MetaData + - parent: 285 + type: Transform + - canCollide: False + type: Physics + - uid: 299 + components: + - flags: InContainer + type: MetaData + - parent: 285 + type: Transform + - canCollide: False + type: Physics + - uid: 341 + components: + - flags: InContainer + type: MetaData + - parent: 340 + type: Transform + - canCollide: False + type: Physics + - uid: 463 + components: + - flags: InContainer + type: MetaData + - parent: 285 type: Transform + - canCollide: False + type: Physics - proto: ExtinguisherCabinetFilled entities: - uid: 65 @@ -1256,63 +1629,62 @@ entities: - pos: -1.5,2.5 parent: 1 type: Transform -- proto: FloorDrain +- proto: FirelockGlass entities: - - uid: 2 + - uid: 451 components: - - pos: 0.5,-0.5 + - pos: -3.5,-0.5 parent: 1 type: Transform - - fixtures: {} - type: Fixtures -- proto: GasMixerFlipped - entities: - - uid: 60 + - uid: 452 components: - - rot: 3.141592653589793 rad - pos: 2.5,0.5 + - pos: -0.5,-1.5 parent: 1 type: Transform - - inletTwoConcentration: 0.78 - inletOneConcentration: 0.22 - type: GasMixer - - color: '#0055CCFF' - type: AtmosPipeColor -- proto: GasOutletInjector - entities: - - uid: 397 + - uid: 453 + components: + - pos: -0.5,-2.5 + parent: 1 + type: Transform + - uid: 454 + components: + - pos: -0.5,-4.5 + parent: 1 + type: Transform + - uid: 455 components: - - rot: 3.141592653589793 rad - pos: 5.5,2.5 + - pos: -3.5,-5.5 parent: 1 type: Transform - - color: '#449DFFFF' - type: AtmosPipeColor - - uid: 401 + - uid: 456 components: - - rot: 1.5707963267948966 rad - pos: 5.5,0.5 + - pos: -1.5,-5.5 parent: 1 type: Transform - - color: '#DF2C38FF' - type: AtmosPipeColor -- proto: GasPassiveVent +- proto: FloorDrain entities: - - uid: 11 + - uid: 2 components: - - pos: 5.5,2.5 + - pos: 0.5,-0.5 parent: 1 type: Transform - - color: '#449DFFFF' - type: AtmosPipeColor - - uid: 109 + - fixtures: {} + type: Fixtures +- proto: GasMixer + entities: + - uid: 224 components: - rot: -1.5707963267948966 rad - pos: 5.5,0.5 + pos: 3.5,1.5 parent: 1 type: Transform - - color: '#DF2C38FF' + - inletTwoConcentration: 0.20999998 + inletOneConcentration: 0.79 + type: GasMixer + - color: '#0000CCFF' type: AtmosPipeColor +- proto: GasPassiveVent + entities: - uid: 324 components: - pos: 0.5,5.5 @@ -1322,61 +1694,61 @@ entities: type: AtmosPipeColor - proto: GasPipeBend entities: - - uid: 131 + - uid: 150 components: - rot: -1.5707963267948966 rad - pos: 3.5,-2.5 + pos: 0.5,-1.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 150 + - uid: 254 components: - rot: -1.5707963267948966 rad - pos: 0.5,-1.5 + pos: 3.5,-0.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0000CCFF' type: AtmosPipeColor - - uid: 160 + - uid: 256 components: - rot: 1.5707963267948966 rad pos: 2.5,1.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#0000CCFF' type: AtmosPipeColor - - uid: 280 + - uid: 293 components: - - rot: -1.5707963267948966 rad - pos: 6.5,0.5 + - rot: 3.141592653589793 rad + pos: -2.5,0.5 parent: 1 type: Transform - - color: '#DF2C38FF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 289 + - uid: 327 components: - - rot: -1.5707963267948966 rad - pos: 5.5,1.5 + - rot: 1.5707963267948966 rad + pos: 3.5,0.5 parent: 1 type: Transform - - color: '#449DFFFF' + - color: '#0000CCFF' type: AtmosPipeColor - - uid: 293 + - uid: 369 components: - - rot: 3.141592653589793 rad - pos: -2.5,0.5 + - rot: 1.5707963267948966 rad + pos: -2.5,-1.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 369 + - uid: 409 components: - rot: 1.5707963267948966 rad - pos: -2.5,-1.5 + pos: 3.5,2.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0000CCFF' type: AtmosPipeColor - proto: GasPipeFourway entities: @@ -1387,12 +1759,12 @@ entities: type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 230 + - uid: 237 components: - - pos: 2.5,-2.5 + - pos: 2.5,-0.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#0000CCFF' type: AtmosPipeColor - proto: GasPipeStraight entities: @@ -1404,21 +1776,6 @@ entities: type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 9 - components: - - pos: 6.5,3.5 - parent: 1 - type: Transform - - color: '#DF2C38FF' - type: AtmosPipeColor - - uid: 12 - components: - - rot: -1.5707963267948966 rad - pos: 4.5,1.5 - parent: 1 - type: Transform - - color: '#449DFFFF' - type: AtmosPipeColor - uid: 31 components: - rot: 1.5707963267948966 rad @@ -1435,6 +1792,14 @@ entities: type: Transform - color: '#990000FF' type: AtmosPipeColor + - uid: 50 + components: + - rot: 1.5707963267948966 rad + pos: 1.5,-2.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor - uid: 68 components: - pos: -2.5,1.5 @@ -1448,7 +1813,7 @@ entities: pos: -1.5,-2.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#0000CCFF' type: AtmosPipeColor - uid: 124 components: @@ -1472,7 +1837,7 @@ entities: pos: 0.5,-2.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#0000CCFF' type: AtmosPipeColor - uid: 148 components: @@ -1480,7 +1845,7 @@ entities: pos: 2.5,-1.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#0000CCFF' type: AtmosPipeColor - uid: 153 components: @@ -1488,29 +1853,7 @@ entities: pos: 2.5,-3.5 parent: 1 type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 167 - components: - - rot: -1.5707963267948966 rad - pos: 4.5,0.5 - parent: 1 - type: Transform - - color: '#DF2C38FF' - type: AtmosPipeColor - - uid: 168 - components: - - pos: 6.5,2.5 - parent: 1 - type: Transform - - color: '#DF2C38FF' - type: AtmosPipeColor - - uid: 176 - components: - - pos: 6.5,1.5 - parent: 1 - type: Transform - - color: '#DF2C38FF' + - color: '#0000CCFF' type: AtmosPipeColor - uid: 184 components: @@ -1555,14 +1898,14 @@ entities: - pos: -3.5,0.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#0000CCFF' type: AtmosPipeColor - uid: 266 components: - pos: -3.5,-1.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#0000CCFF' type: AtmosPipeColor - uid: 271 components: @@ -1585,7 +1928,7 @@ entities: pos: -0.5,-2.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#0000CCFF' type: AtmosPipeColor - uid: 310 components: @@ -1593,14 +1936,14 @@ entities: pos: -2.5,-2.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#0000CCFF' type: AtmosPipeColor - uid: 311 components: - pos: -3.5,-0.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#0000CCFF' type: AtmosPipeColor - uid: 343 components: @@ -1616,24 +1959,17 @@ entities: pos: -3.5,1.5 parent: 1 type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 403 - components: - - pos: 5.5,3.5 - parent: 1 - type: Transform - - color: '#449DFFFF' + - color: '#0000CCFF' type: AtmosPipeColor - proto: GasPipeTJunction entities: - - uid: 171 + - uid: 178 components: - - rot: 3.141592653589793 rad - pos: 1.5,-2.5 + - rot: -1.5707963267948966 rad + pos: 2.5,-2.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#0000CCFF' type: AtmosPipeColor - uid: 180 components: @@ -1657,7 +1993,7 @@ entities: pos: -3.5,-2.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#0000CCFF' type: AtmosPipeColor - proto: GasPort entities: @@ -1669,40 +2005,38 @@ entities: type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 196 + - uid: 166 components: - name: air mix connector port type: MetaData - - pos: 3.5,-0.5 + - rot: -1.5707963267948966 rad + pos: 5.5,0.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#0000CCFF' type: AtmosPipeColor - - uid: 274 - components: - - name: N2 connector port - type: MetaData - - pos: 6.5,5.5 - parent: 1 - type: Transform - - uid: 398 + - uid: 167 components: - name: O2 connector port type: MetaData - - pos: 5.5,5.5 + - rot: -1.5707963267948966 rad + pos: 5.5,2.5 parent: 1 type: Transform -- proto: GasPressurePump - entities: - - uid: 211 + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 399 components: - - name: distribution pump + - name: N2 connector port type: MetaData - - pos: 2.5,-0.5 + - rot: -1.5707963267948966 rad + pos: 5.5,1.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#0000CCFF' type: AtmosPipeColor +- proto: GasPressurePump + entities: - uid: 222 components: - name: waste loop pump @@ -1713,25 +2047,34 @@ entities: type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 288 + - uid: 226 components: - - name: N2 output pump + - name: N2 pump type: MetaData - rot: -1.5707963267948966 rad - pos: 3.5,0.5 + pos: 4.5,1.5 parent: 1 type: Transform - - color: '#DF2C38FF' + - color: '#0000CCFF' type: AtmosPipeColor - - uid: 290 + - uid: 230 + components: + - name: distribution pump + type: MetaData + - pos: 2.5,0.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 279 components: - - name: O2 output pump + - name: O2 pump type: MetaData - rot: -1.5707963267948966 rad - pos: 3.5,1.5 + pos: 4.5,2.5 parent: 1 type: Transform - - color: '#449DFFFF' + - color: '#0000CCFF' type: AtmosPipeColor - proto: GasVentPump entities: @@ -1741,9 +2084,9 @@ entities: parent: 1 type: Transform - ShutdownSubscribers: - - 53 + - 396 type: DeviceNetwork - - color: '#0055CCFF' + - color: '#0000CCFF' type: AtmosPipeColor - uid: 162 components: @@ -1752,9 +2095,9 @@ entities: parent: 1 type: Transform - ShutdownSubscribers: - - 53 + - 4 type: DeviceNetwork - - color: '#0055CCFF' + - color: '#0000CCFF' type: AtmosPipeColor - uid: 173 components: @@ -1763,19 +2106,20 @@ entities: parent: 1 type: Transform - ShutdownSubscribers: - - 53 + - 396 type: DeviceNetwork - - color: '#0055CCFF' + - color: '#0000CCFF' type: AtmosPipeColor - - uid: 200 + - uid: 335 components: - - pos: 1.5,-1.5 + - rot: 1.5707963267948966 rad + pos: 1.5,-0.5 parent: 1 type: Transform - ShutdownSubscribers: - - 53 + - 396 type: DeviceNetwork - - color: '#0055CCFF' + - color: '#0000CCFF' type: AtmosPipeColor - proto: GasVentScrubber entities: @@ -1786,7 +2130,7 @@ entities: parent: 1 type: Transform - ShutdownSubscribers: - - 53 + - 396 type: DeviceNetwork - color: '#990000FF' type: AtmosPipeColor @@ -1797,7 +2141,7 @@ entities: parent: 1 type: Transform - ShutdownSubscribers: - - 53 + - 4 type: DeviceNetwork - color: '#990000FF' type: AtmosPipeColor @@ -1808,7 +2152,7 @@ entities: parent: 1 type: Transform - ShutdownSubscribers: - - 53 + - 396 type: DeviceNetwork - color: '#990000FF' type: AtmosPipeColor @@ -1818,40 +2162,32 @@ entities: parent: 1 type: Transform - ShutdownSubscribers: - - 53 + - 396 type: DeviceNetwork - color: '#990000FF' type: AtmosPipeColor - proto: GasVolumePump entities: - - uid: 279 - components: - - name: N2 input pump - type: MetaData - - pos: 6.5,4.5 - parent: 1 - type: Transform - - color: '#DF2C38FF' - type: AtmosPipeColor - - uid: 396 + - uid: 274 components: - name: air mix pump type: MetaData - - rot: 3.141592653589793 rad - pos: 3.5,-1.5 + - rot: 1.5707963267948966 rad + pos: 4.5,0.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#0000CCFF' type: AtmosPipeColor - - uid: 402 +- proto: GeigerCounter + entities: + - uid: 406 components: - - name: O2 input pump - type: MetaData - - pos: 5.5,4.5 + - pos: 2.8946674,-5.1717024 parent: 1 type: Transform - - color: '#449DFFFF' - type: AtmosPipeColor + - isEnabled: True + type: Geiger + - type: RadiationReceiver - proto: GravityGeneratorMini entities: - uid: 319 @@ -1878,12 +2214,6 @@ entities: - pos: 1.5,-3.5 parent: 1 type: Transform - - uid: 21 - components: - - rot: 1.5707963267948966 rad - pos: 2.5,3.5 - parent: 1 - type: Transform - uid: 25 components: - pos: -0.5,0.5 @@ -1922,17 +2252,6 @@ entities: pos: 0.5,-6.5 parent: 1 type: Transform - - uid: 66 - components: - - pos: -2.5,-7.5 - parent: 1 - type: Transform - - uid: 70 - components: - - rot: 1.5707963267948966 rad - pos: 4.5,0.5 - parent: 1 - type: Transform - uid: 103 components: - rot: 1.5707963267948966 rad @@ -2002,10 +2321,10 @@ entities: - pos: 6.5,-1.5 parent: 1 type: Transform - - uid: 399 + - uid: 384 components: - - rot: 1.5707963267948966 rad - pos: 4.5,2.5 + - rot: -1.5707963267948966 rad + pos: 3.5,3.5 parent: 1 type: Transform - proto: Gyroscope @@ -2070,13 +2389,6 @@ entities: - pos: 5.2817945,-1.2155304 parent: 1 type: Transform -- proto: LightReplacer - entities: - - uid: 207 - components: - - pos: 0.46999907,0.77095246 - parent: 1 - type: Transform - proto: LockerAtmosphericsFilledHardsuit entities: - uid: 208 @@ -2091,18 +2403,18 @@ entities: - pos: -1.5,0.5 parent: 1 type: Transform -- proto: MaterialReclaimer +- proto: LockerJanitorFilled entities: - - uid: 203 + - uid: 53 components: - - pos: 3.5,-2.5 + - pos: 2.5,2.5 parent: 1 type: Transform -- proto: MopBucketFull +- proto: MaterialReclaimer entities: - - uid: 100 + - uid: 203 components: - - pos: -1.8705349,-1.1997533 + - pos: 3.5,-2.5 parent: 1 type: Transform - proto: MopItem @@ -2112,31 +2424,26 @@ entities: - pos: 0.8607421,-0.6631228 parent: 1 type: Transform - - uid: 250 - components: - - pos: -1.7713447,-1.9079685 - parent: 1 - type: Transform - proto: NitrogenCanister entities: - - uid: 36 + - uid: 210 components: - - pos: 5.5,0.5 + - anchored: True + pos: 5.5,1.5 parent: 1 type: Transform - - releaseValve: True - releasePressure: 1013.25 - type: GasCanister + - bodyType: Static + type: Physics - proto: OxygenCanister entities: - - uid: 299 + - uid: 168 components: - - pos: 5.5,2.5 + - anchored: True + pos: 5.5,2.5 parent: 1 type: Transform - - releaseValve: True - releasePressure: 1013.25 - type: GasCanister + - bodyType: Static + type: Physics - proto: PaintingFireaxeCabinet entities: - uid: 229 @@ -2157,11 +2464,9 @@ entities: - pos: -1.5008717,1.6219696 parent: 1 type: Transform - - uid: 409 + - uid: 462 components: - - name: preflight checklist - type: MetaData - - pos: 2.0922058,-4.252999 + - pos: 2.2410665,-5.2790337 parent: 1 type: Transform - stampState: paper_stamp-ce @@ -2173,7 +2478,16 @@ entities: stampedColor: '#00BE00FF' stampedName: stamp-component-stamped-name-approved content: >- - [head=1]==========================[/head] + [color=#1b67a5]█░░█░███[/color][color=#5b97bc]░███░█░█░█░██░░█░█░██░░██░░██░[/color] + + [color=#1b67a5]██░█░░█░[/color][color=#5b97bc]██░░░█░█░█░█░█░█░█░█░█░█░█░█░█[/color] + + [color=#1b67a5]█░██░░█░[/color][color=#5b97bc]░░██░███░█░██░░░█░░███░██░░█░█[/color] + + [color=#1b67a5]█░░█░░█░[/color][color=#5b97bc]███░░█░█░█░█░░░░█░░█░█░█░█░██░[/color] + + + [head=1]=========================[/head] [head=1]Liquidator-class service ship[/head] @@ -2181,7 +2495,7 @@ entities: [head=1] PREFLIGHT CHECKLIST[/head] - [head=1]==========================[/head] + [head=1]=========================[/head] [head=2]1. Power supply.[/head] @@ -2196,17 +2510,17 @@ entities: [bullet/][ ] Check the APC unit's current Load[bold]*[/bold] (W). - [head=3]1.2. P.A.C.K.M.A.N. generator unit.[/head] + [head=3]1.2. S.U.P.E.R.P.A.C.M.A.N. generator unit.[/head] - [bullet/][ ] Check if the P.A.C.K.M.A.N. generator unit is anchored to the floor. + [bullet/][ ] Check if the S.U.P.E.R.P.A.C.M.A.N. generator unit is anchored to the floor. - [bullet/][ ] Check if the P.A.C.K.M.A.N. generator unit has fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation. + [bullet/][ ] Check if the S.U.P.E.R.P.A.C.M.A.N. generator unit has fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation. - [bullet/][ ] Check if the P.A.C.K.M.A.N. generator unit is set to HV output. + [bullet/][ ] Check if the S.U.P.E.R.P.A.C.M.A.N. generator unit is set to HV output. [bullet/][ ] Set Target Power for 18-19[bold]**[/bold] [bold]k[/bold]W. - [bullet/][ ] Start the P.A.C.K.M.A.N. generator unit. + [bullet/][ ] Start the S.U.P.E.R.P.A.C.M.A.N. generator unit. [head=2]2. Atmospherics.[/head] @@ -2235,6 +2549,8 @@ entities: [bullet/][ ] Enable waste loop pump. + [bullet/][ ] Set engine room air alarm filtering to wide. + [head=2]3. Other checks.[/head] @@ -2247,29 +2563,30 @@ entities: __________________________________________________________________ - [bold]*[/bold] - Liquidator-class service ships are equipped with a single APC unit that can be used to appraise the ship's total power consumption. One can check the ship's total power consumption against the P.A.C.K.M.A.N. generator unit Target Power output: to keep SMES, substation, and APC fully charged, P.A.C.K.M.A.N. generator unit Target Power output should exceed APC's Load. Remember to check APC Load and adjust the generator unit Target Power after connecting new power-consuming machines. + [bold]*[/bold] - Liquidator-class service ships are equipped with a single APC unit that can be used to appraise the ship's total power consumption. One can check the ship's total power consumption against the S.U.P.E.R.P.A.C.M.A.N. generator unit Target Power output: to keep SMES, substation, and APC fully charged, S.U.P.E.R.P.A.C.M.A.N. generator unit Target Power output should exceed APC's Load. Remember to check APC Load and adjust the generator unit Target Power after connecting new power-consuming machines. - [bold]**[/bold] - Liquidator-class service ships have higher power demand than standard P.A.C.K.M.A.N. generator unit can provide at optimal settings: recommended Target Power value to avoid blackouts during Gravity Generator charging sequence is 19 kW. Furthermore, while the portable scrubber unit is online, changing the Target Power value to 20 kW might be advisable. + [bold]**[/bold] - Liquidator-class service ships have higher power demand than standard P.A.C.M.A.N. generator unit can provide at optimal settings, so the standard P.A.C.M.A.N. was replaced with S.U.P.E.R.P.A.C.M.A.N.: recommended Target Power value to avoid blackouts during Gravity Generator charging sequence is 19 kW. Furthermore, while the portable scrubber unit is online, changing the Target Power value to 20 kW might be advisable. - [bold]Note:[/bold] Without a working generator, fully charged battery units (SMES and substation) in unmodified Liquidator-class service ships can provide power for approximately 10 minutes before discharging. + [bold]Note:[/bold] Without a working generator, fully charged battery units (SMES and substation) in unmodified Liquidator-class service ships can provide power for approximately 10 minutes before fully depleting their charge. [bold]Note:[/bold] Additional generator units can be purchased at the Frontier Station. + + [bold]Note:[/bold] Be sure to take all necessary protective measures when working with radioactive materials: use a radiation suit, engage internals, make sure to enable Geiger's counter, wash your hands after, and keep radiation shutters closed at all times. type: Paper -- proto: PortableGeneratorPacman +- proto: PortableGeneratorSuperPacman entities: - - uid: 245 + - uid: 386 components: - anchored: True pos: 2.5,-5.5 parent: 1 type: Transform - storage: - Plasma: 1500 + Uranium: 1500 type: MaterialStorage - bodyType: Static type: Physics - type: InsertingMaterialStorage - - type: ItemCooldown - proto: PortableScrubber entities: - uid: 5 @@ -2298,14 +2615,24 @@ entities: - pos: 0.5,1.5 parent: 1 type: Transform -- proto: PoweredlightLED +- proto: PoweredlightEmpty entities: - - uid: 50 + - uid: 340 components: - rot: 3.141592653589793 rad pos: -0.5,4.5 parent: 1 type: Transform + - containers: + light_bulb: !type:ContainerSlot + showEnts: False + occludes: True + ent: 341 + type: ContainerContainer + - powerLoad: 100 + type: ApcPowerReceiver +- proto: PoweredlightLED + entities: - uid: 155 components: - pos: -2.5,-1.5 @@ -2316,12 +2643,6 @@ entities: - pos: 3.5,-4.5 parent: 1 type: Transform - - uid: 191 - components: - - rot: 3.141592653589793 rad - pos: 5.5,4.5 - parent: 1 - type: Transform - uid: 194 components: - rot: -1.5707963267948966 rad @@ -2333,12 +2654,6 @@ entities: - pos: 5.5,-1.5 parent: 1 type: Transform - - uid: 210 - components: - - rot: 3.141592653589793 rad - pos: -4.5,4.5 - parent: 1 - type: Transform - uid: 221 components: - rot: 3.141592653589793 rad @@ -2357,24 +2672,12 @@ entities: pos: 0.5,1.5 parent: 1 type: Transform - - uid: 254 - components: - - rot: -1.5707963267948966 rad - pos: 3.5,1.5 - parent: 1 - type: Transform - proto: PoweredSmallLight entities: - - uid: 383 - components: - - rot: -1.5707963267948966 rad - pos: 5.5,0.5 - parent: 1 - type: Transform - - uid: 384 + - uid: 117 components: - rot: -1.5707963267948966 rad - pos: 5.5,2.5 + pos: 5.5,1.5 parent: 1 type: Transform - proto: Railing @@ -2462,31 +2765,27 @@ entities: type: Transform - proto: RandomSpawner100 entities: - - uid: 236 - components: - - rot: 3.141592653589793 rad - pos: -3.5,-2.5 - parent: 1 - type: Transform - - uid: 283 + - uid: 97 components: - - rot: 3.141592653589793 rad - pos: -2.5,-4.5 + - rot: -1.5707963267948966 rad + pos: -2.5,-3.5 parent: 1 type: Transform - - uid: 371 + - uid: 120 components: - - pos: 1.5,1.5 + - rot: -1.5707963267948966 rad + pos: -2.5,5.5 parent: 1 type: Transform - - uid: 372 + - uid: 236 components: - - pos: 2.5,-0.5 + - rot: 3.141592653589793 rad + pos: -3.5,-2.5 parent: 1 type: Transform - - uid: 373 + - uid: 371 components: - - pos: -1.5,5.5 + - pos: 1.5,1.5 parent: 1 type: Transform - uid: 374 @@ -2494,18 +2793,10 @@ entities: - pos: 2.5,4.5 parent: 1 type: Transform -- proto: ReinforcedPlasmaWindow - entities: - - uid: 332 - components: - - rot: 1.5707963267948966 rad - pos: 4.5,2.5 - parent: 1 - type: Transform - - uid: 400 + - uid: 393 components: - - rot: 1.5707963267948966 rad - pos: 4.5,0.5 + - rot: -1.5707963267948966 rad + pos: 2.5,-1.5 parent: 1 type: Transform - proto: ReinforcedWindow @@ -2556,11 +2847,6 @@ entities: pos: 4.5,-5.5 parent: 1 type: Transform - - uid: 145 - components: - - pos: -2.5,-7.5 - parent: 1 - type: Transform - uid: 147 components: - rot: 1.5707963267948966 rad @@ -2613,12 +2899,6 @@ entities: pos: 4.5,-4.5 parent: 1 type: Transform - - uid: 226 - components: - - rot: 1.5707963267948966 rad - pos: 2.5,3.5 - parent: 1 - type: Transform - uid: 227 components: - rot: 1.5707963267948966 rad @@ -2630,6 +2910,12 @@ entities: - pos: -2.5,-5.5 parent: 1 type: Transform + - uid: 280 + components: + - rot: -1.5707963267948966 rad + pos: 3.5,3.5 + parent: 1 + type: Transform - uid: 302 components: - pos: 5.5,-3.5 @@ -2645,93 +2931,151 @@ entities: - pos: 6.5,-1.5 parent: 1 type: Transform -- proto: SheetPlasma +- proto: SheetUranium entities: - - uid: 387 + - uid: 329 components: - - pos: 2.4889736,-4.5330315 + - pos: 2.507905,-5.516142 parent: 1 type: Transform - count: 15 type: Stack - size: 15 type: Item -- proto: ShuttersNormalOpen +- proto: ShuttersRadiationOpen entities: - - uid: 389 + - uid: 26 components: - - pos: -3.5,-7.5 + - rot: 1.5707963267948966 rad + pos: 4.5,-5.5 parent: 1 type: Transform - links: - - 388 + - 109 type: DeviceLinkSink - - uid: 391 + - uid: 100 components: - - pos: -1.5,-7.5 + - pos: 1.5,-6.5 parent: 1 type: Transform - links: - - 388 + - 109 type: DeviceLinkSink -- proto: ShuttersWindowOpen - entities: - - uid: 386 + - uid: 134 components: - - pos: -2.5,-7.5 + - pos: 1.5,-3.5 + parent: 1 + type: Transform + - links: + - 109 + type: DeviceLinkSink + - uid: 179 + components: + - pos: 0.5,-6.5 + parent: 1 + type: Transform + - links: + - 109 + type: DeviceLinkSink + - uid: 193 + components: + - pos: 2.5,-3.5 + parent: 1 + type: Transform + - links: + - 109 + type: DeviceLinkSink + - uid: 250 + components: + - pos: 3.5,-6.5 + parent: 1 + type: Transform + - links: + - 109 + type: DeviceLinkSink + - uid: 273 + components: + - rot: 1.5707963267948966 rad + pos: 4.5,-4.5 + parent: 1 + type: Transform + - links: + - 109 + type: DeviceLinkSink + - uid: 387 + components: + - pos: -0.5,-4.5 + parent: 1 + type: Transform + - links: + - 109 + type: DeviceLinkSink + - uid: 388 + components: + - pos: 2.5,-6.5 parent: 1 type: Transform - links: - - 388 + - 109 type: DeviceLinkSink - proto: SignalButtonDirectional entities: - - uid: 188 + - uid: 107 components: - - desc: 'Reminder: keep... Uhh.. I forgot..' - name: Blast Doors Switch + - name: door bolts switch type: MetaData - rot: 1.5707963267948966 rad - pos: -0.5,2.5 + pos: -4.5,-1.5 parent: 1 type: Transform - linkedPorts: - 326: - - Pressed: Toggle - 186: - - Pressed: Toggle + 11: + - Pressed: DoorBolt + 9: + - Pressed: DoorBolt type: DeviceLinkSource - - uid: 388 + - uid: 109 components: - - desc: You think it's enough to keep the greytide out? - name: Shutters Switch + - name: radiation shutters switch type: MetaData - - rot: 1.5707963267948966 rad - pos: -4.5,-1.5 + - rot: -1.5707963267948966 rad + pos: -0.5326209,-3.2285466 parent: 1 type: Transform - linkedPorts: - 389: + 134: + - Pressed: Toggle + 193: + - Pressed: Toggle + 273: + - Pressed: Toggle + 26: + - Pressed: Toggle + 250: - Pressed: Toggle - 386: + 388: - Pressed: Toggle - 391: + 100: + - Pressed: Toggle + 179: + - Pressed: Toggle + 387: - Pressed: Toggle type: DeviceLinkSource - - uid: 393 + - uid: 188 components: - - desc: Will this stop 'em? - name: Bolts Switch + - desc: 'Reminder: keep... Uhh.. I forgot..' + name: blast doors switch type: MetaData - rot: 1.5707963267948966 rad - pos: -4.4988146,-1.174572 + pos: -0.5,2.5 parent: 1 type: Transform - linkedPorts: - 146: - - Pressed: DoorBolt - 237: - - Pressed: DoorBolt + 326: + - Pressed: Toggle + 186: + - Pressed: Toggle type: DeviceLinkSource - proto: SignDirectionalJanitor entities: @@ -2765,6 +3109,14 @@ entities: pos: 6.5,3.5 parent: 1 type: Transform +- proto: SignRadiationMed + entities: + - uid: 397 + components: + - rot: -1.5707963267948966 rad + pos: -0.5,-3.5 + parent: 1 + type: Transform - proto: SinkWide entities: - uid: 356 @@ -2808,12 +3160,18 @@ entities: - pos: 1.5,0.5 parent: 1 type: Transform +- proto: SpawnPointPilot + entities: + - uid: 461 + components: + - pos: -2.5,1.5 + parent: 1 + type: Transform - proto: SpawnVehicleJanicart entities: - - uid: 136 + - uid: 398 components: - - rot: 1.5707963267948966 rad - pos: -1.5,-3.5 + - pos: 3.5,-0.5 parent: 1 type: Transform - proto: SubstationBasic @@ -2854,6 +3212,17 @@ entities: - pos: -1.5,1.5 parent: 1 type: Transform + - uid: 207 + components: + - rot: 3.141592653589793 rad + pos: -2.5,2.5 + parent: 1 + type: Transform + - uid: 404 + components: + - pos: -3.5,2.5 + parent: 1 + type: Transform - proto: Thruster entities: - uid: 81 @@ -2909,11 +3278,6 @@ entities: - pos: 0.97410214,-0.8047657 parent: 1 type: Transform - - uid: 329 - components: - - pos: -2.7065673,-1.9787903 - parent: 1 - type: Transform - proto: VehicleKeyJanicart entities: - uid: 331 @@ -2928,6 +3292,13 @@ entities: - pos: 5.5,-2.5 parent: 1 type: Transform +- proto: VendingMachineJaniDrobe + entities: + - uid: 70 + components: + - pos: 3.5,2.5 + parent: 1 + type: Transform - proto: WallReinforced entities: - uid: 48 @@ -2981,22 +3352,12 @@ entities: - pos: -0.5,3.5 parent: 1 type: Transform - - uid: 139 - components: - - pos: 4.5,-0.5 - parent: 1 - type: Transform - uid: 161 components: - rot: 1.5707963267948966 rad pos: 4.5,3.5 parent: 1 type: Transform - - uid: 163 - components: - - pos: 5.5,-0.5 - parent: 1 - type: Transform - uid: 165 components: - pos: 6.5,-0.5 @@ -3012,11 +3373,6 @@ entities: - pos: 6.5,2.5 parent: 1 type: Transform - - uid: 178 - components: - - pos: 3.5,3.5 - parent: 1 - type: Transform - uid: 185 components: - pos: -4.5,-1.5 @@ -3042,16 +3398,15 @@ entities: - pos: 4.5,-6.5 parent: 1 type: Transform - - uid: 404 + - uid: 283 components: - - rot: 1.5707963267948966 rad - pos: 5.5,1.5 + - pos: -2.5,-7.5 parent: 1 type: Transform - - uid: 406 + - uid: 402 components: - - rot: 1.5707963267948966 rad - pos: 4.5,1.5 + - rot: -1.5707963267948966 rad + pos: 2.5,3.5 parent: 1 type: Transform - proto: WallSolid @@ -3104,20 +3459,14 @@ entities: - pos: -0.5,-3.5 parent: 1 type: Transform -- proto: WarningN2 - entities: - - uid: 164 + - uid: 400 components: - - rot: 1.5707963267948966 rad - pos: 4.5,-0.5 + - pos: 4.5,-0.5 parent: 1 type: Transform -- proto: WarningO2 - entities: - - uid: 166 + - uid: 401 components: - - rot: 1.5707963267948966 rad - pos: 4.5,1.5 + - pos: 5.5,-0.5 parent: 1 type: Transform - proto: WarpPointShip @@ -3137,12 +3486,30 @@ entities: type: Transform - proto: WindoorSecure entities: + - uid: 139 + components: + - rot: 1.5707963267948966 rad + pos: 4.5,1.5 + parent: 1 + type: Transform - uid: 364 components: - rot: -1.5707963267948966 rad pos: 4.5,-1.5 parent: 1 type: Transform + - uid: 373 + components: + - rot: 1.5707963267948966 rad + pos: 4.5,0.5 + parent: 1 + type: Transform + - uid: 383 + components: + - rot: 1.5707963267948966 rad + pos: 4.5,2.5 + parent: 1 + type: Transform - proto: WindowReinforcedDirectional entities: - uid: 363 @@ -3155,7 +3522,7 @@ entities: entities: - uid: 408 components: - - pos: 1.8879209,-4.426397 + - pos: 2.6283937,-5.1236 parent: 1 type: Transform ... diff --git a/Resources/Prototypes/_NF/Shipyard/liquidator.yml b/Resources/Prototypes/_NF/Shipyard/liquidator.yml index 6197501dff2..33361f1525e 100644 --- a/Resources/Prototypes/_NF/Shipyard/liquidator.yml +++ b/Resources/Prototypes/_NF/Shipyard/liquidator.yml @@ -1,16 +1,26 @@ +# Author Info +# GitHub: erhardsteinhauer +# Discord: erhardsteinhauer + +# Maintainer Info +# GitHub: erhardsteinhauer +# Discord: erhardsteinhauer + +# Shuttle Notes: +# - type: vessel id: liquidator name: NT Liquidator description: A small vessel equipped with everything you need to make even the dirtiest ship squeaky clean (ducky slippers included). - price: 30500 + price: 33000 category: Small group: Civilian - shuttlePath: /Maps/Shuttles/liquidator.yml + shuttlePath: /Maps/_NF/Shuttles/liquidator.yml - type: gameMap id: liquidator mapName: 'NT Liquidator' - mapPath: /Maps/Shuttles/liquidator.yml + mapPath: /Maps/_NF/Shuttles/liquidator.yml minPlayers: 0 stations: liquidator: @@ -24,6 +34,7 @@ - type: StationJobs overflowJobs: [] availableJobs: + Pilot: [ 0, 0 ] Janitor: [ 0, 0 ] AtmosphericTechnician: [ 0, 0 ] Chemist: [ 0, 0 ] From 84227a9300b45865f1b9b53973d8a0865f64d7a9 Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Mon, 22 Jan 2024 18:10:40 +0300 Subject: [PATCH 2/8] Update liquidator.yml NT -> NC --- Resources/Prototypes/_NF/Shipyard/liquidator.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Shipyard/liquidator.yml b/Resources/Prototypes/_NF/Shipyard/liquidator.yml index 33361f1525e..31499a1d89c 100644 --- a/Resources/Prototypes/_NF/Shipyard/liquidator.yml +++ b/Resources/Prototypes/_NF/Shipyard/liquidator.yml @@ -19,7 +19,7 @@ - type: gameMap id: liquidator - mapName: 'NT Liquidator' + mapName: 'NC Liquidator' mapPath: /Maps/_NF/Shuttles/liquidator.yml minPlayers: 0 stations: From a630e4b0866679d4b1cf7acd314bd4134e82b0df Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Thu, 25 Jan 2024 12:09:41 +0300 Subject: [PATCH 3/8] fiddling with lockers --- Resources/Maps/_NF/Shuttles/liquidator.yml | 105 ++++++++---------- .../Prototypes/_NF/Shipyard/liquidator.yml | 2 +- 2 files changed, 46 insertions(+), 61 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/liquidator.yml b/Resources/Maps/_NF/Shuttles/liquidator.yml index 1cdbe197304..74285125b7a 100644 --- a/Resources/Maps/_NF/Shuttles/liquidator.yml +++ b/Resources/Maps/_NF/Shuttles/liquidator.yml @@ -1270,6 +1270,13 @@ entities: - pos: 5.2959647,-1.1305447 parent: 1 type: Transform +- proto: ClosetRadiationSuitFilled + entities: + - uid: 273 + components: + - pos: 1.5,-2.5 + parent: 1 + type: Transform - proto: ClothingBeltUtilityEngineering entities: - uid: 308 @@ -1291,13 +1298,6 @@ entities: - pos: 0.54084945,0.600981 parent: 1 type: Transform -- proto: ClothingHeadHatHoodRad - entities: - - uid: 458 - components: - - pos: 2.3156083,-4.526062 - parent: 1 - type: Transform - proto: ClothingOuterCoatLabChem entities: - uid: 13 @@ -1305,13 +1305,6 @@ entities: - pos: 4.5874624,-1.5838027 parent: 1 type: Transform -- proto: ClothingOuterSuitRad - entities: - - uid: 372 - components: - - pos: 2.7446132,-4.4060936 - parent: 1 - type: Transform - proto: ClothingShoesBootsMag entities: - uid: 262 @@ -1361,6 +1354,13 @@ entities: bank-ATM-cashSlot: !type:ContainerSlot {} type: ContainerContainer - type: ItemSlots +- proto: DefibrillatorCabinetFilled + entities: + - uid: 406 + components: + - pos: 5.5,-0.5 + parent: 1 + type: Transform - proto: DisposalBend entities: - uid: 206 @@ -1670,6 +1670,13 @@ entities: type: Transform - fixtures: {} type: Fixtures +- proto: GasAnalyzer + entities: + - uid: 26 + components: + - pos: 0.35859585,0.46067148 + parent: 1 + type: Transform - proto: GasMixer entities: - uid: 224 @@ -2178,16 +2185,6 @@ entities: type: Transform - color: '#0000CCFF' type: AtmosPipeColor -- proto: GeigerCounter - entities: - - uid: 406 - components: - - pos: 2.8946674,-5.1717024 - parent: 1 - type: Transform - - isEnabled: True - type: Geiger - - type: RadiationReceiver - proto: GravityGeneratorMini entities: - uid: 319 @@ -2389,23 +2386,9 @@ entities: - pos: 5.2817945,-1.2155304 parent: 1 type: Transform -- proto: LockerAtmosphericsFilledHardsuit - entities: - - uid: 208 - components: - - pos: 1.5,-2.5 - parent: 1 - type: Transform -- proto: LockerCaptainFilledHardsuit - entities: - - uid: 360 - components: - - pos: -1.5,0.5 - parent: 1 - type: Transform - proto: LockerJanitorFilled entities: - - uid: 53 + - uid: 208 components: - pos: 2.5,2.5 parent: 1 @@ -2582,11 +2565,12 @@ entities: parent: 1 type: Transform - storage: - Uranium: 1500 + Uranium: 3000 type: MaterialStorage - bodyType: Static type: Physics - - type: InsertingMaterialStorage + - endTime: 0 + type: InsertingMaterialStorage - proto: PortableScrubber entities: - uid: 5 @@ -2935,24 +2919,11 @@ entities: entities: - uid: 329 components: - - pos: 2.507905,-5.516142 + - pos: 2.5721993,-5.4875746 parent: 1 type: Transform - - count: 15 - type: Stack - - size: 15 - type: Item - proto: ShuttersRadiationOpen entities: - - uid: 26 - components: - - rot: 1.5707963267948966 rad - pos: 4.5,-5.5 - parent: 1 - type: Transform - - links: - - 109 - type: DeviceLinkSink - uid: 100 components: - pos: 1.5,-6.5 @@ -2993,10 +2964,17 @@ entities: - links: - 109 type: DeviceLinkSink - - uid: 273 + - uid: 360 components: - - rot: 1.5707963267948966 rad - pos: 4.5,-4.5 + - pos: 4.5,-4.5 + parent: 1 + type: Transform + - links: + - 109 + type: DeviceLinkSink + - uid: 372 + components: + - pos: 4.5,-5.5 parent: 1 type: Transform - links: @@ -3047,9 +3025,9 @@ entities: - Pressed: Toggle 193: - Pressed: Toggle - 273: + 372: - Pressed: Toggle - 26: + 360: - Pressed: Toggle 250: - Pressed: Toggle @@ -3181,6 +3159,13 @@ entities: - pos: 0.5,-5.5 parent: 1 type: Transform +- proto: SuitStorageEVAAlternate + entities: + - uid: 53 + components: + - pos: -1.5,0.5 + parent: 1 + type: Transform - proto: Table entities: - uid: 3 diff --git a/Resources/Prototypes/_NF/Shipyard/liquidator.yml b/Resources/Prototypes/_NF/Shipyard/liquidator.yml index 31499a1d89c..a22a47b1328 100644 --- a/Resources/Prototypes/_NF/Shipyard/liquidator.yml +++ b/Resources/Prototypes/_NF/Shipyard/liquidator.yml @@ -12,7 +12,7 @@ id: liquidator name: NT Liquidator description: A small vessel equipped with everything you need to make even the dirtiest ship squeaky clean (ducky slippers included). - price: 33000 + price: 31600 # 27480+4120 from 15% markup category: Small group: Civilian shuttlePath: /Maps/_NF/Shuttles/liquidator.yml From ef124790b819264688d1006645303042ac04d5ec Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Thu, 25 Jan 2024 13:26:27 +0300 Subject: [PATCH 4/8] added mantle --- Resources/Maps/_NF/Shuttles/liquidator.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/liquidator.yml b/Resources/Maps/_NF/Shuttles/liquidator.yml index 74285125b7a..fb987dc33a3 100644 --- a/Resources/Maps/_NF/Shuttles/liquidator.yml +++ b/Resources/Maps/_NF/Shuttles/liquidator.yml @@ -1298,6 +1298,16 @@ entities: - pos: 0.54084945,0.600981 parent: 1 type: Transform +- proto: ClothingNeckMantleRD + entities: + - uid: 458 + components: + - desc: '"Bestowed upon you by your predecessor, who died in the line of duty, soaked in equal measures with space cleaner and lube, this mantle, by its mere presence, can cleanse floor tiles in a whole department. At least, you think it can."' + name: chief janitor's mantle + type: MetaData + - pos: -1.3437538,1.3678913 + parent: 1 + type: Transform - proto: ClothingOuterCoatLabChem entities: - uid: 13 @@ -2569,8 +2579,7 @@ entities: type: MaterialStorage - bodyType: Static type: Physics - - endTime: 0 - type: InsertingMaterialStorage + - type: InsertingMaterialStorage - proto: PortableScrubber entities: - uid: 5 From 356e5b12414c953107d8f5ec85c22c7df76e8ec5 Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 26 Jan 2024 22:12:33 +0200 Subject: [PATCH 5/8] Janitor Cloak --- .../Entities/Clothing/base_clothing.yml | 11 ++++++ .../_NF/Entities/Clothing/Neck/mantles.yml | 37 ++++++++++++++++++ .../Neck/Cloaks/janitor.rsi/equipped-NECK.png | Bin 0 -> 1184 bytes .../Clothing/Neck/Cloaks/janitor.rsi/icon.png | Bin 0 -> 469 bytes .../Neck/Cloaks/janitor.rsi/inhand-left.png | Bin 0 -> 705 bytes .../Neck/Cloaks/janitor.rsi/inhand-right.png | Bin 0 -> 720 bytes .../Neck/Cloaks/janitor.rsi/meta.json | 33 ++++++++++++++++ .../janitor.rsi/plunger-equipped-NECK.png | Bin 0 -> 225 bytes .../Neck/Cloaks/janitor.rsi/plunger.png | Bin 0 -> 193 bytes 9 files changed, 81 insertions(+) create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/Neck/mantles.yml create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger-equipped-NECK.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger.png diff --git a/Resources/Prototypes/Entities/Clothing/base_clothing.yml b/Resources/Prototypes/Entities/Clothing/base_clothing.yml index 60a94fe2914..c18ab1d448f 100644 --- a/Resources/Prototypes/Entities/Clothing/base_clothing.yml +++ b/Resources/Prototypes/Entities/Clothing/base_clothing.yml @@ -16,3 +16,14 @@ components: - type: Geiger attachedToSuit: true + +# for clothing that has a single item slot to insert and alt click out. +# inheritors add a whitelisted slot named item +- type: entity + abstract: true + id: ClothingSlotBase + components: + - type: ItemSlots + - type: ContainerContainer + containers: + item: !type:ContainerSlot diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/mantles.yml new file mode 100644 index 00000000000..60c450cbf54 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/mantles.yml @@ -0,0 +1,37 @@ +- type: entity + parent: [ClothingNeckBase, ClothingSlotBase] + id: ClothingNeckCloakJanitor + name: janitor cloaks + description: How did you even get this? did you make it yourself? + components: + - type: Sprite + sprite: _NF/Clothing/Neck/Cloaks/janitor.rsi + - type: Clothing + sprite: _NF/Clothing/Neck/Cloaks/janitor.rsi + - type: ItemSlots + slots: + item: + name: Plunger +# insertVerbText: cloak-insert-verb +# ejectVerbText: cloak-eject-verb + whitelist: + tags: + - Plunger + - type: ItemMapper + mapLayers: + plunger: + whitelist: + tags: + - Plunger + sprite: _NF/Clothing/Neck/Cloaks/janitor.rsi + - type: Appearance + +- type: entity + id: ClothingNeckCloakJanitorFilled + parent: ClothingNeckCloakJanitor + suffix: Filled + components: + - type: ContainerFill + containers: + item: + - Plunger diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/equipped-NECK.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..fa3ee8f1058b01cf6a453c74dcac55f988085cb3 GIT binary patch literal 1184 zcmV;R1Yi4!P)Px(T1iAfRCt{2n=x$LMihpB6#){7oKtq7Yb2Meu z6m-(sNuDJE9)wJRIB0O-!G(qxSu)5-rzY?aM)V|7_QVeCJ5v-T-H{ZdqW1xUXx@?U z-hb~Nk9RU4kw_#GiRAxEPNZ_94i5mDt@-Pgm8A*Ui6V~eTOx*^7^Z&=!wVW)R+bjz zIN5oyz0J!0{_=&{2E>Hmsu))N(bKoc=ku6Or|kRV`{y&)q$xt94sXADfaBAe0={LkDk5-0OtI!zjaV36mYjx!k|~?y)8Gou0wtG z2}g%J05Bs&@SLV;7zo^VrAnke@qIi7fSDdAG47U1?3_q1tg`?5%{N$<#m?Eb&7y&N zT~$?9u4x+n`28N2eJ%m$n1mn^DExsN=YzeUmH+_eLZ3tkI}hAML}CFbxos&5fE(w6 z5kZ8@CXRzYO(U@gQCUAK50KMAcx~Dd)lW*W15{OoZQB5% zohAEJZ{j#yPbBUnNKQ>0CsNrbhU1Y~X+q8eVBb*@7#s%SA+d~~L>e=398?S=QqhWG z4ZZu7UWm!;F zl{t8HxWhhF=fUQK*%2(s}4(70dM zbxQ?kwveMo-j<@EZ<-6=!~mdgnjXy=(n^SfUKzG+&-FeXhtE;6>D*Xqtx6Xp~I^WJ%P_GHRTQ=8TmB z_+fN!W-($J6s~El2l)3XFU>uRuaih55{X12kw_#Gi6k}J-Hx~HhYDHKsKaY_JF(g$ zyeQi4cD(ap4Z9U{>8~}iqEUypTQPAytRapFLW>6NZpSPAyW?`&H?UhVaoRUnc~*-M zLE)(lyA^-2W^CIycv<6ahwzeEQ7z)qzML}*tncSBL8!-xU>k~R5o5t6G495;yB+W0 z!(ZS`T>!wfd&L?MW?dpg4LNfDcHs^HK*<;I`SV}gQNSGm=ffJ#hyL+i^%%DccW~`q z%|rkYEl8S#?EyE=ANTfz?l0v4Z=}I?NRat;d{l}7a&8=4*W6UOkEZMSwImG$Kf!-^8iYM;lHy8f51<$ zB=n-Th>*(e@NsW1(~XE`3%Rt0-^Oo`ubV^yI8!(C-X|yu;)Hz=837`d4_?-C7hf;d z)t1DF&H;cJkHO%Ka1%(H428!oy%84GBHpzh|L|?-MjhU>gCQ>MOW`*`AVCh;1m^)i y8NO>jj(vTsAwY&>TTPi}3px645s5@15#b+vf*5&%v;#>10000 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/icon.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e82fb262a1c81727cd9a6a6746c05e541f0d6fec GIT binary patch literal 469 zcmV;`0V@89P)Px$k4Z#9R9J=WR-tagFc5v4#yWP=m8IBVUrAW zpdffIq=Ds0QIhl7_wwGw2{2;Bi2sh8z7sZURM*CyU;3|i*SGLI z$p8SeC~{*T$KyE%N!6Fgt+aTY7Ot>gydI0wqE)3j#0n^-K&u1ZULODe%hkb+`7vfj zE?pFY9@wl=JwAOxYwcpj807l}mOq5zv;Yygac0JDI~7?WvS7EJUfdHA;EyKwafW60wE}+ zF3v+CB4GCbtHiY&`{dVh1`)6l_l0y`CxLvwaDMwwX0Pip+ZUl%HH1MMkra}RNc1s^ z(*jDVhPR=fU}ltMDON!IH7v`r5exa;w`W8@4nu4h@^>_1#Gl|B0sW-wtY$a900000 LNkvXXu0mjfe<#bT literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..bf715e24e24187bac49e2720123087e78ec4bbeb GIT binary patch literal 705 zcmV;y0zUnTP)Px%dr3q=RCt{2nlX>lKoEuBB5E3o?V*b%_j%q4}gp$$I_r_GQ;8W&lAD1VIo4K@bE% z5ClQkgNQ0$MV29`IClGb6P;xUdW~0&yp(Bm9)No-Lr@&YR5tER)tPql(=;vB>LP$g zZG^On6isLLVB8pk!7#=uQeLiBk)rV=ZNri`CkNmbpY1e${~Eyso6sowpZI$#!%w?iTK=)0E0B2^{{F-Gw`&^9B9W%(4tumwf{A1y*S( zr9eanI>obJ)UHA)uW9+*x(TiSuigVq0%+wK@Q{%JxD9Y40dO1OMgrhAz>NgJZGamI zfZG5!5&*XWZX^J11Kdae+y=Oj0JsfsBLQ$5;6?)AHo#3QwZZ%5m}1G%+^+Nc^a&hW z*Z0-8)>ifqG{Nf#tRh8&VSH48ZQ@GtZ5B#v1GuaCp$u2c?}9h#Jzl=J`K+}@vK{Rm z2V)F1?IZBo0WR^bniPC^9)6^=^SlwmRiWn#Qu76=RiwxmL$05o30@CDtu?ML`;`xz zvg&XbJbjiT+v&aUaUldj^Y)tB9Wb7xYO~fD4CBg$4TiC*n{z5|Cw~35KW>b{c#^8R nAL+s4+UK}^2!bF8{|kQr_cTI~=WBi+00000NkvXXu0mjfhKoFr literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..1ae6bfccba526c66b04f8e6d672c51ba3fc42dbf GIT binary patch literal 720 zcmV;>0x$iEP)Px%ib+I4RCt{2nm>=)KoG^>o>HelY=7x2P!!S7Ai1JOsYy#4kuLEyX+Y_qN<+;D zNS$g|ZfLA1vfHG(X42gUxJiMQ*v1F=#ATf@Kgq(ZSK~Kt|G1b11VIo4K@bE%5ClOG z1Yrj=7w#7`aQS)Dt~_t>8jBgYtox+I7c+1nIIo$fMMRR%2QihBbC zYwg~%@r1CPt9p($fZ-^u)Lm%+0JK^y0AOc=wU+PiLS!4=XcL?+Yb{%AIf+B8KX>u# zXBXoM?JeVHy^fjoA>IR!q0`%=ms%Q5{GzqgM#kLB-}a~j#Aa>baw4-eN7{7WbyzCdy~_d*R51h z`d%W;j4aClY~5_P+fS+23waYN4fx;58}Q&Ba4CoZz6JP34Dc<$H)4Qq0lpCfd<*c6 z7~orgZ^QuK0(>I|_!i(BF~GL~--rRe1^7k`@GZbM7jM8`ZLls?g@}Ke$JXD8=*iCx zoEraFzdUDK0z}l9vUzV{PS#P&faP4VwU+b$lQ=9CQeV9U-l`9E!qy`H{zIHP7`10W z5CpK+@^Y?t8nK#2tX$p%I8=ff*=UOrSKcgzpUELVn}fS0000{g39p!Ym{+B0>A9_Q925g5zL@9rsibN7M*kDfYU8)wOfojM zu4iFjxZtw3UVK85{fp`A%O5}1Tsgh$Z&6)-weGv;7fXcZ=IQ@jtHW+!9Y3$Gy5fdv ze$h0+h%<|Y8n3FIkIT}WcGa;)>oiAA@V4yF63uSw>RnuRiZKFR1O*TFN-yXV>ukCN4)78&qol`;+0ILR8Jpcdz literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger.png new file mode 100644 index 0000000000000000000000000000000000000000..53f0183cf19eff87179154a7227b36362b062527 GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R})t)YnArY;~ z2@+1aHEnxqkGfrGA`FB3tBKq9frpDIZewpMG8StXZ9pRV#0&;goK12 j_w9KWLG0jiJJ`U?&?_R=ufmxOavFoDtDnm{r-UW|51Byz literal 0 HcmV?d00001 From a3581e238ef3d07f2bfeba34f624ffedc36fcfbb Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 26 Jan 2024 22:14:47 +0200 Subject: [PATCH 6/8] Update equipped-NECK.png --- .../Neck/Cloaks/janitor.rsi/equipped-NECK.png | Bin 1184 -> 1182 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/equipped-NECK.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/equipped-NECK.png index fa3ee8f1058b01cf6a453c74dcac55f988085cb3..05d5d7b2596a3554c25347af016b7129ac791911 100644 GIT binary patch delta 1148 zcmV-?1cUpa37!d%F@IP|L_t(|ob8)2Y}-Z@hJO_W5{aHfZ+;eq_vYWO9C}$$&zkP$(3N|0_9}!i_pS0BE)r>wm3!mL_B;ia54^lrj9o zwESzBUeMU8XK6u>lbyS}yZqVTpFeZkfSeFQ1;eU8din*sejQ{@d?)hAuG(~9C z;T=?uG3b@?%gc{T%e{W}5L8aozHkH_RFCm(JjQf7#fNv#@#yIr0N~C)__>2Zp@3VZ z5(d4pXtTl?hJOM5ded61A3;=T@PGa0DmH0iGQCMgH z*WbRvwrzgTaU32EH0rvp^XH5){PFv3A^SoC&@~A`B2f4P*Ukq=KP>?OEQCIZ5OyB8 zj)=qpP;%SRGyvDm1tWq8KbyEN{{Gdk>k7S*gp(jSHF4cYWuKU?M`EQ3IS+vUj*7tGGzd?L zRs0~+nThM7Vw#bPR!lQDab20_gdk@aV>|+MU0?VC{Ph51Y_8rqgavqidb-qkqGFo4 z_ot_#O@9i*7=vxw&~=?V=s3=tD2y@O-Q9(4+q{ejQW3CC&{Ru0<^B@_&>DauVObd( z`DJCI*m?md#5YxMr2x$qa`ejE(KPfeYw0I30O(tmM{9<(65^m&=JP!`vUDB3M|nYX zIWGJfjG|G;()Vl{i=bu;xkeq{pjVb!-v{fjD}R$nfUG#E9>XwP3ttx5R`y+wOL}`}gm`olOA%SJO-0fiRmAA!^Ez^EV1N0RURQfKQ+P5{?4l2sj(o za5nU>_p3*^QMie#>E&Dm0MUY^N!T86?SK4HZ(q7S=^Sw9r#sxxe)WhyyP96&q@VmO zU>!6C$Y}s`{WLIEtr1ILfF$TD~CNR;+UYGW6`wpA+tE$|E2PC<5X* z97cK_KuIwCcNXCf_z9MTUe*^GQaK$y>g{KG5YcQQm)7*#`s49UlSlw}HqCtW33ZBs zIAI?|MSx7 z!yzu53+YdSK!O~w4bB68GJM;99J_w3DL{r}TTPi}3px645rsmbkl`P402XP*N#CLX O0000^6UOo2FPaNxm(h8S5g$VjIq@DN7yBvSUo4(vNq6eZn} z6r-Z|0fK1Wk?-Dr?;ekLG9ZyiBoc|_|4L4za-$9p0Gh4&>wlJ&r3u-IB984_B8HzB zrhg2>3mRKimKNkV*?F+N&C34%@`c$3#Dw6g7*_q!)3?ay^O#Pj?EB;U=QG!&DMF(T zZ@+qiL9dJ#uRblTcXYS|s>f@eI|BBrC-^=d!*yMJeE%Gep1uVD=KQa}bxBmaqMarCRBz%qTu&tKBuGw894AuQCx+vZSZPAe17P1#5f~f>;UTe% zpF|onaU4_(BT~_dVdN%`BXT<~$Qe!3SOlo5I`;wm`GBTrGuN$xTYwK|XA7MtDu$8! zaCXLfOMh-OO@n1wP*s&VcyzeKK2+zy_BJfbVs&`n9s--j>o?!naqtl-iqH`FQILZa z35)7b&x;7M@dD7eU)Oa@1!%UAqetGBqM&b@3*W>5pl_NU%^A{4h=X1kwr$V#J{^b8 zQL^Nnjwi|ijXD-SXVaJjHCxCv>hK1=ve5iKcz^w>I{%3zxL-YiuIqDSJ1Qq=nugJ6 zluZO=Nz}|TYMhJajFkfTVRUb1F=81Mu4%0Y`1dI<%{_~+lSm{Ii9{liNF)-8BsJRI zj<@WG3R%;r!)tdtvDzcNDBA9Jyz^lVyA^ZkuQjrwQHQr%F>yYuA&v+_iw5m($1DB2 z<9~A6H?UhVaoRUnc~*-MLE)(lyA^-2W^CIycv<6ahwzeEQ7z)qzML}*tncSBL8!-x zU>k~R5o5t6G495;yB+W0!(ZS`T>!wfd&L?MW?dpg4LNfDcHs^HK*<;I`SV}gQNSGm z=ffJ#hyL+i^%%DccW~`q%|rkYEl8S#?SBC`&L8*ogzqPu1MdHPpBdV#9<#D*_X?-| zt+e+7}>0&kp=C;Y?i?0a-v1 z5Xa##!t(%1g5kfj2!Fs&uq5=Nwuq3*?(lJMFVl^PW(&ErhTq0-kFT3V0ytAQ^LO4S zC<@|)eGnM|B9#wb)^ZnLFV@wT#E8xTfEbU#;EZq+NSX|V$1c4Q7S$r&wIBcRZRkcF z-m`-tF6~R Date: Sun, 28 Jan 2024 17:31:35 +0200 Subject: [PATCH 7/8] Update mantles.yml --- Resources/Prototypes/_NF/Entities/Clothing/Neck/mantles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/mantles.yml index 60c450cbf54..e9bd9a13b4d 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Neck/mantles.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/mantles.yml @@ -1,7 +1,7 @@ - type: entity parent: [ClothingNeckBase, ClothingSlotBase] id: ClothingNeckCloakJanitor - name: janitor cloaks + name: janitor's cloak description: How did you even get this? did you make it yourself? components: - type: Sprite From bb6413f4dd486539e3de41b637efb074bdde3fd2 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sun, 28 Jan 2024 17:37:47 +0200 Subject: [PATCH 8/8] Update liquidator.yml --- Resources/Maps/_NF/Shuttles/liquidator.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/liquidator.yml b/Resources/Maps/_NF/Shuttles/liquidator.yml index fb987dc33a3..e3658b0988e 100644 --- a/Resources/Maps/_NF/Shuttles/liquidator.yml +++ b/Resources/Maps/_NF/Shuttles/liquidator.yml @@ -1298,14 +1298,11 @@ entities: - pos: 0.54084945,0.600981 parent: 1 type: Transform -- proto: ClothingNeckMantleRD +- proto: ClothingNeckCloakJanitorFilled entities: - uid: 458 components: - - desc: '"Bestowed upon you by your predecessor, who died in the line of duty, soaked in equal measures with space cleaner and lube, this mantle, by its mere presence, can cleanse floor tiles in a whole department. At least, you think it can."' - name: chief janitor's mantle - type: MetaData - - pos: -1.3437538,1.3678913 + - pos: -1.3020872,1.440808 parent: 1 type: Transform - proto: ClothingOuterCoatLabChem