From 50ba3aa093ed59167f7add7ef1bbd6581c1de218 Mon Sep 17 00:00:00 2001 From: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Date: Sun, 7 Jan 2024 21:45:57 +0100 Subject: [PATCH 01/12] Sprinter rework (#832) * Create pr-labeler.yml * Update labeler.yml * Sprinter rework * Remove security intercom, tracking implants, reduce price * Make @dvir01 happy * Resolve stairs situation * Sprinter 2.0 * Update sprinter.yml * Thrusters on separate APC's, passive gate, no more dark tiles next to stairs --------- Co-authored-by: Dvir Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../Maps/{ => _NF}/Shuttles/sprinter.yml | 4063 +++++++---------- .../Prototypes/_NF/Shipyard/sprinter.yml | 12 +- 2 files changed, 1667 insertions(+), 2408 deletions(-) rename Resources/Maps/{ => _NF}/Shuttles/sprinter.yml (71%) diff --git a/Resources/Maps/Shuttles/sprinter.yml b/Resources/Maps/_NF/Shuttles/sprinter.yml similarity index 71% rename from Resources/Maps/Shuttles/sprinter.yml rename to Resources/Maps/_NF/Shuttles/sprinter.yml index 2b3bc8e8d60..3b1d4dced50 100644 --- a/Resources/Maps/Shuttles/sprinter.yml +++ b/Resources/Maps/_NF/Shuttles/sprinter.yml @@ -3,15 +3,16 @@ meta: postmapinit: false tilemap: 0: Space - 27: FloorDark - 40: FloorElevatorShaft - 62: FloorMetalDiamond - 70: FloorPlastic - 89: FloorSteelDirty - 96: FloorTechMaint - 109: FloorWhitePlastic - 112: Lattice - 113: Plating + 28: FloorDark + 41: FloorElevatorShaft + 63: FloorMetalDiamond + 71: FloorPlastic + 85: FloorSteel + 90: FloorSteelDirty + 97: FloorTechMaint + 110: FloorWhitePlastic + 113: Lattice + 114: Plating entities: - proto: "" entities: @@ -24,19 +25,19 @@ entities: - chunks: 0,0: ind: 0,0 - tiles: WQAAAAAAWQAAAAAAGwAAAAABGwAAAAADGwAAAAADcQAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAKAAAAAAAcAAAAAAAKAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAGwAAAAACGwAAAAABGwAAAAABcAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAGwAAAAADGwAAAAADGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAGwAAAAACGwAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAGwAAAAAAGwAAAAABGwAAAAADcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAGwAAAAACGwAAAAADGwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAGwAAAAAAGwAAAAACGwAAAAADcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAGwAAAAADGwAAAAADGwAAAAADcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAGwAAAAADGwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAADGwAAAAADGwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAADGwAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAADGwAAAAACcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: WgAAAAAAWgAAAAAAHAAAAAABHAAAAAADHAAAAAADcgAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAKQAAAAAAcQAAAAAAKQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAWgAAAAAAHAAAAAACHAAAAAABHAAAAAABcQAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAWgAAAAAAHAAAAAADHAAAAAADHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAHAAAAAACHAAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAHAAAAAAAHAAAAAABHAAAAAADcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAHAAAAAACHAAAAAADHAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAHAAAAAAAHAAAAAACHAAAAAADcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAHAAAAAADHAAAAAADHAAAAAADcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAADHAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAADHAAAAAADHAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAADHAAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAADHAAAAAACcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,0: ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAKAAAAAAAcAAAAAAAKAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAGwAAAAADGwAAAAACGwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAGwAAAAADGwAAAAABGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAGwAAAAADGwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAKQAAAAAAcQAAAAAAKQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAADHAAAAAACHAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAHAAAAAADHAAAAAABHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAADHAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAWQAAAAAARgAAAAACRgAAAAACWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAcAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAKAAAAAAAcAAAAAAAKAAAAAAAcQAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAcQAAAAAAcAAAAAAAcAAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAKAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAGwAAAAAAGwAAAAADGwAAAAACGwAAAAADGwAAAAABWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAACGwAAAAACGwAAAAABGwAAAAACGwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAGwAAAAAAGwAAAAABGwAAAAADGwAAAAABGwAAAAACGwAAAAAAGwAAAAABGwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAcQAAAAAAcQAAAAAAWQAAAAAAcQAAAAAAcQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAKAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAcQAAAAAAcAAAAAAAcAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAcQAAAAAAWQAAAAAAWQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAWgAAAAAARwAAAAACRwAAAAACWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAcQAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAKQAAAAAAcQAAAAAAKQAAAAAAcgAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAKQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAHAAAAAAAHAAAAAADHAAAAAACHAAAAAADHAAAAAABWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAcgAAAAAAcgAAAAAAWgAAAAAAcgAAAAAAcgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAKQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAcgAAAAAAWgAAAAAAWgAAAAAA version: 6 0,-1: ind: 0,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAARgAAAAABWQAAAAAAWQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAcQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAcQAAAAAAWQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAARgAAAAAAcQAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAcAAAAAAAAAAAAAAAcAAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAGwAAAAADWQAAAAAAWQAAAAAAWQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAcQAAAAAAKAAAAAAAcAAAAAAAKAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAbQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAcAAAAAAAcAAAAAAAcQAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAGwAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAKAAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAcQAAAAAAcQAAAAAAGwAAAAABGwAAAAACcQAAAAAAWQAAAAAAWQAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAADGwAAAAABGwAAAAACGwAAAAADGwAAAAABGwAAAAABGwAAAAADGwAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAADGwAAAAADGwAAAAADGwAAAAADGwAAAAAAGwAAAAACGwAAAAACGwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAGwAAAAADcQAAAAAAcQAAAAAAGwAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAGwAAAAABGwAAAAADGwAAAAACGwAAAAADcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAKAAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAGwAAAAADGwAAAAABGwAAAAAAGwAAAAADcAAAAAAAcAAAAAAAcQAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAARwAAAAABWgAAAAAAWgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAcgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAcgAAAAAAWgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAARwAAAAAAcgAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAcQAAAAAAAAAAAAAAcQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAHAAAAAADWgAAAAAAWgAAAAAAWgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAcgAAAAAAKQAAAAAAcQAAAAAAKQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAbgAAAAABWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAHAAAAAACWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAKQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAcgAAAAAAcgAAAAAAHAAAAAABHAAAAAACcgAAAAAAWgAAAAAAWgAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAADcgAAAAAAcgAAAAAAHAAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAWgAAAAAAHAAAAAABHAAAAAADHAAAAAACHAAAAAADcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAKQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAWgAAAAAAHAAAAAADHAAAAAABHAAAAAAAHAAAAAADcQAAAAAAcQAAAAAAcgAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 type: MapGrid - type: Broadphase @@ -62,732 +63,646 @@ entities: color: '#FFFFFFFF' id: Bot decals: - 474: -12,-3 - 475: -11,-3 - 476: -10,-3 - 477: 9,-3 - 478: 10,-3 - 479: 11,-3 + 429: -12,-3 + 430: -11,-3 + 431: -10,-3 + 432: 9,-3 + 433: 10,-3 + 434: 11,-3 - node: angle: 4.71238898038469 rad color: '#FFFFFFFF' id: Bot decals: - 26: -5,-7 - 27: -4,-7 - 28: -3,-7 - 29: -3,-8 - 30: -4,-8 - 31: -5,-8 - 32: -5,-9 - 33: -4,-9 - 34: -3,-9 - - node: - color: '#787878FF' - id: BrickTileSteelLineE - decals: - 12: 5.7666655,-3.9822545 - 13: 5.7666655,-4.9822545 - - node: - color: '#8C8C8CFF' - id: BrickTileSteelLineE - decals: - 10: 6.0010405,-3.9978795 - 11: 6.0166655,-4.9822545 - - node: - color: '#A0A0A0FF' - id: BrickTileSteelLineE - decals: - 8: 6.2510405,-3.9978795 - 9: 6.2666655,-4.9822545 - - node: - color: '#B4B4B4FF' - id: BrickTileSteelLineE - decals: - 6: 6.5010405,-3.9978795 - 7: 6.5010405,-4.9822545 - - node: - color: '#C8C8C8FF' - id: BrickTileSteelLineE - decals: - 4: 6.7510405,-3.9978795 - 5: 6.7510405,-4.9822545 - - node: - color: '#FFFFFFFF' - id: BrickTileSteelLineE - decals: - 2: 7,-4 - 3: 7,-5 - - node: - color: '#8C8C8CFF' - id: BrickTileSteelLineW - decals: - 22: -6.795757,-4.0040007 - 23: -6.795757,-4.9883757 - - node: - color: '#A0A0A0FF' - id: BrickTileSteelLineW - decals: - 20: -7.043778,-4.981266 - 21: -7.045757,-3.9883757 - - node: - color: '#B4B4B4FF' - id: BrickTileSteelLineW - decals: - 18: -7.2781525,-4.012516 - 19: -7.2781525,-4.981266 - - node: - color: '#C8C8C8FF' - id: BrickTileSteelLineW - decals: - 16: -7.5125275,-3.9968908 - 17: -7.5125275,-4.981266 - - node: - color: '#DCDCDCFF' - id: BrickTileSteelLineW - decals: - 14: -7.7625275,-3.9968908 - 15: -7.7625275,-4.981266 - - node: - color: '#FFFFFFFF' - id: BrickTileSteelLineW - decals: - 0: -8,-4 - 1: -8,-5 + 2: -5,-7 + 3: -4,-7 + 4: -3,-7 + 5: -3,-8 + 6: -4,-8 + 7: -5,-8 + 8: -5,-9 + 9: -4,-9 + 10: -3,-9 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' id: Caution decals: - 520: 11,-6 + 475: 11,-6 - node: cleanable: True color: '#FFFFFFFF' id: Caution decals: - 209: -4,-4 + 184: -4,-4 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: Caution decals: - 24: -12,-4 - 521: -12,-6 + 0: -12,-4 + 476: -12,-6 - node: angle: 4.71238898038469 rad color: '#FFFFFFFF' id: Caution decals: - 25: 11,-4 + 1: 11,-4 - node: cleanable: True color: '#C7621F47' id: Dirt decals: - 210: -5,-2 - 211: -5,-2 - 212: -5,-2 - 213: -5,-2 - 214: -5,-2 - 215: -6,-2 - 216: -6,-2 - 217: -5,-2 - 218: -6,-2 - 219: -6,-2 - 220: -4,-2 - 221: 7,-4 - 222: 7,-5 - 223: 7,-4 - 224: 6,-5 - 225: -8,-5 - 226: -8,-4 - 227: -8,-4 - 228: -8,-4 - 229: -8,-5 - 230: -7,-4 - 231: -7,-5 - 232: -8,-5 - 233: -8,-5 - 234: 1,-1 - 235: 1,0 - 236: 1,-2 - 237: -2,9 - 238: -3,10 - 239: -2,10 - 240: -1,9 - 241: 0,9 - 242: 0,9 - 243: 0,10 - 244: -1,10 - 245: -2,9 - 246: -2,9 - 247: -1,9 - 248: 0,9 - 249: 1,9 - 250: 0,10 - 251: -1,10 - 252: -2,10 - 253: -2,11 - 254: 0,11 - 255: 0,11 + 185: -5,-2 + 186: -5,-2 + 187: -5,-2 + 188: -5,-2 + 189: -5,-2 + 190: -6,-2 + 191: -6,-2 + 192: -5,-2 + 193: -6,-2 + 194: -6,-2 + 195: -4,-2 + 196: 1,-1 + 197: 1,0 + 198: 1,-2 + 199: -2,9 + 200: -3,10 + 201: -2,10 + 202: -1,9 + 203: 0,9 + 204: 0,9 + 205: 0,10 + 206: -1,10 + 207: -2,9 + 208: -2,9 + 209: -1,9 + 210: 0,9 + 211: 1,9 + 212: 0,10 + 213: -1,10 + 214: -2,10 + 215: -2,11 + 216: 0,11 + 217: 0,11 - node: cleanable: True color: '#FF0000FF' id: Dirt decals: - 68: -4,-1 - 69: -5,-1 - 70: -4,-1 - 71: -4,-1 - 72: -5,0 - 73: -4,0 - 74: -4,0 + 44: -4,-1 + 45: -5,-1 + 46: -4,-1 + 47: -4,-1 + 48: -5,0 + 49: -4,0 + 50: -4,0 - node: cleanable: True angle: 4.71238898038469 rad color: '#FF9F4DFF' id: Dirt decals: - 35: -3,-11 - 36: -3,-11 - 37: -2,-11 - 38: -2,-11 - 39: -3,-11 - 40: -3,-10 - 41: -3,-10 - 42: -2.5055575,-10.488877 - 47: -5,-8 - 48: -3,-7 + 11: -3,-11 + 12: -3,-11 + 13: -2,-11 + 14: -2,-11 + 15: -3,-11 + 16: -3,-10 + 17: -3,-10 + 18: -2.5055575,-10.488877 + 23: -5,-8 + 24: -3,-7 - node: cleanable: True color: '#FFFFFFFF' id: Dirt decals: - 133: 10,-5 - 134: 11,-5 - 135: 11,-4 - 489: -11,-6 - 490: -11,-6 - 491: -11,-6 - 492: -11,-3 - 493: -11,-3 - 494: -11,-3 - 495: 10,-6 - 496: 10,-6 - 497: 10,-6 - 498: 10,-3 - 499: 10,-3 - 500: 10,-3 - 501: -12,-8 - 502: -11,-8 - 503: -11,-8 - 504: -10,-8 - 505: -10,-8 - 506: -12,-1 - 507: -12,-1 - 508: -11,-1 - 509: -10,-1 - 510: 9,-8 - 511: 9,-8 - 512: 10,-8 - 513: 11,-8 - 514: 11,-8 - 515: 11,-1 - 516: 10,-1 - 517: 10,-1 - 518: 9,-1 - 519: 9,-1 + 109: 10,-5 + 110: 11,-5 + 111: 11,-4 + 444: -11,-6 + 445: -11,-6 + 446: -11,-6 + 447: -11,-3 + 448: -11,-3 + 449: -11,-3 + 450: 10,-6 + 451: 10,-6 + 452: 10,-6 + 453: 10,-3 + 454: 10,-3 + 455: 10,-3 + 456: -12,-8 + 457: -11,-8 + 458: -11,-8 + 459: -10,-8 + 460: -10,-8 + 461: -12,-1 + 462: -12,-1 + 463: -11,-1 + 464: -10,-1 + 465: 9,-8 + 466: 9,-8 + 467: 10,-8 + 468: 11,-8 + 469: 11,-8 + 470: 11,-1 + 471: 10,-1 + 472: 10,-1 + 473: 9,-1 + 474: 9,-1 + 487: 6,-5 - node: cleanable: True color: '#FF0000FF' id: DirtHeavy decals: - 75: -4,-2 - 76: -4,-2 - 77: -4,-1 - 78: -4,-1 + 51: -4,-2 + 52: -4,-2 + 53: -4,-1 + 54: -4,-1 - node: color: '#FFFFFFCA' id: DirtHeavy decals: - 325: 3,4 - 326: 3,5 - 327: 3,6 - 328: 3,6 - 329: 3,6 - 330: 3,7 - 331: 2,6 - 332: 3,5 - 333: 3,4 - 334: 3,4 - 335: 3,1 - 336: 2,1 - 337: 2,1 - 338: 3,2 - 339: 3,2 - 340: 3,2 - 341: 2,1 - 342: 2,2 - 343: 3,2 - 344: 0,2 - 345: 0,1 - 346: 0,2 - 347: -1,1 - 348: -1,1 - 349: -1,10 - 350: -1,9 - 351: 0,9 - 352: 0,10 - 353: -2,10 - 354: -3,9 - 355: -2,10 - 356: 1,10 - 357: 1,9 + 287: 3,4 + 288: 3,5 + 289: 3,6 + 290: 3,6 + 291: 3,6 + 292: 3,7 + 293: 2,6 + 294: 3,5 + 295: 3,4 + 296: 3,4 + 297: 3,1 + 298: 2,1 + 299: 2,1 + 300: 3,2 + 301: 3,2 + 302: 3,2 + 303: 2,1 + 304: 2,2 + 305: 3,2 + 306: 0,2 + 307: 0,1 + 308: 0,2 + 309: -1,1 + 310: -1,1 + 311: -1,10 + 312: -1,9 + 313: 0,9 + 314: 0,10 + 315: -2,10 + 316: -3,9 + 317: -2,10 + 318: 1,10 + 319: 1,9 - node: cleanable: True color: '#FFFFFFCA' id: DirtHeavy decals: - 364: -4,7 - 365: -4,7 + 326: -4,7 + 327: -4,7 + 328: -4,6 + 329: -4,5 + 330: -3,4 + 331: -3,4 + 332: -2,5 + 333: -4,6 + 334: -4,4 + 335: -2,4 + 336: -2,6 + 337: -4,6 + 338: -5,5 + 339: -5,5 + 340: -4,4 + 341: -3,5 + 342: -3,6 + 343: -2,7 + 344: -2,7 + 345: -2,7 + 346: -2,7 + 347: -2,7 + 348: 0,6 + 349: 0,7 + 350: 0,7 + 351: 0,7 + 352: -2,6 + 353: -1,6 + 354: -1,7 + 355: -1,7 + 356: 0,6 + 357: -1,5 + 358: -1,4 + 359: -1,4 + 360: -3,4 + 361: -4,4 + 362: -4,4 + 363: -4,4 + 364: -4,6 + 365: -4,6 366: -4,6 367: -4,5 - 368: -3,4 - 369: -3,4 - 370: -2,5 - 371: -4,6 - 372: -4,4 - 373: -2,4 - 374: -2,6 - 375: -4,6 - 376: -5,5 - 377: -5,5 - 378: -4,4 - 379: -3,5 - 380: -3,6 - 381: -2,7 - 382: -2,7 - 383: -2,7 - 384: -2,7 - 385: -2,7 - 386: 0,6 - 387: 0,7 - 388: 0,7 - 389: 0,7 - 390: -2,6 - 391: -1,6 - 392: -1,7 - 393: -1,7 - 394: 0,6 - 395: -1,5 - 396: -1,4 - 397: -1,4 - 398: -3,4 - 399: -4,4 - 400: -4,4 - 401: -4,4 - 402: -4,6 - 403: -4,6 - 404: -4,6 - 405: -4,5 - 406: -4,5 - 407: -4,5 - 408: 2,7 - 409: 2,7 - 410: 1,9 - 411: 1,9 - 412: 2,9 - 413: 2,9 - 414: 2,9 - 415: 2,9 - 416: 1,9 - 417: -3,0 - 418: -3,0 - 419: -3,1 - 420: -3,1 - 421: -2,2 - 422: -2,2 - 423: -3,1 - 424: -3,1 - 425: -3,1 - 426: -2,2 - 427: -2,0 - 428: -1,0 - 429: -1,-1 - 430: 3,-8 - 431: 3,-8 - 432: 3,-7 - 433: 3,-7 - 434: 5,-7 - 435: 2,-7 - 436: 2,-7 - 437: -4,-8 - 438: -4,-9 - 439: -5,-9 - 440: -5,-9 - 441: -5,-8 - 442: -4,-7 - 443: -3,-8 - 444: -3,-8 - 445: -4,-7 - 446: -5,-7 - 447: -5,-7 - 448: -4,-10 - 449: -4,-10 - 463: 1,-5 - 464: 1,-5 - 465: 0,-5 - 466: 0,-5 - 467: 4,-5 - 468: 2,-5 - 469: 5,-4 - 470: 7,-5 - 471: 6,-4 - 472: 6,-4 - 473: 7,-4 + 368: -4,5 + 369: -4,5 + 370: 2,7 + 371: 2,7 + 372: 1,9 + 373: 1,9 + 374: 2,9 + 375: 2,9 + 376: 2,9 + 377: 2,9 + 378: 1,9 + 379: -3,0 + 380: -3,0 + 381: -3,1 + 382: -3,1 + 383: -2,2 + 384: -2,2 + 385: -3,1 + 386: -3,1 + 387: -3,1 + 388: -2,2 + 389: -2,0 + 390: -1,0 + 391: -1,-1 + 392: 3,-8 + 393: 3,-8 + 394: 3,-7 + 395: 3,-7 + 396: 5,-7 + 397: 2,-7 + 398: 2,-7 + 399: -4,-8 + 400: -4,-9 + 401: -5,-9 + 402: -5,-9 + 403: -5,-8 + 404: -4,-7 + 405: -3,-8 + 406: -3,-8 + 407: -4,-7 + 408: -5,-7 + 409: -5,-7 + 410: -4,-10 + 411: -4,-10 + 422: 1,-5 + 423: 1,-5 + 424: 0,-5 + 425: 0,-5 + 426: 4,-5 + 427: 2,-5 + 428: 5,-4 - node: cleanable: True color: '#FFFFFFFF' id: DirtHeavy decals: - 97: -2,-9 - 98: -1,-1 - 99: -1,0 - 100: -3,1 - 101: -2,-1 - 102: -2,-2 - 103: 0,-1 - 104: 0,0 - 105: -2,1 - 106: -3,2 - 107: 1,5 - 108: 2,5 - 109: 2,6 - 110: 1,7 - 111: 1,6 - 112: 2,7 - 113: -1,4 - 114: -2,4 - 115: -3,5 - 116: -2,6 - 117: -2,6 - 118: -3,7 - 119: -3,7 - 120: -1,5 - 121: -2,4 - 122: -3,4 - 123: -1,5 - 124: -1,7 - 125: -1,7 - 126: 10,-5 - 127: 10,-4 - 128: 9,-4 - 129: 9,-5 - 130: 11,-3 - 131: 10,-4 - 132: 11,-5 - 153: -12,-5 - 154: -11,-3 - 155: -12,-3 - 156: -12,-3 - 157: -12,-4 - 158: -11,-4 - 159: -7,-5 - 160: -3,-5 - 161: -4,-4 - 162: -6,-4 - 163: -5,-5 - 164: -1,-5 - 165: -1,-4 - 166: 1,-4 - 167: 2,-5 - 168: 5,-5 - 169: 4,-4 - 170: 3,-4 - 171: -1,-5 - 172: -2,-4 - 173: 2,-2 - 174: 2,-1 - 175: 3,-1 - 176: 3,-2 - 177: 4,-2 - 178: 3,-2 - 179: 2,-1 - 180: 2,-2 - 303: -1,-9 - 304: -1,-9 - 305: -1,-8 - 306: -1,-7 - 307: 0,-7 - 308: 0,-7 - 309: 0,-9 - 310: 0,-10 - 311: -2,-11 - 312: -2,-11 - 313: 0,-12 - 314: -1,-11 - 315: -1,-10 - 316: 0,-11 + 73: -2,-9 + 74: -1,-1 + 75: -1,0 + 76: -3,1 + 77: -2,-1 + 78: -2,-2 + 79: 0,-1 + 80: 0,0 + 81: -2,1 + 82: -3,2 + 83: 1,5 + 84: 2,5 + 85: 2,6 + 86: 1,7 + 87: 1,6 + 88: 2,7 + 89: -1,4 + 90: -2,4 + 91: -3,5 + 92: -2,6 + 93: -2,6 + 94: -3,7 + 95: -3,7 + 96: -1,5 + 97: -2,4 + 98: -3,4 + 99: -1,5 + 100: -1,7 + 101: -1,7 + 102: 10,-5 + 103: 10,-4 + 104: 9,-4 + 105: 9,-5 + 106: 11,-3 + 107: 10,-4 + 108: 11,-5 + 129: -12,-5 + 130: -11,-3 + 131: -12,-3 + 132: -12,-3 + 133: -12,-4 + 134: -11,-4 + 135: -3,-5 + 136: -4,-4 + 137: -6,-4 + 138: -5,-5 + 139: -1,-5 + 140: -1,-4 + 141: 1,-4 + 142: 2,-5 + 143: 5,-5 + 144: 4,-4 + 145: 3,-4 + 146: -1,-5 + 147: -2,-4 + 148: 2,-2 + 149: 2,-1 + 150: 3,-1 + 151: 3,-2 + 152: 4,-2 + 153: 3,-2 + 154: 2,-1 + 155: 2,-2 + 265: -1,-9 + 266: -1,-9 + 267: -1,-8 + 268: -1,-7 + 269: 0,-7 + 270: 0,-7 + 271: 0,-9 + 272: 0,-10 + 273: -2,-11 + 274: -2,-11 + 275: 0,-12 + 276: -1,-11 + 277: -1,-10 + 278: 0,-11 + 485: -7,-4 + 486: -8,-5 + 488: 6,-4 + 489: 7,-4 - node: cleanable: True color: '#FF0000FF' id: DirtLight decals: - 79: -6,-1 - 80: -6,-1 - 81: -6,-1 - 82: -6,-2 - 83: -5,-1 - 84: -5,-1 - 85: -5,-1 - 86: -4,0 - 87: -4,0 - 88: -4,0 - 89: -4,-1 - 90: -4,-1 - 91: -4,-2 - 92: -4,-2 - 93: -6,-2 - 94: -6,-2 - 95: -6,-2 - 96: -6,-2 + 55: -6,-1 + 56: -6,-1 + 57: -6,-1 + 58: -6,-2 + 59: -5,-1 + 60: -5,-1 + 61: -5,-1 + 62: -4,0 + 63: -4,0 + 64: -4,0 + 65: -4,-1 + 66: -4,-1 + 67: -4,-2 + 68: -4,-2 + 69: -6,-2 + 70: -6,-2 + 71: -6,-2 + 72: -6,-2 - node: cleanable: True angle: 4.71238898038469 rad color: '#FF0000FF' id: DirtLight decals: - 49: 4,-7 - 50: 4,-8 - 51: 4,-7 - 52: 4,-7 - 53: 4,-7 - 54: 4,-8 - 55: 4,-8 - 56: 4,-8 - 57: 4,-8 - 58: 3,-8 - 59: 3,-8 - 60: 5,-7 - 61: 5,-7 - 62: 5,-7 - 63: 5,-7 - 64: 5,-7 - 65: 5,-7 - 66: 5,-7 - 67: 5,-7 + 25: 4,-7 + 26: 4,-8 + 27: 4,-7 + 28: 4,-7 + 29: 4,-7 + 30: 4,-8 + 31: 4,-8 + 32: 4,-8 + 33: 4,-8 + 34: 3,-8 + 35: 3,-8 + 36: 5,-7 + 37: 5,-7 + 38: 5,-7 + 39: 5,-7 + 40: 5,-7 + 41: 5,-7 + 42: 5,-7 + 43: 5,-7 - node: cleanable: True angle: 4.71238898038469 rad color: '#FF9F4DFF' id: DirtLight decals: - 43: -2,-10 - 44: -4,-8 - 45: -3,-9 + 19: -2,-10 + 20: -4,-8 + 21: -3,-9 - node: cleanable: True color: '#FFFFFF98' id: DirtLight decals: - 277: 2.956286,4.7591314 + 239: 2.956286,4.7591314 - node: cleanable: True color: '#FFFFFFCA' id: DirtLight decals: - 358: -4,7 - 359: -4,7 - 360: -4,7 - 361: -3,7 - 362: -3,7 - 363: -4,7 + 320: -4,7 + 321: -4,7 + 322: -4,7 + 323: -3,7 + 324: -3,7 + 325: -4,7 - node: cleanable: True color: '#FFFFFFFF' id: DirtLight decals: - 136: 9,-3 - 137: 10,-4 - 138: 10,-5 - 139: -11,-5 - 140: -11,-3 - 141: -10,-4 - 142: -11,-5 - 143: -12,-4 - 144: -12,-3 - 145: -11,-3 - 146: -10,-4 - 147: -10,-5 - 181: 3,-1 - 182: 4,-1 - 183: 4,-1 - 184: 2,0 - 185: 3,0 - 186: 2,0 - 278: 3,5 - 279: 3,5 - 280: 3,6 - 281: 3,6 - 282: 3,7 - 283: 3,7 - 284: 3,6 - 285: 3,6 - 286: 3,5 - 287: -1,-12 - 288: -1,-11 - 289: -1,-11 - 290: -1,-11 - 291: 0,-11 - 292: -1,-11 - 293: -1,-11 - 294: -1,-10 - 295: -1,-9 - 296: 0,-9 - 297: 0,-8 - 298: 0,-8 - 299: 0,-7 - 300: -1,-7 - 301: -1,-7 - 302: -1,-8 - 480: -11,-6 - 481: -11,-6 - 482: -10,-6 - 483: -11,-6 - 484: 10,-6 - 485: 10,-6 - 486: 10,-6 - 487: 9,-6 - 488: 10,-6 + 112: 9,-3 + 113: 10,-4 + 114: 10,-5 + 115: -11,-5 + 116: -11,-3 + 117: -10,-4 + 118: -11,-5 + 119: -12,-4 + 120: -12,-3 + 121: -11,-3 + 122: -10,-4 + 123: -10,-5 + 156: 3,-1 + 157: 4,-1 + 158: 4,-1 + 159: 2,0 + 160: 3,0 + 161: 2,0 + 240: 3,5 + 241: 3,5 + 242: 3,6 + 243: 3,6 + 244: 3,7 + 245: 3,7 + 246: 3,6 + 247: 3,6 + 248: 3,5 + 249: -1,-12 + 250: -1,-11 + 251: -1,-11 + 252: -1,-11 + 253: 0,-11 + 254: -1,-11 + 255: -1,-11 + 256: -1,-10 + 257: -1,-9 + 258: 0,-9 + 259: 0,-8 + 260: 0,-8 + 261: 0,-7 + 262: -1,-7 + 263: -1,-7 + 264: -1,-8 + 435: -11,-6 + 436: -11,-6 + 437: -10,-6 + 438: -11,-6 + 439: 10,-6 + 440: 10,-6 + 441: 10,-6 + 442: 9,-6 + 443: 10,-6 - node: cleanable: True angle: 4.71238898038469 rad color: '#FF9F4DFF' id: DirtMedium decals: - 46: -4,-9 + 22: -4,-9 - node: cleanable: True color: '#FFFFFFCA' id: DirtMedium decals: - 450: -1,-2 - 451: -1,-2 - 452: 0,-2 - 453: 0,-1 - 454: 3,7 - 455: 2,7 - 456: 2,7 - 457: 7,-5 - 458: 6,-4 - 459: 6,-5 - 460: 10,-3 - 461: 9,-3 - 462: 9,-4 + 412: -1,-2 + 413: -1,-2 + 414: 0,-2 + 415: 0,-1 + 416: 3,7 + 417: 2,7 + 418: 2,7 + 419: 10,-3 + 420: 9,-3 + 421: 9,-4 - node: cleanable: True color: '#FFFFFFFF' id: DirtMedium decals: - 148: -12,-5 - 149: -11,-5 - 150: -10,-5 - 151: -10,-4 - 152: -10,-3 - 187: 3,-2 - 188: 4,-1 - 189: 4,-1 - 190: 4,-5 - 191: 3,-5 - 192: 2,-5 - 193: 5,-4 - 194: 5,-4 - 195: -1,-4 - 196: 0,-4 - 197: 0,-4 - 198: -1,-3 - 199: -1,-3 - 200: -1,-3 - 201: -1,-6 - 202: -1,-6 - 203: -1,-6 - 204: -1,-6 - 205: 0,-6 - 206: 0,-6 - 207: 0,-6 - 208: 0,-6 - 522: -12,-6 - 523: -12,-6 - 524: 11,-6 - 525: 11,-6 - 526: 3,-9 - 527: 3,-9 - 528: 3,-9 - 529: 4,-9 + 124: -12,-5 + 125: -11,-5 + 126: -10,-5 + 127: -10,-4 + 128: -10,-3 + 162: 3,-2 + 163: 4,-1 + 164: 4,-1 + 165: 4,-5 + 166: 3,-5 + 167: 2,-5 + 168: 5,-4 + 169: 5,-4 + 170: -1,-4 + 171: 0,-4 + 172: 0,-4 + 173: -1,-3 + 174: -1,-3 + 175: -1,-3 + 176: -1,-6 + 177: -1,-6 + 178: -1,-6 + 179: -1,-6 + 180: 0,-6 + 181: 0,-6 + 182: 0,-6 + 183: 0,-6 + 477: -12,-6 + 478: -12,-6 + 479: 11,-6 + 480: 11,-6 + 481: 3,-9 + 482: 3,-9 + 483: 3,-9 + 484: 4,-9 - node: cleanable: True angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: LoadingArea decals: - 275: -2,-9 - 276: -2,-8 + 237: -2,-9 + 238: -2,-8 - node: cleanable: True color: '#FFFFFFDB' id: Rust decals: - 256: -3,-8 - 257: -4,-7 - 258: -3,-7 - 259: -2,-7 - 260: -2,-8 - 261: -2,-7 + 218: -3,-8 + 219: -4,-7 + 220: -3,-7 + 221: -2,-7 + 222: -2,-8 + 223: -2,-7 - node: color: '#FFFFFFCA' id: WarnLineE decals: - 323: 0,-12 - 324: 0,-11 + 285: 0,-12 + 286: 0,-11 - node: color: '#FFFFFFCA' id: WarnLineS decals: - 317: -1,-7 - 318: -1,-8 - 319: -1,-9 - 320: -1,-10 - 321: -1,-11 - 322: -1,-12 + 279: -1,-7 + 280: -1,-8 + 281: -1,-9 + 282: -1,-10 + 283: -1,-11 + 284: -1,-12 - node: cleanable: True color: '#92000050' id: largebrush decals: - 262: 4.6452923,-7.4165974 - 263: 5.0359173,-6.9478474 - 264: 4.7702923,-7.0415974 - 265: 4.6452923,-7.7134724 - 266: 4.6609173,-7.0884724 - 267: 5.3784537,-7.2633767 - 268: 5.4253287,-6.9040017 - 269: 5.1440787,-6.9665017 - 270: -3.3899674,-1.5190489 - 271: -3.6087174,-1.3315489 - 272: -3.8587174,-1.0502989 - 273: -3.5149674,-0.8159237 - 274: -3.1868424,-0.9096737 + 224: 4.6452923,-7.4165974 + 225: 5.0359173,-6.9478474 + 226: 4.7702923,-7.0415974 + 227: 4.6452923,-7.7134724 + 228: 4.6609173,-7.0884724 + 229: 5.3784537,-7.2633767 + 230: 5.4253287,-6.9040017 + 231: 5.1440787,-6.9665017 + 232: -3.3899674,-1.5190489 + 233: -3.6087174,-1.3315489 + 234: -3.8587174,-1.0502989 + 235: -3.5149674,-0.8159237 + 236: -3.1868424,-0.9096737 type: DecalGrid - version: 2 data: tiles: 0,0: - 0: 65535 + 0: 65407 + 1: 128 -1,0: 0: 65535 0,1: 0: 63359 - 1: 2176 + 2: 128 + 3: 2048 0,2: 0: 32767 0,3: @@ -827,37 +742,40 @@ entities: -3,-1: 0: 65535 -2,-2: - 0: 65535 + 0: 65279 + 1: 256 -2,-1: 0: 64511 - 2: 1024 + 4: 1024 -2,-3: 0: 61120 - 3: 8 + 5: 8 -1,-4: 0: 65216 -1,-3: 0: 65535 -1,-2: 0: 65519 - 4: 16 + 1: 16 -1,-1: 0: 49151 - 4: 16384 + 1: 16384 0,-4: 0: 63280 0,-3: 0: 65535 0,-2: - 0: 65531 - 4: 4 + 0: 65467 + 1: 68 0,-1: - 0: 65535 + 0: 63487 + 1: 2048 1,-3: 0: 30512 - 3: 1 + 5: 1 1,-2: - 0: 65535 + 0: 63487 + 1: 2048 1,-1: 0: 65535 2,-3: @@ -873,9 +791,9 @@ entities: 3,-1: 0: 4369 -2,-4: - 3: 32768 + 5: 32768 1,-4: - 3: 4096 + 5: 4096 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -892,6 +810,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14996 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -910,8 +843,8 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 21.6852 - - 81.57766 + - 23.710548 + - 89.19683 - 0 - 0 - 0 @@ -925,8 +858,8 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 - - 0 + - 21.6852 + - 81.57766 - 0 - 0 - 0 @@ -938,10 +871,10 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.14996 + temperature: 293.15 moles: - - 20.078888 - - 75.53487 + - 0 + - 0 - 0 - 0 - 0 @@ -958,13 +891,16 @@ entities: - type: RadiationGridResistance - id: Sprinter type: BecomesStation -- proto: AirlockCaptainGlassLocked +- proto: AirCanister entities: - - uid: 2 + - uid: 446 components: - - pos: -3.5,-2.5 + - anchored: True + pos: -2.5,7.5 parent: 1 type: Transform + - bodyType: Static + type: Physics - proto: AirlockCargoGlass entities: - uid: 3 @@ -1075,18 +1011,28 @@ entities: pos: -12.5,-5.5 parent: 1 type: Transform -- proto: AirlockMaintCaptainLocked +- proto: AirlockMaintGlass entities: - - uid: 21 + - uid: 22 components: - - pos: 1.5,5.5 + - pos: 3.5,-5.5 parent: 1 type: Transform -- proto: AirlockMaintGlass +- proto: AirlockMercenaryGlassLocked entities: - - uid: 22 + - uid: 2 components: - - pos: 3.5,-5.5 + - pos: -3.5,-2.5 + parent: 1 + type: Transform + - links: + - 412 + type: DeviceLinkSink +- proto: AirlockMercenaryLocked + entities: + - uid: 21 + components: + - pos: 1.5,5.5 parent: 1 type: Transform - proto: AmeController @@ -1116,7 +1062,7 @@ entities: type: Physics - uid: 25 components: - - pos: 0.54973245,7.5791607 + - pos: 0.71468806,7.6303167 parent: 1 type: Transform - proto: AmeShielding @@ -1171,32 +1117,37 @@ entities: type: Transform - proto: APCBasic entities: - - uid: 35 + - uid: 178 components: - - rot: 3.141592653589793 rad - pos: 2.5,8.5 + - pos: 7.5,-1.5 parent: 1 type: Transform - - uid: 36 + - uid: 200 components: - - pos: 1.5,-9.5 + - pos: -7.5,-1.5 parent: 1 type: Transform -- proto: APCHighCapacity - entities: - - uid: 37 + - uid: 337 components: - - pos: -7.5,-1.5 + - rot: 1.5707963267948966 rad + pos: -2.5,-0.5 parent: 1 type: Transform - - uid: 38 + - uid: 338 components: - - pos: 7.5,-1.5 + - pos: -2.5,-5.5 parent: 1 type: Transform - - uid: 39 + - uid: 461 components: - - pos: 0.5,-2.5 + - rot: 3.141592653589793 rad + pos: 0.5,8.5 + parent: 1 + type: Transform + - uid: 462 + components: + - rot: -1.5707963267948966 rad + pos: 1.5,6.5 parent: 1 type: Transform - proto: AtmosDeviceFanTiny @@ -1375,83 +1326,33 @@ entities: - pos: 2.5,2.5 parent: 1 type: Transform -- proto: BoxShellTranquilizer - entities: - - uid: 578 - components: - - flags: InContainer - type: MetaData - - parent: 576 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - - uid: 579 - components: - - flags: InContainer - type: MetaData - - parent: 576 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: BoxZiptie +- proto: BoxMedicalTrackingImplants entities: - - uid: 68 + - uid: 399 components: - - pos: 2.3657243,7.608989 + - pos: 3.3875737,4.814908 parent: 1 type: Transform - - uid: 69 + - uid: 414 components: - - pos: 2.7719743,7.452739 + - pos: 3.6584072,4.616992 parent: 1 type: Transform - proto: CableApcExtension entities: - - uid: 70 + - uid: 36 components: - - pos: 1.5,-7.5 + - pos: 4.5,-3.5 parent: 1 type: Transform - uid: 71 components: - - pos: 2.5,-7.5 + - pos: 3.5,-4.5 parent: 1 type: Transform - uid: 72 components: - - pos: -0.5,-3.5 - parent: 1 - type: Transform - - uid: 73 - components: - - pos: 1.5,-3.5 - parent: 1 - type: Transform - - uid: 74 - components: - - pos: -7.5,-2.5 - parent: 1 - type: Transform - - uid: 75 - components: - - pos: -7.5,-1.5 - parent: 1 - type: Transform - - uid: 76 - components: - - pos: -7.5,-3.5 - parent: 1 - type: Transform - - uid: 77 - components: - - pos: -8.5,-3.5 - parent: 1 - type: Transform - - uid: 78 - components: - - pos: -9.5,-3.5 + - pos: -2.5,-3.5 parent: 1 type: Transform - uid: 79 @@ -1554,31 +1455,6 @@ entities: - pos: -9.5,1.5 parent: 1 type: Transform - - uid: 99 - components: - - pos: 7.5,-1.5 - parent: 1 - type: Transform - - uid: 100 - components: - - pos: 7.5,-2.5 - parent: 1 - type: Transform - - uid: 101 - components: - - pos: 7.5,-3.5 - parent: 1 - type: Transform - - uid: 102 - components: - - pos: 8.5,-3.5 - parent: 1 - type: Transform - - uid: 103 - components: - - pos: 9.5,-3.5 - parent: 1 - type: Transform - uid: 104 components: - pos: 10.5,-3.5 @@ -1679,1519 +1555,1198 @@ entities: - pos: 11.5,-9.5 parent: 1 type: Transform - - uid: 124 + - uid: 129 components: - - pos: 0.5,-2.5 + - pos: 2.5,-0.5 parent: 1 type: Transform - - uid: 125 + - uid: 130 components: - - pos: 0.5,-3.5 + - pos: 0.5,-0.5 parent: 1 type: Transform - - uid: 126 + - uid: 131 components: - - pos: 4.5,-3.5 + - pos: -1.5,-0.5 parent: 1 type: Transform - - uid: 127 + - uid: 132 components: - - pos: -0.5,-4.5 + - pos: -0.5,-0.5 parent: 1 type: Transform - - uid: 128 + - uid: 133 components: - - pos: -1.5,-4.5 + - pos: 5.5,-3.5 parent: 1 type: Transform - - uid: 129 + - uid: 134 components: - - pos: -2.5,-4.5 + - pos: -0.5,-3.5 parent: 1 type: Transform - - uid: 130 + - uid: 145 components: - - pos: -2.5,-3.5 + - pos: 3.5,-3.5 parent: 1 type: Transform - - uid: 131 + - uid: 146 components: - - pos: -4.5,-4.5 + - pos: 8.5,-3.5 parent: 1 type: Transform - - uid: 132 + - uid: 160 components: - - pos: -5.5,-4.5 + - pos: -2.5,-7.5 parent: 1 type: Transform - - uid: 133 + - uid: 161 components: - - pos: -3.5,-10.5 + - pos: -0.5,-10.5 parent: 1 type: Transform - - uid: 134 + - uid: 162 components: - - pos: -3.5,-9.5 + - pos: -1.5,-7.5 parent: 1 type: Transform - - uid: 135 + - uid: 163 components: - - pos: 2.5,-3.5 + - pos: 7.5,-1.5 parent: 1 type: Transform - - uid: 136 + - uid: 164 components: - - pos: 4.5,-4.5 + - pos: -0.5,-6.5 parent: 1 type: Transform - - uid: 137 + - uid: 165 components: - - pos: 5.5,-4.5 + - pos: -0.5,-7.5 parent: 1 type: Transform - - uid: 138 + - uid: 166 components: - - pos: 6.5,-4.5 + - pos: -2.5,-6.5 parent: 1 type: Transform - - uid: 139 + - uid: 167 components: - pos: -4.5,-3.5 parent: 1 type: Transform - - uid: 140 + - uid: 177 components: - - pos: -3.5,-5.5 + - pos: 7.5,-3.5 parent: 1 type: Transform - - uid: 141 + - uid: 179 components: - - pos: -3.5,-6.5 + - pos: -3.5,-1.5 parent: 1 type: Transform - - uid: 142 + - uid: 181 components: - - pos: -3.5,-7.5 + - pos: 0.5,8.5 parent: 1 type: Transform - - uid: 143 + - uid: 184 components: - - pos: -3.5,-8.5 + - pos: 0.5,9.5 parent: 1 type: Transform - - uid: 144 - components: - - pos: -3.5,-3.5 - parent: 1 - type: Transform - - uid: 145 - components: - - pos: -3.5,-2.5 - parent: 1 - type: Transform - - uid: 146 - components: - - pos: -3.5,-1.5 - parent: 1 - type: Transform - - uid: 147 + - uid: 185 components: - - pos: -3.5,-0.5 + - pos: 0.5,10.5 parent: 1 type: Transform - - uid: 148 + - uid: 186 components: - - pos: -3.5,0.5 + - pos: -0.5,9.5 parent: 1 type: Transform - - uid: 149 + - uid: 187 components: - - pos: 3.5,-3.5 + - pos: 2.5,5.5 parent: 1 type: Transform - - uid: 150 + - uid: 188 components: - - pos: 3.5,-2.5 + - pos: 1.5,-0.5 parent: 1 type: Transform - - uid: 151 + - uid: 189 components: - - pos: 3.5,-1.5 + - pos: 3.5,-0.5 parent: 1 type: Transform - - uid: 152 + - uid: 201 components: - - pos: 3.5,-0.5 + - pos: -0.5,-5.5 parent: 1 type: Transform - - uid: 153 + - uid: 202 components: - - pos: 3.5,0.5 + - pos: 9.5,-3.5 parent: 1 type: Transform - - uid: 154 + - uid: 203 components: - - pos: 3.5,-5.5 + - pos: 0.5,-3.5 parent: 1 type: Transform - - uid: 155 + - uid: 204 components: - - pos: 3.5,-6.5 + - pos: -0.5,-8.5 parent: 1 type: Transform - - uid: 156 + - uid: 205 components: - - pos: 3.5,-7.5 + - pos: -0.5,-9.5 parent: 1 type: Transform - - uid: 157 + - uid: 206 components: - - pos: 3.5,-8.5 + - pos: -3.5,-3.5 parent: 1 type: Transform - - uid: 158 + - uid: 207 components: - - pos: 0.5,-5.5 + - pos: -3.5,-2.5 parent: 1 type: Transform - - uid: 159 + - uid: 208 components: - - pos: 0.5,-6.5 + - pos: -1.5,-3.5 parent: 1 type: Transform - - uid: 160 + - uid: 209 components: - - pos: 0.5,-7.5 + - pos: -0.5,-4.5 parent: 1 type: Transform - - uid: 161 + - uid: 210 components: - - pos: 0.5,-8.5 + - pos: -7.5,-3.5 parent: 1 type: Transform - - uid: 162 + - uid: 211 components: - - pos: 0.5,-9.5 + - pos: -8.5,-3.5 parent: 1 type: Transform - - uid: 163 + - uid: 212 components: - - pos: 0.5,-10.5 + - pos: -9.5,-3.5 parent: 1 type: Transform - - uid: 164 + - uid: 219 components: - - pos: 0.5,-11.5 + - pos: -3.5,-10.5 parent: 1 type: Transform - - uid: 165 + - uid: 220 components: - - pos: -0.5,-10.5 + - pos: -2.5,-10.5 parent: 1 type: Transform - - uid: 166 + - uid: 221 components: - pos: -1.5,-10.5 parent: 1 type: Transform - - uid: 167 + - uid: 222 components: - - pos: -2.5,-10.5 + - pos: 0.5,-10.5 parent: 1 type: Transform - - uid: 168 + - uid: 223 components: - pos: 1.5,-10.5 parent: 1 type: Transform - - uid: 169 + - uid: 224 components: - - pos: 2.5,-10.5 + - pos: -3.5,-7.5 parent: 1 type: Transform - - uid: 170 + - uid: 225 components: - - pos: 1.5,-9.5 + - pos: -4.5,-7.5 parent: 1 type: Transform - - uid: 171 + - uid: 227 components: - - pos: 0.5,-1.5 + - pos: 1.5,-3.5 parent: 1 type: Transform - - uid: 172 + - uid: 228 components: - - pos: 0.5,-0.5 + - pos: 2.5,-3.5 parent: 1 type: Transform - - uid: 173 + - uid: 229 components: - - pos: 0.5,0.5 + - pos: 3.5,-7.5 parent: 1 type: Transform - - uid: 174 + - uid: 230 components: - - pos: 0.5,1.5 + - pos: 3.5,-6.5 parent: 1 type: Transform - - uid: 175 + - uid: 231 components: - - pos: 0.5,2.5 + - pos: 4.5,-0.5 parent: 1 type: Transform - - uid: 176 + - uid: 232 components: - - pos: -0.5,2.5 + - pos: -0.5,1.5 parent: 1 type: Transform - - uid: 177 + - uid: 233 components: - - pos: -1.5,2.5 + - pos: -0.5,0.5 parent: 1 type: Transform - - uid: 178 + - uid: 234 components: - - pos: -1.5,3.5 + - pos: 3.5,1.5 parent: 1 type: Transform - - uid: 179 + - uid: 235 components: - - pos: -1.5,4.5 + - pos: 3.5,0.5 parent: 1 type: Transform - - uid: 180 + - uid: 240 components: - - pos: -1.5,5.5 + - pos: -2.5,-5.5 parent: 1 type: Transform - - uid: 181 + - uid: 322 components: - - pos: -1.5,6.5 + - pos: 0.5,5.5 parent: 1 type: Transform - - uid: 182 + - uid: 328 components: - - pos: -0.5,6.5 + - pos: 7.5,-2.5 parent: 1 type: Transform - - uid: 183 + - uid: 331 components: - pos: 0.5,6.5 parent: 1 type: Transform - - uid: 184 + - uid: 352 components: - pos: 1.5,6.5 parent: 1 type: Transform - - uid: 185 - components: - - pos: 2.5,6.5 - parent: 1 - type: Transform - - uid: 186 + - uid: 353 components: - - pos: -0.5,8.5 + - pos: 1.5,10.5 parent: 1 type: Transform - - uid: 187 + - uid: 435 components: - - pos: -0.5,9.5 + - pos: 2.5,6.5 parent: 1 type: Transform - - uid: 188 + - uid: 441 components: - - pos: 0.5,9.5 + - pos: -2.5,-0.5 parent: 1 type: Transform - - uid: 189 + - uid: 450 components: - - pos: 1.5,9.5 + - pos: -0.5,5.5 parent: 1 type: Transform - - uid: 190 + - uid: 452 components: - - pos: -0.5,10.5 + - pos: -1.5,9.5 parent: 1 type: Transform - - uid: 191 + - uid: 469 components: - - pos: 1.5,8.5 + - pos: 3.5,-5.5 parent: 1 type: Transform - - uid: 192 + - uid: 496 components: - - pos: 2.5,8.5 + - pos: -7.5,-2.5 parent: 1 type: Transform - - uid: 193 + - uid: 497 components: - - pos: -0.5,11.5 + - pos: -7.5,-1.5 parent: 1 type: Transform - proto: CableHV entities: - - uid: 194 + - uid: 37 components: - - pos: 3.5,-10.5 + - pos: -5.5,0.5 parent: 1 type: Transform - - uid: 195 + - uid: 73 components: - - pos: -2.5,4.5 + - pos: -4.5,-0.5 parent: 1 type: Transform - - uid: 196 + - uid: 74 components: - - pos: -2.5,5.5 + - pos: -5.5,-0.5 parent: 1 type: Transform - - uid: 197 + - uid: 75 components: - - pos: -5.5,-7.5 + - pos: -3.5,-0.5 parent: 1 type: Transform - - uid: 198 + - uid: 76 components: - - pos: -3.5,5.5 + - pos: 5.5,0.5 parent: 1 type: Transform - - uid: 199 + - uid: 77 components: - - pos: -3.5,-11.5 + - pos: 4.5,-0.5 parent: 1 type: Transform - - uid: 200 + - uid: 101 components: - - pos: -3.5,-9.5 + - pos: 2.5,4.5 parent: 1 type: Transform - - uid: 201 + - uid: 102 components: - - pos: -3.5,-10.5 + - pos: 2.5,3.5 parent: 1 type: Transform - - uid: 202 + - uid: 103 components: - - pos: -3.5,4.5 + - pos: -0.5,-5.5 parent: 1 type: Transform - - uid: 203 + - uid: 124 components: - - pos: 3.5,-11.5 + - pos: -0.5,-4.5 parent: 1 type: Transform - - uid: 204 + - uid: 125 components: - - pos: 3.5,-9.5 + - pos: 8.5,-3.5 parent: 1 type: Transform - - uid: 205 + - uid: 126 components: - - pos: -3.5,6.5 + - pos: 9.5,-3.5 parent: 1 type: Transform - - uid: 206 + - uid: 127 components: - - pos: -2.5,6.5 + - pos: 10.5,-3.5 parent: 1 type: Transform - - uid: 207 + - uid: 128 components: - - pos: -1.5,6.5 + - pos: 11.5,-3.5 parent: 1 type: Transform - - uid: 208 + - uid: 135 components: - - pos: -1.5,5.5 + - pos: 5.5,-9.5 parent: 1 type: Transform - - uid: 209 + - uid: 136 components: - - pos: -1.5,4.5 + - pos: 5.5,-8.5 parent: 1 type: Transform - - uid: 210 + - uid: 137 components: - - pos: -1.5,7.5 + - pos: 4.5,-8.5 parent: 1 type: Transform - - uid: 211 + - uid: 138 components: - - pos: -1.5,8.5 + - pos: 4.5,-7.5 parent: 1 type: Transform - - uid: 212 + - uid: 139 components: - - pos: -1.5,3.5 + - pos: 3.5,-7.5 parent: 1 type: Transform - - uid: 213 + - uid: 140 components: - - pos: -1.5,2.5 + - pos: 0.5,-7.5 parent: 1 type: Transform - - uid: 214 + - uid: 141 components: - - pos: -1.5,1.5 + - pos: -0.5,-7.5 parent: 1 type: Transform - - uid: 215 + - uid: 142 components: - - pos: -1.5,0.5 + - pos: -0.5,-6.5 parent: 1 type: Transform - - uid: 216 + - uid: 143 components: - - pos: -1.5,-0.5 + - pos: 2.5,-7.5 parent: 1 type: Transform - - uid: 217 + - uid: 144 components: - - pos: -1.5,-1.5 + - pos: 1.5,-7.5 parent: 1 type: Transform - - uid: 218 + - uid: 182 components: - - pos: -1.5,-2.5 + - pos: 7.5,-3.5 parent: 1 type: Transform - - uid: 219 + - uid: 183 components: - - pos: -1.5,-3.5 + - pos: 6.5,-3.5 parent: 1 type: Transform - - uid: 220 + - uid: 213 components: - - pos: -1.5,-4.5 + - pos: 0.5,9.5 parent: 1 type: Transform - - uid: 221 + - uid: 214 components: - - pos: -1.5,-5.5 + - pos: -0.5,5.5 parent: 1 type: Transform - - uid: 222 + - uid: 215 components: - - pos: -1.5,-6.5 + - pos: -0.5,6.5 parent: 1 type: Transform - - uid: 223 + - uid: 216 components: - - pos: -1.5,-7.5 + - pos: -0.5,7.5 parent: 1 type: Transform - - uid: 224 + - uid: 217 components: - - pos: 1.5,-7.5 + - pos: -0.5,8.5 parent: 1 type: Transform - - uid: 225 + - uid: 218 components: - - pos: -2.5,-2.5 + - pos: -0.5,9.5 parent: 1 type: Transform - uid: 226 components: - - pos: -3.5,-2.5 + - pos: 3.5,-0.5 parent: 1 type: Transform - - uid: 227 + - uid: 236 components: - - pos: -4.5,-2.5 + - pos: 2.5,10.5 parent: 1 type: Transform - - uid: 228 + - uid: 239 components: - - pos: -5.5,-2.5 + - pos: -0.5,4.5 parent: 1 type: Transform - - uid: 229 + - uid: 241 components: - - pos: -0.5,-2.5 + - pos: 2.5,1.5 parent: 1 type: Transform - - uid: 230 + - uid: 278 components: - - pos: 0.5,-2.5 + - pos: 3.5,-3.5 parent: 1 type: Transform - - uid: 231 + - uid: 281 components: - - pos: 1.5,-2.5 + - pos: -12.5,-5.5 parent: 1 type: Transform - - uid: 232 + - uid: 282 components: - - pos: 2.5,-2.5 + - pos: -12.5,-4.5 parent: 1 type: Transform - - uid: 233 + - uid: 283 components: - - pos: 3.5,-2.5 + - pos: -12.5,-3.5 parent: 1 type: Transform - - uid: 234 + - uid: 284 components: - - pos: 4.5,-2.5 + - pos: -12.5,-2.5 parent: 1 type: Transform - - uid: 235 + - uid: 294 components: - - pos: -2.5,-5.5 + - pos: 12.5,-5.5 parent: 1 type: Transform - - uid: 236 + - uid: 295 components: - - pos: -3.5,-5.5 + - pos: 12.5,-4.5 parent: 1 type: Transform - - uid: 237 + - uid: 296 components: - - pos: -4.5,-5.5 + - pos: 12.5,-3.5 parent: 1 type: Transform - - uid: 238 + - uid: 297 components: - - pos: -0.5,-5.5 + - pos: 12.5,-2.5 parent: 1 type: Transform - - uid: 239 + - uid: 298 components: - - pos: 0.5,-5.5 + - pos: 1.5,9.5 parent: 1 type: Transform - - uid: 240 + - uid: 300 components: - - pos: 1.5,-5.5 + - pos: 1.5,11.5 parent: 1 type: Transform - - uid: 241 + - uid: 303 components: - - pos: 2.5,-5.5 + - pos: -1.5,11.5 parent: 1 type: Transform - - uid: 242 + - uid: 304 components: - - pos: 3.5,-5.5 + - pos: -2.5,11.5 parent: 1 type: Transform - - uid: 243 + - uid: 305 components: - - pos: 4.5,-5.5 + - pos: 2.5,11.5 parent: 1 type: Transform - - uid: 244 + - uid: 306 components: - - pos: -2.5,0.5 + - pos: 1.5,12.5 parent: 1 type: Transform - - uid: 245 + - uid: 307 components: - - pos: -3.5,0.5 + - pos: 0.5,12.5 parent: 1 type: Transform - - uid: 246 + - uid: 308 components: - - pos: -4.5,0.5 + - pos: -0.5,12.5 parent: 1 type: Transform - - uid: 247 + - uid: 309 components: - - pos: -5.5,0.5 + - pos: -1.5,12.5 parent: 1 type: Transform - - uid: 248 + - uid: 311 components: - - pos: -0.5,0.5 + - pos: 2.5,9.5 parent: 1 type: Transform - - uid: 249 + - uid: 312 components: - - pos: 0.5,0.5 + - pos: 2.5,8.5 parent: 1 type: Transform - - uid: 250 + - uid: 313 components: - - pos: 1.5,0.5 + - pos: 5.5,-3.5 parent: 1 type: Transform - - uid: 251 + - uid: 319 components: - - pos: 2.5,0.5 + - pos: -11.5,-3.5 parent: 1 type: Transform - - uid: 252 + - uid: 320 components: - - pos: 3.5,0.5 + - pos: -10.5,-3.5 parent: 1 type: Transform - - uid: 253 + - uid: 321 components: - - pos: 4.5,0.5 + - pos: -0.5,-0.5 parent: 1 type: Transform - - uid: 254 + - uid: 323 components: - - pos: 5.5,0.5 + - pos: -4.5,-3.5 parent: 1 type: Transform - - uid: 255 + - uid: 324 components: - - pos: -1.5,-8.5 + - pos: -5.5,-3.5 parent: 1 type: Transform - - uid: 256 + - uid: 329 components: - - pos: -2.5,-8.5 + - pos: -2.5,-3.5 parent: 1 type: Transform - - uid: 257 + - uid: 350 components: - - pos: -3.5,-8.5 + - pos: 2.5,-3.5 parent: 1 type: Transform - - uid: 258 + - uid: 351 components: - - pos: -4.5,-8.5 + - pos: 1.5,-3.5 parent: 1 type: Transform - - uid: 259 + - uid: 357 components: - - pos: -5.5,-8.5 + - pos: -2.5,-0.5 parent: 1 type: Transform - - uid: 260 + - uid: 358 components: - - pos: -0.5,-8.5 + - pos: -1.5,-0.5 parent: 1 type: Transform - - uid: 261 + - uid: 359 components: - - pos: 0.5,-8.5 + - pos: 2.5,0.5 parent: 1 type: Transform - - uid: 262 + - uid: 360 components: - - pos: 1.5,-8.5 + - pos: 2.5,7.5 parent: 1 type: Transform - - uid: 263 + - uid: 361 components: - - pos: 2.5,-8.5 + - pos: 2.5,6.5 parent: 1 type: Transform - - uid: 264 + - uid: 362 components: - - pos: 3.5,-8.5 + - pos: 2.5,5.5 parent: 1 type: Transform - - uid: 265 + - uid: 363 components: - - pos: 4.5,-8.5 + - pos: -9.5,-3.5 parent: 1 type: Transform - - uid: 266 + - uid: 378 components: - - pos: 5.5,-8.5 + - pos: -0.5,-3.5 parent: 1 type: Transform - - uid: 267 + - uid: 379 components: - - pos: 0.5,8.5 + - pos: -1.5,-3.5 parent: 1 type: Transform - - uid: 268 + - uid: 380 components: - - pos: -0.5,6.5 + - pos: 0.5,-0.5 parent: 1 type: Transform - - uid: 269 + - uid: 381 components: - - pos: 0.5,6.5 + - pos: 2.5,-0.5 parent: 1 type: Transform - - uid: 270 + - uid: 382 components: - - pos: 1.5,6.5 + - pos: -3.5,-3.5 parent: 1 type: Transform - - uid: 271 + - uid: 383 components: - - pos: 1.5,7.5 + - pos: -0.5,-2.5 parent: 1 type: Transform - - uid: 272 + - uid: 384 components: - - pos: 1.5,8.5 + - pos: -0.5,-1.5 parent: 1 type: Transform - - uid: 273 + - uid: 392 components: - - pos: -7.5,-6.5 + - pos: -7.5,-3.5 parent: 1 type: Transform - - uid: 274 + - uid: 405 components: - - pos: -6.5,-6.5 + - pos: -6.5,-3.5 parent: 1 type: Transform - - uid: 275 + - uid: 416 components: - - pos: -5.5,-6.5 + - pos: -8.5,-3.5 parent: 1 type: Transform - - uid: 276 + - uid: 436 components: - - pos: -8.5,-6.5 + - pos: 0.5,-3.5 parent: 1 type: Transform - - uid: 277 + - uid: 443 components: - - pos: -9.5,-6.5 + - pos: 5.5,-0.5 parent: 1 type: Transform - - uid: 278 + - uid: 444 components: - - pos: -10.5,-6.5 + - pos: 2.5,2.5 parent: 1 type: Transform - - uid: 279 + - uid: 445 components: - - pos: -11.5,-6.5 + - pos: 1.5,-0.5 parent: 1 type: Transform - - uid: 280 + - uid: 453 components: - - pos: -12.5,-6.5 + - pos: 4.5,-3.5 parent: 1 type: Transform - - uid: 281 + - uid: 466 components: - - pos: -12.5,-5.5 + - pos: 1.5,4.5 parent: 1 type: Transform - - uid: 282 +- proto: CableMV + entities: + - uid: 35 components: - - pos: -12.5,-4.5 + - pos: -2.5,-7.5 parent: 1 type: Transform - - uid: 283 + - uid: 38 components: - - pos: -12.5,-3.5 + - pos: 1.5,4.5 parent: 1 type: Transform - - uid: 284 + - uid: 153 components: - - pos: -12.5,-2.5 + - pos: -5.5,-3.5 parent: 1 type: Transform - - uid: 285 + - uid: 154 components: - - pos: 5.5,-7.5 + - pos: -3.5,-3.5 parent: 1 type: Transform - - uid: 286 + - uid: 155 components: - - pos: 5.5,-6.5 + - pos: -0.5,-3.5 parent: 1 type: Transform - - uid: 287 + - uid: 156 components: - - pos: 6.5,-6.5 + - pos: 1.5,-3.5 parent: 1 type: Transform - - uid: 288 + - uid: 157 components: - - pos: 7.5,-6.5 + - pos: -0.5,-6.5 parent: 1 type: Transform - - uid: 289 + - uid: 158 components: - - pos: 8.5,-6.5 + - pos: -2.5,-6.5 parent: 1 type: Transform - - uid: 290 + - uid: 159 components: - - pos: 9.5,-6.5 + - pos: 2.5,-3.5 parent: 1 type: Transform - - uid: 291 + - uid: 168 components: - - pos: 10.5,-6.5 + - pos: -0.5,-0.5 parent: 1 type: Transform - - uid: 292 + - uid: 169 components: - - pos: 11.5,-6.5 + - pos: 0.5,-0.5 parent: 1 type: Transform - - uid: 293 + - uid: 170 components: - - pos: 12.5,-6.5 + - pos: -1.5,-0.5 parent: 1 type: Transform - - uid: 294 + - uid: 171 components: - - pos: 12.5,-5.5 + - pos: -2.5,-0.5 parent: 1 type: Transform - - uid: 295 + - uid: 172 components: - - pos: 12.5,-4.5 + - pos: 1.5,6.5 parent: 1 type: Transform - - uid: 296 + - uid: 190 components: - - pos: 12.5,-3.5 + - pos: 0.5,0.5 parent: 1 type: Transform - - uid: 297 + - uid: 191 components: - - pos: 12.5,-2.5 + - pos: 0.5,1.5 parent: 1 type: Transform - - uid: 298 + - uid: 192 components: - - pos: 1.5,9.5 + - pos: 0.5,2.5 parent: 1 type: Transform - - uid: 299 + - uid: 193 components: - - pos: 1.5,10.5 + - pos: 5.5,-3.5 parent: 1 type: Transform - - uid: 300 + - uid: 194 components: - - pos: 1.5,11.5 + - pos: 0.5,3.5 parent: 1 type: Transform - - uid: 301 + - uid: 195 components: - - pos: 0.5,11.5 + - pos: 0.5,4.5 parent: 1 type: Transform - - uid: 302 + - uid: 196 components: - - pos: -0.5,11.5 + - pos: 0.5,5.5 parent: 1 type: Transform - - uid: 303 + - uid: 197 components: - - pos: -1.5,11.5 + - pos: 0.5,6.5 parent: 1 type: Transform - - uid: 304 + - uid: 198 components: - - pos: -2.5,11.5 + - pos: 0.5,7.5 parent: 1 type: Transform - - uid: 305 + - uid: 199 components: - - pos: 2.5,11.5 + - pos: 0.5,8.5 parent: 1 type: Transform - - uid: 306 + - uid: 237 components: - - pos: 1.5,12.5 + - pos: 4.5,-3.5 parent: 1 type: Transform - - uid: 307 + - uid: 238 components: - - pos: 0.5,12.5 + - pos: 3.5,-3.5 parent: 1 type: Transform - - uid: 308 + - uid: 272 components: - - pos: -0.5,12.5 + - pos: -4.5,-3.5 parent: 1 type: Transform - - uid: 309 + - uid: 273 components: - - pos: -1.5,12.5 + - pos: -2.5,-3.5 parent: 1 type: Transform - - uid: 310 + - uid: 274 components: - - pos: -0.5,4.5 + - pos: -0.5,-5.5 parent: 1 type: Transform - - uid: 311 + - uid: 275 components: - - pos: 2.5,9.5 + - pos: -2.5,-5.5 parent: 1 type: Transform - - uid: 312 + - uid: 339 components: - - pos: 2.5,8.5 + - pos: 1.5,-7.5 parent: 1 type: Transform - - uid: 313 + - uid: 340 components: - - pos: 5.5,-9.5 + - pos: -1.5,-7.5 parent: 1 type: Transform -- proto: CableMV - entities: - - uid: 314 + - uid: 389 components: - - pos: 2.5,8.5 + - pos: 0.5,-7.5 parent: 1 type: Transform - - uid: 315 + - uid: 390 components: - - pos: 1.5,-7.5 + - pos: -0.5,-7.5 parent: 1 type: Transform - - uid: 316 + - uid: 442 components: - - pos: 0.5,-7.5 + - pos: -0.5,-4.5 parent: 1 type: Transform - - uid: 317 + - uid: 454 components: - - pos: -0.5,-7.5 + - pos: -1.5,-3.5 parent: 1 type: Transform - - uid: 318 + - uid: 459 components: - - pos: -1.5,-7.5 + - pos: 0.5,-3.5 parent: 1 type: Transform - - uid: 319 + - uid: 498 components: - - pos: -1.5,-6.5 + - pos: -6.5,-3.5 parent: 1 type: Transform - - uid: 320 + - uid: 499 components: - - pos: -1.5,-5.5 + - pos: -7.5,-3.5 parent: 1 type: Transform - - uid: 321 + - uid: 500 components: - - pos: -1.5,-4.5 + - pos: -7.5,-2.5 parent: 1 type: Transform - - uid: 322 + - uid: 501 components: - - pos: -1.5,8.5 + - pos: -7.5,-1.5 parent: 1 type: Transform - - uid: 323 + - uid: 502 components: - - pos: -1.5,7.5 + - pos: 7.5,-1.5 parent: 1 type: Transform - - uid: 324 + - uid: 503 components: - - pos: -1.5,6.5 + - pos: 7.5,-2.5 parent: 1 type: Transform - - uid: 325 + - uid: 504 components: - - pos: -1.5,5.5 + - pos: 7.5,-3.5 parent: 1 type: Transform - - uid: 326 + - uid: 505 components: - - pos: -1.5,4.5 + - pos: 6.5,-3.5 parent: 1 type: Transform - - uid: 327 +- proto: CableTerminal + entities: + - uid: 364 components: - - pos: -1.5,3.5 + - rot: 1.5707963267948966 rad + pos: 1.5,9.5 parent: 1 type: Transform - - uid: 328 +- proto: CargoPallet + entities: + - uid: 365 components: - - pos: -1.5,2.5 + - pos: -9.5,-2.5 parent: 1 type: Transform - - uid: 329 + - uid: 366 components: - - pos: -1.5,1.5 + - pos: 9.5,-5.5 parent: 1 type: Transform - - uid: 330 + - uid: 367 components: - - pos: -1.5,0.5 + - pos: -9.5,-5.5 parent: 1 type: Transform - - uid: 331 + - uid: 368 components: - - pos: -1.5,-0.5 + - pos: 9.5,-2.5 parent: 1 type: Transform - - uid: 332 +- proto: Catwalk + entities: + - uid: 369 components: - - pos: -1.5,-1.5 + - pos: -0.5,7.5 parent: 1 type: Transform - - uid: 333 + - uid: 370 components: - - pos: -1.5,-2.5 + - pos: 0.5,5.5 parent: 1 type: Transform - - uid: 334 + - uid: 371 components: - - pos: -1.5,-3.5 + - pos: 0.5,4.5 parent: 1 type: Transform - - uid: 335 + - uid: 372 components: - - pos: -2.5,-3.5 + - pos: -0.5,5.5 parent: 1 type: Transform - - uid: 336 + - uid: 373 components: - - pos: -3.5,-3.5 + - pos: -0.5,6.5 parent: 1 type: Transform - - uid: 337 +- proto: ChairOfficeDark + entities: + - uid: 374 components: - - pos: -4.5,-3.5 + - pos: 3.5,-7.5 parent: 1 type: Transform - - uid: 338 +- proto: ChairPilotSeat + entities: + - uid: 375 components: - - pos: -5.5,-3.5 + - rot: 3.141592653589793 rad + pos: 0.5,10.5 parent: 1 type: Transform - - uid: 339 + - uid: 376 components: - - pos: -6.5,-3.5 + - rot: 3.141592653589793 rad + pos: -1.5,10.5 parent: 1 type: Transform - - uid: 340 +- proto: CheckerBoard + entities: + - uid: 377 components: - - pos: -7.5,-3.5 + - pos: -1.9841328,2.5913696 parent: 1 type: Transform - - uid: 341 +- proto: ClothingOuterWinterPara + entities: + - uid: 395 components: - - pos: -7.5,-2.5 + - pos: 2.53125,-6.401108 parent: 1 type: Transform - - uid: 342 - components: - - pos: -7.5,-1.5 - parent: 1 - type: Transform - - uid: 343 - components: - - pos: -0.5,-3.5 - parent: 1 - type: Transform - - uid: 344 - components: - - pos: 0.5,-3.5 - parent: 1 - type: Transform - - uid: 345 - components: - - pos: 1.5,-3.5 - parent: 1 - type: Transform - - uid: 346 - components: - - pos: 2.5,-3.5 - parent: 1 - type: Transform - - uid: 347 - components: - - pos: 3.5,-3.5 - parent: 1 - type: Transform - - uid: 348 - components: - - pos: 4.5,-3.5 - parent: 1 - type: Transform - - uid: 349 - components: - - pos: 5.5,-3.5 - parent: 1 - type: Transform - - uid: 350 - components: - - pos: 6.5,-3.5 - parent: 1 - type: Transform - - uid: 351 - components: - - pos: 7.5,-3.5 - parent: 1 - type: Transform - - uid: 352 - components: - - pos: 7.5,-2.5 - parent: 1 - type: Transform - - uid: 353 - components: - - pos: 7.5,-1.5 - parent: 1 - type: Transform - - uid: 354 - components: - - pos: 0.5,-2.5 - parent: 1 - type: Transform - - uid: 355 - components: - - pos: -0.5,-8.5 - parent: 1 - type: Transform - - uid: 356 - components: - - pos: -0.5,-9.5 - parent: 1 - type: Transform - - uid: 357 - components: - - pos: 0.5,-9.5 - parent: 1 - type: Transform - - uid: 358 - components: - - pos: 1.5,-9.5 - parent: 1 - type: Transform - - uid: 359 - components: - - pos: -1.5,9.5 - parent: 1 - type: Transform - - uid: 360 - components: - - pos: -0.5,9.5 - parent: 1 - type: Transform - - uid: 361 - components: - - pos: 0.5,9.5 - parent: 1 - type: Transform - - uid: 362 - components: - - pos: 1.5,9.5 - parent: 1 - type: Transform - - uid: 363 - components: - - pos: 1.5,8.5 - parent: 1 - type: Transform -- proto: CableTerminal +- proto: ComputerSalvageExpedition entities: - - uid: 364 + - uid: 402 components: - rot: 1.5707963267948966 rad - pos: 1.5,9.5 + pos: -2.5,9.5 parent: 1 type: Transform -- proto: CargoPallet +- proto: ComputerShuttle entities: - - uid: 365 - components: - - pos: -9.5,-2.5 - parent: 1 - type: Transform - - uid: 366 - components: - - pos: 9.5,-5.5 - parent: 1 - type: Transform - - uid: 367 - components: - - pos: -9.5,-5.5 - parent: 1 - type: Transform - - uid: 368 + - uid: 403 components: - - pos: 9.5,-2.5 + - pos: 0.5,11.5 parent: 1 type: Transform -- proto: Catwalk +- proto: ComputerStationRecords entities: - - uid: 369 - components: - - pos: -0.5,7.5 - parent: 1 - type: Transform - - uid: 370 - components: - - pos: 0.5,5.5 - parent: 1 - type: Transform - - uid: 371 - components: - - pos: 0.5,4.5 - parent: 1 - type: Transform - - uid: 372 - components: - - pos: -0.5,5.5 - parent: 1 - type: Transform - - uid: 373 + - uid: 401 components: - - pos: -0.5,6.5 + - pos: -1.5,11.5 parent: 1 type: Transform -- proto: ChairOfficeDark +- proto: DefibrillatorCabinetFilled entities: - - uid: 374 + - uid: 487 components: - - pos: 3.5,-7.5 + - rot: -1.5707963267948966 rad + pos: 5.5,-7.5 parent: 1 type: Transform -- proto: ChairPilotSeat +- proto: DiceBag entities: - - uid: 375 + - uid: 407 components: - - rot: 3.141592653589793 rad - pos: 0.5,10.5 + - pos: -1.3747578,2.6226196 parent: 1 type: Transform - - uid: 376 +- proto: EmergencyLight + entities: + - uid: 68 components: - rot: 3.141592653589793 rad - pos: -1.5,10.5 + pos: 1.5,-4.5 parent: 1 type: Transform -- proto: CheckerBoard - entities: - - uid: 377 + - uid: 406 components: - - pos: -1.9841328,2.5913696 + - rot: -1.5707963267948966 rad + pos: 3.5,6.5 parent: 1 type: Transform -- proto: ClothingBeltMilitaryWebbing - entities: - - uid: 379 - components: - - flags: InContainer - type: MetaData - - parent: 378 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingEyesGlassesSunglasses - entities: - - uid: 380 - components: - - flags: InContainer - type: MetaData - - parent: 378 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingHandsGlovesCombat - entities: - - uid: 381 - components: - - flags: InContainer - type: MetaData - - parent: 378 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingHeadHatHoshat - entities: - - uid: 382 - components: - - flags: InContainer - desc: There's a new bounty hunter in the sector. - name: bounty hunter's hat - type: MetaData - - parent: 378 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingOuterArmorBulletproof - entities: - - uid: 383 - components: - - flags: InContainer - type: MetaData - - parent: 378 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingOuterCoatHoSTrench - entities: - - uid: 384 - components: - - flags: InContainer - desc: A greatcoat enhanced with a special alloy for some extra protection and style for those with a charismatic presence. - name: bounty hunter's flak trenchcoat - type: MetaData - - parent: 378 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingOuterHardsuitBasic - entities: - - uid: 385 - components: - - flags: InContainer - type: MetaData - - parent: 378 - type: Transform - - group: - - hoverMessage: "" - contextText: verb-examine-group-other - icon: /Textures/Interface/examine-star.png - components: - - Armor - - ClothingSpeedModifier - entries: - - message: >- - It provides the following protection: - - - [color=yellow]Blunt[/color] damage reduced by [color=lightblue]10%[/color]. - - - [color=yellow]Slash[/color] damage reduced by [color=lightblue]10%[/color]. - - - [color=yellow]Piercing[/color] damage reduced by [color=lightblue]10%[/color]. - - - [color=yellow]Heat[/color] damage reduced by [color=lightblue]10%[/color]. - - - [color=yellow]Radiation[/color] damage reduced by [color=lightblue]10%[/color]. - - - [color=yellow]Caustic[/color] damage reduced by [color=lightblue]15%[/color]. - - - [color=orange]Explosion[/color] damage reduced by [color=lightblue]10%[/color]. - priority: 0 - component: Armor - - message: This decreases your speed by [color=yellow]20%[/color]. - priority: 0 - component: ClothingSpeedModifier - title: null - type: GroupExamine - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingOuterWinterPara - entities: - - uid: 395 + - uid: 409 components: - - pos: 2.6429324,-6.3159156 + - rot: -1.5707963267948966 rad + pos: 0.5,6.5 parent: 1 type: Transform -- proto: ClothingShoesBootsCombatFilled - entities: - - uid: 386 - components: - - flags: InContainer - type: MetaData - - parent: 378 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingUniformJumpskirtDetective - entities: - - uid: 387 - components: - - flags: InContainer - type: MetaData - - parent: 378 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingUniformJumpsuitDetective - entities: - - uid: 388 - components: - - flags: InContainer - type: MetaData - - parent: 378 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ComputerBroken - entities: - - uid: 401 + - uid: 471 components: - - pos: -1.5,11.5 + - rot: 3.141592653589793 rad + pos: 0.5,9.5 parent: 1 type: Transform -- proto: ComputerSalvageExpedition - entities: - - uid: 402 + - uid: 479 components: - rot: 1.5707963267948966 rad - pos: -2.5,9.5 + pos: -1.5,-0.5 parent: 1 type: Transform -- proto: ComputerShuttle - entities: - - uid: 403 + - uid: 484 components: - - pos: 0.5,11.5 + - rot: 3.141592653589793 rad + pos: 11.5,-5.5 parent: 1 type: Transform -- proto: ComputerStationRecords - entities: - - uid: 404 + - uid: 485 components: - rot: 3.141592653589793 rad - pos: 3.5,-8.5 + pos: -11.5,-5.5 parent: 1 type: Transform -- proto: CrateFoodCooking - entities: - - uid: 394 + - uid: 486 components: - - pos: 3.5,1.5 + - rot: -1.5707963267948966 rad + pos: -3.5,-1.5 parent: 1 type: Transform -- proto: DefibrillatorCabinetFilled - entities: - - uid: 406 + - uid: 488 components: - rot: 3.141592653589793 rad - pos: 2.5,-9.5 + pos: 2.5,-8.5 parent: 1 type: Transform -- proto: DiceBag +- proto: ExtinguisherCabinetFilled entities: - - uid: 407 + - uid: 408 components: - - pos: -1.3747578,2.6226196 + - rot: 3.141592653589793 rad + pos: -1.5,8.5 parent: 1 type: Transform -- proto: DrinkNuclearColaGlass - entities: - - uid: 409 - components: - - flags: InContainer - type: MetaData - - parent: 408 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - - uid: 410 - components: - - flags: InContainer - type: MetaData - - parent: 408 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: FaxMachineShip entities: - uid: 417 @@ -3206,6 +2761,20 @@ entities: - pos: -1.5,-6.5 parent: 1 type: Transform +- proto: Firelock + entities: + - uid: 493 + components: + - rot: -1.5707963267948966 rad + pos: 0.5,3.5 + parent: 1 + type: Transform + - uid: 495 + components: + - rot: -1.5707963267948966 rad + pos: 1.5,5.5 + parent: 1 + type: Transform - proto: FirelockEdge entities: - uid: 419 @@ -3224,1079 +2793,951 @@ entities: components: - rot: 1.5707963267948966 rad pos: 2.5,-4.5 - parent: 1 - type: Transform - - uid: 422 - components: - - rot: 1.5707963267948966 rad - pos: 2.5,-3.5 - parent: 1 - type: Transform - - uid: 423 - components: - - pos: -3.5,-1.5 - parent: 1 - type: Transform -- proto: FirelockGlass - entities: - - uid: 424 - components: - - pos: 1.5,0.5 - parent: 1 - type: Transform - - uid: 425 - components: - - rot: 1.5707963267948966 rad - pos: 4.5,-2.5 - parent: 1 - type: Transform - - uid: 426 - components: - - pos: 1.5,-0.5 - parent: 1 - type: Transform - - uid: 427 - components: - - pos: 1.5,-1.5 - parent: 1 - type: Transform -- proto: FloorDrain - entities: - - uid: 428 - components: - - pos: 2.5,-10.5 - parent: 1 - type: Transform - - fixtures: {} - type: Fixtures - - uid: 429 - components: - - pos: -4.5,0.5 - parent: 1 - type: Transform - - fixtures: {} - type: Fixtures -- proto: FoodBreadMoldy - entities: - - uid: 430 - components: - - pos: -0.5628208,11.671696 - parent: 1 - type: Transform -- proto: FoodBreadMoldySlice - entities: - - uid: 411 - components: - - flags: InContainer - type: MetaData - - parent: 408 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - - uid: 412 - components: - - flags: InContainer - type: MetaData - - parent: 408 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: FoodPizzaMoldySlice - entities: - - uid: 413 - components: - - flags: InContainer - type: MetaData - - parent: 408 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - - uid: 414 - components: - - flags: InContainer - type: MetaData - - parent: 408 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - - uid: 415 - components: - - flags: InContainer - type: MetaData - - parent: 408 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: GasDualPortVentPump - entities: - - uid: 431 - components: - - pos: -0.5,1.5 - parent: 1 - type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 432 - components: - - rot: 3.141592653589793 rad - pos: -0.5,-4.5 - parent: 1 - type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 433 + parent: 1 + type: Transform + - uid: 422 components: - rot: 1.5707963267948966 rad - pos: -4.5,-3.5 + pos: 2.5,-3.5 parent: 1 type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 434 + - uid: 423 components: - - rot: 1.5707963267948966 rad - pos: 4.5,-3.5 + - pos: -3.5,-1.5 parent: 1 type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor -- proto: GasMixerFlipped +- proto: FirelockGlass entities: - - uid: 435 + - uid: 69 components: - - rot: 3.141592653589793 rad - pos: -0.5,6.5 + - rot: -1.5707963267948966 rad + pos: 0.5,-5.5 parent: 1 type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor -- proto: GasPassiveVent - entities: - - uid: 436 + - uid: 424 + components: + - pos: 1.5,0.5 + parent: 1 + type: Transform + - uid: 425 components: - rot: 1.5707963267948966 rad - pos: -5.5,3.5 + pos: 4.5,-2.5 parent: 1 type: Transform - - uid: 437 + - uid: 426 components: - - rot: -1.5707963267948966 rad - pos: 5.5,3.5 + - pos: 1.5,-0.5 parent: 1 type: Transform -- proto: GasPipeBend - entities: - - uid: 438 + - uid: 427 components: - - rot: 1.5707963267948966 rad - pos: 2.5,-1.5 + - pos: 1.5,-1.5 parent: 1 type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 439 + - uid: 481 components: - - pos: -2.5,-1.5 + - rot: -1.5707963267948966 rad + pos: -0.5,-5.5 parent: 1 type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 440 + - uid: 489 components: - rot: -1.5707963267948966 rad - pos: 1.5,2.5 + pos: -0.5,-2.5 parent: 1 type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 441 + - uid: 490 components: - - pos: -3.5,3.5 + - rot: -1.5707963267948966 rad + pos: -3.5,-2.5 parent: 1 type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 442 + - uid: 491 components: - - rot: 3.141592653589793 rad - pos: -3.5,2.5 + - rot: -1.5707963267948966 rad + pos: 4.5,-2.5 parent: 1 type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 443 + - uid: 492 components: - - rot: 1.5707963267948966 rad - pos: 3.5,3.5 + - rot: -1.5707963267948966 rad + pos: 3.5,-5.5 parent: 1 type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 444 + - uid: 494 components: - rot: -1.5707963267948966 rad - pos: 3.5,2.5 + pos: -0.5,8.5 parent: 1 type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 445 +- proto: FloorDrain + entities: + - uid: 428 components: - - pos: -1.5,2.5 + - pos: 2.5,-10.5 parent: 1 type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 446 + - fixtures: {} + type: Fixtures + - uid: 429 components: - - rot: 1.5707963267948966 rad - pos: 1.5,2.5 + - pos: -4.5,0.5 parent: 1 type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 447 + - fixtures: {} + type: Fixtures +- proto: FoodBreadMoldy + entities: + - uid: 430 + components: + - pos: -0.5628208,11.671696 + parent: 1 + type: Transform +- proto: GasMixer + entities: + - uid: 175 components: - rot: 3.141592653589793 rad - pos: -1.5,1.5 + pos: -0.5,-10.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 448 +- proto: GasPassiveGate + entities: + - uid: 388 components: - rot: 1.5707963267948966 rad - pos: 0.5,-3.5 + pos: -6.5,-7.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 449 +- proto: GasPassiveVent + entities: + - uid: 349 components: - - rot: -1.5707963267948966 rad - pos: 0.5,-4.5 + - rot: 1.5707963267948966 rad + pos: -7.5,-7.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 450 +- proto: GasPipeBend + entities: + - uid: 173 components: - - pos: 2.5,-3.5 + - pos: 0.5,-10.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 451 + - uid: 345 components: - rot: -1.5707963267948966 rad - pos: 0.5,-3.5 + pos: 7.5,-3.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 452 + - uid: 347 components: - - rot: 1.5707963267948966 rad - pos: 0.5,-2.5 + - rot: 3.141592653589793 rad + pos: -7.5,-3.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 453 +- proto: GasPipeFourway + entities: + - uid: 268 components: - - pos: 2.5,-2.5 + - pos: -0.5,-4.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 454 + - uid: 269 components: - - rot: 3.141592653589793 rad - pos: 2.5,-3.5 + - pos: 0.5,-3.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 455 +- proto: GasPipeStraight + entities: + - uid: 39 components: - - rot: -1.5707963267948966 rad - pos: 1.5,-5.5 + - rot: 1.5707963267948966 rad + pos: 4.5,-3.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 456 + - uid: 78 components: - rot: 1.5707963267948966 rad - pos: 0.5,-5.5 + pos: 1.5,5.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 457 + - uid: 100 components: - - rot: -1.5707963267948966 rad - pos: 0.5,-10.5 + - pos: -0.5,6.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 458 + - uid: 148 components: - rot: 3.141592653589793 rad - pos: 2.5,-6.5 + pos: 0.5,8.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 459 + - uid: 149 components: - rot: 3.141592653589793 rad - pos: 1.5,-7.5 + pos: 0.5,7.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 460 + - uid: 150 components: - - pos: 1.5,-6.5 + - rot: 3.141592653589793 rad + pos: 0.5,6.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 461 + - uid: 151 components: - - pos: -0.5,7.5 + - rot: 1.5707963267948966 rad + pos: 1.5,5.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor -- proto: GasPipeFourway - entities: - - uid: 462 + - uid: 152 components: - - pos: -0.5,-3.5 + - pos: 0.5,4.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 463 + - uid: 242 components: - - pos: 1.5,-3.5 + - pos: 0.5,-6.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 464 + - uid: 243 components: - - pos: 0.5,5.5 + - pos: 0.5,-5.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor -- proto: GasPipeStraight - entities: - - uid: 465 + - uid: 244 components: - - rot: 3.141592653589793 rad - pos: -0.5,-7.5 + - pos: 0.5,-4.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 466 + - uid: 245 components: - - rot: 1.5707963267948966 rad - pos: 1.5,-6.5 + - rot: -1.5707963267948966 rad + pos: 0.5,-4.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 467 + - uid: 247 components: - - pos: 2.5,-2.5 + - rot: -1.5707963267948966 rad + pos: 2.5,-4.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 468 + - uid: 248 components: - - rot: 3.141592653589793 rad - pos: 2.5,-5.5 + - rot: -1.5707963267948966 rad + pos: 1.5,-3.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 469 + - uid: 249 components: - - pos: -2.5,-2.5 + - rot: -1.5707963267948966 rad + pos: 2.5,-3.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 470 + - uid: 250 components: - - rot: 3.141592653589793 rad - pos: 0.5,2.5 + - rot: -1.5707963267948966 rad + pos: -0.5,-3.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 471 - components: - - pos: -0.5,5.5 - parent: 1 - type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 472 + - uid: 252 components: - rot: -1.5707963267948966 rad - pos: 0.5,2.5 + pos: -2.5,-3.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 473 + - uid: 253 components: - - rot: 3.141592653589793 rad - pos: 1.5,3.5 + - rot: -1.5707963267948966 rad + pos: -1.5,-4.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 474 + - uid: 254 components: - - rot: 3.141592653589793 rad - pos: 1.5,4.5 + - rot: -1.5707963267948966 rad + pos: -2.5,-4.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 475 + - uid: 257 components: - - rot: 3.141592653589793 rad - pos: 1.5,5.5 + - rot: 1.5707963267948966 rad + pos: -4.5,-3.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 476 + - uid: 258 components: - - rot: 3.141592653589793 rad - pos: 1.5,6.5 + - pos: -4.5,-3.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 477 + - uid: 259 components: - - rot: 3.141592653589793 rad - pos: 1.5,7.5 + - pos: -0.5,-3.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 478 + - uid: 260 components: - - rot: 3.141592653589793 rad - pos: 1.5,8.5 + - pos: -0.5,-1.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 479 + - uid: 261 components: - - rot: -1.5707963267948966 rad - pos: 2.5,2.5 + - pos: -0.5,1.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 480 + - uid: 262 components: - - rot: 1.5707963267948966 rad - pos: -0.5,1.5 + - pos: -0.5,2.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 481 + - uid: 263 components: - - pos: -0.5,0.5 + - pos: -0.5,3.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 482 + - uid: 264 components: - - pos: -0.5,-0.5 + - pos: -0.5,4.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 483 + - uid: 265 components: - - pos: -0.5,-1.5 + - pos: -0.5,5.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 484 + - uid: 266 components: - - pos: -0.5,-2.5 + - pos: -0.5,8.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 485 + - uid: 267 components: - - rot: 3.141592653589793 rad - pos: 1.5,-0.5 + - pos: -0.5,0.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 486 + - uid: 270 components: - - rot: 3.141592653589793 rad - pos: 1.5,-1.5 + - pos: 0.5,-2.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 487 + - uid: 271 components: - - rot: 3.141592653589793 rad - pos: 1.5,-2.5 + - pos: 0.5,-1.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 488 + - uid: 277 components: - - rot: 1.5707963267948966 rad - pos: -0.5,-4.5 + - rot: -1.5707963267948966 rad + pos: 6.5,-3.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 489 + - uid: 279 components: - rot: -1.5707963267948966 rad - pos: -1.5,-4.5 + pos: -0.5,-7.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 490 + - uid: 280 components: - - rot: -1.5707963267948966 rad - pos: -3.5,-4.5 + - pos: 0.5,2.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 491 + - uid: 287 components: - rot: -1.5707963267948966 rad - pos: -4.5,-4.5 + pos: -4.5,-7.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 492 + - uid: 293 components: - rot: 1.5707963267948966 rad - pos: 3.5,-4.5 + pos: -8.5,-4.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 493 + - uid: 301 components: - rot: 1.5707963267948966 rad - pos: 4.5,-4.5 + pos: 8.5,-4.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 494 + - uid: 302 components: - - rot: 1.5707963267948966 rad - pos: 1.5,-2.5 + - rot: -1.5707963267948966 rad + pos: 5.5,-3.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 495 + - uid: 310 components: - - rot: 1.5707963267948966 rad - pos: 3.5,-3.5 + - pos: -4.5,-2.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 496 + - uid: 314 components: - - rot: 1.5707963267948966 rad - pos: -1.5,-3.5 + - rot: -1.5707963267948966 rad + pos: -1.5,-7.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 497 + - uid: 315 components: - rot: 1.5707963267948966 rad - pos: -2.5,-3.5 + pos: 3.5,-4.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 498 + - uid: 316 components: - rot: 1.5707963267948966 rad - pos: -3.5,-3.5 + pos: 4.5,-4.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 499 + - uid: 318 components: - - rot: 1.5707963267948966 rad - pos: -5.5,-3.5 + - rot: -1.5707963267948966 rad + pos: -2.5,-7.5 parent: 1 type: Transform - - uid: 500 + - color: '#990000FF' + type: AtmosPipeColor + - uid: 325 components: - - rot: 1.5707963267948966 rad - pos: -6.5,-3.5 + - pos: 0.5,3.5 parent: 1 type: Transform - - uid: 501 + - color: '#990000FF' + type: AtmosPipeColor + - uid: 326 components: - rot: 1.5707963267948966 rad - pos: -7.5,-3.5 + pos: -3.5,-4.5 parent: 1 type: Transform - - uid: 502 + - color: '#0055CCFF' + type: AtmosPipeColor + - uid: 327 components: - - rot: 1.5707963267948966 rad - pos: -8.5,-3.5 + - pos: -3.5,-2.5 parent: 1 type: Transform - - uid: 503 + - color: '#990000FF' + type: AtmosPipeColor + - uid: 330 components: - - rot: 1.5707963267948966 rad - pos: 5.5,-3.5 + - rot: -1.5707963267948966 rad + pos: -5.5,-7.5 parent: 1 type: Transform - - uid: 504 + - color: '#990000FF' + type: AtmosPipeColor + - uid: 333 components: - - rot: 1.5707963267948966 rad - pos: 6.5,-3.5 + - rot: 3.141592653589793 rad + pos: -0.5,-2.5 parent: 1 type: Transform - - uid: 505 + - color: '#0055CCFF' + type: AtmosPipeColor + - uid: 336 components: - rot: 1.5707963267948966 rad - pos: 7.5,-3.5 + pos: 9.5,-4.5 parent: 1 type: Transform - - uid: 506 + - color: '#0055CCFF' + type: AtmosPipeColor + - uid: 341 components: - rot: 1.5707963267948966 rad - pos: 8.5,-3.5 + pos: -9.5,-4.5 parent: 1 type: Transform - - uid: 507 + - color: '#0055CCFF' + type: AtmosPipeColor + - uid: 342 components: - - pos: -0.5,-5.5 + - rot: -1.5707963267948966 rad + pos: 6.5,-4.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 508 + - uid: 343 components: - - pos: -0.5,-8.5 + - rot: -1.5707963267948966 rad + pos: -5.5,-3.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 509 + - uid: 346 components: - - pos: -0.5,-9.5 + - rot: 1.5707963267948966 rad + pos: 3.5,-3.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 510 + - uid: 354 components: - - pos: -0.5,-10.5 + - rot: 3.141592653589793 rad + pos: -0.5,-7.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 511 + - uid: 355 components: - - rot: 1.5707963267948966 rad - pos: -0.5,-10.5 + - pos: -0.5,-6.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 512 + - uid: 432 components: - - pos: 0.5,-7.5 + - rot: -1.5707963267948966 rad + pos: 5.5,-4.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 513 + - uid: 433 components: - - pos: 0.5,-8.5 + - rot: -1.5707963267948966 rad + pos: -6.5,-4.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 514 + - uid: 434 components: - - pos: 0.5,-9.5 + - rot: -1.5707963267948966 rad + pos: -5.5,-4.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 515 + - uid: 447 components: - rot: -1.5707963267948966 rad - pos: -2.5,2.5 + pos: -6.5,-3.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 516 + - uid: 448 components: - - rot: 3.141592653589793 rad - pos: 0.5,3.5 + - pos: 0.5,-0.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 517 + - uid: 449 components: - - rot: 3.141592653589793 rad - pos: 0.5,4.5 + - rot: -1.5707963267948966 rad + pos: -3.5,-7.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 518 + - uid: 455 components: - rot: 3.141592653589793 rad - pos: 0.5,6.5 + pos: -0.5,-5.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 519 + - uid: 457 components: - - rot: 3.141592653589793 rad - pos: 0.5,7.5 + - pos: 0.5,1.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 520 + - uid: 460 components: - rot: 3.141592653589793 rad - pos: 0.5,8.5 + pos: -0.5,-9.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 521 +- proto: GasPipeTJunction + entities: + - uid: 99 components: - - rot: 3.141592653589793 rad - pos: -2.5,-3.5 + - rot: 1.5707963267948966 rad + pos: 0.5,5.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 522 + - uid: 147 components: - rot: -1.5707963267948966 rad - pos: 1.5,5.5 + pos: -0.5,7.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 523 + - uid: 246 components: - - pos: 0.5,-6.5 + - pos: -1.5,-3.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 524 + - uid: 251 components: - - pos: -0.5,4.5 + - rot: 3.141592653589793 rad + pos: 1.5,-4.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 525 + - uid: 255 components: - - pos: -0.5,3.5 + - rot: 3.141592653589793 rad + pos: -3.5,-3.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 526 + - uid: 288 components: - rot: 1.5707963267948966 rad - pos: 0.5,-6.5 + pos: -0.5,-0.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor -- proto: GasPipeTJunction - entities: - - uid: 527 + - uid: 317 components: - - rot: 3.141592653589793 rad - pos: -2.5,-4.5 + - rot: -1.5707963267948966 rad + pos: 0.5,-7.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 528 + - uid: 344 components: - - rot: 1.5707963267948966 rad - pos: -0.5,-6.5 + - pos: 7.5,-4.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 529 + - uid: 348 components: - - rot: 1.5707963267948966 rad - pos: -0.5,2.5 + - pos: -7.5,-4.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 530 + - uid: 356 components: - rot: 3.141592653589793 rad - pos: 0.5,1.5 + pos: -4.5,-4.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 531 + - uid: 400 components: - rot: -1.5707963267948966 rad - pos: 1.5,1.5 + pos: -0.5,-8.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 532 + - uid: 438 components: - rot: -1.5707963267948966 rad - pos: 1.5,0.5 + pos: 0.5,0.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 533 +- proto: GasPort + entities: + - uid: 174 components: - - rot: 1.5707963267948966 rad - pos: 2.5,-4.5 + - rot: 3.141592653589793 rad + pos: 0.5,-11.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 534 + - uid: 180 components: - - rot: -1.5707963267948966 rad - pos: 1.5,-4.5 + - rot: 3.141592653589793 rad + pos: -0.5,-11.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor -- proto: GasPort - entities: - - uid: 535 + - uid: 456 components: - rot: 1.5707963267948966 rad - pos: -1.5,7.5 + pos: -2.5,7.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 536 +- proto: GasPressurePump + entities: + - uid: 458 components: - - rot: -1.5707963267948966 rad - pos: 0.5,6.5 + - rot: 1.5707963267948966 rad + pos: -1.5,7.5 parent: 1 type: Transform -- proto: GasPressurePump + - color: '#0055CCFF' + type: AtmosPipeColor +- proto: GasVentPump entities: - - uid: 537 + - uid: 176 components: - rot: 1.5707963267948966 rad - pos: 4.5,3.5 + pos: -1.5,-8.5 parent: 1 type: Transform - - targetPressure: 4500 - type: GasPressurePump - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 538 + - uid: 289 components: - - rot: -1.5707963267948966 rad - pos: -4.5,3.5 + - rot: 1.5707963267948966 rad + pos: -10.5,-4.5 parent: 1 type: Transform - - targetPressure: 4500 - type: GasPressurePump - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor -- proto: GasVentPump - entities: - - uid: 539 + - uid: 292 components: - - rot: -1.5707963267948966 rad - pos: 2.5,-7.5 + - pos: 1.5,-3.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 540 + - uid: 332 components: - - pos: 1.5,9.5 + - rot: 3.141592653589793 rad + pos: 7.5,-5.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 541 + - uid: 334 components: - - rot: 1.5707963267948966 rad - pos: -9.5,-3.5 + - rot: 3.141592653589793 rad + pos: -7.5,-5.5 parent: 1 type: Transform - - uid: 542 + - color: '#0055CCFF' + type: AtmosPipeColor + - uid: 335 components: - rot: -1.5707963267948966 rad - pos: 9.5,-3.5 + pos: 10.5,-4.5 parent: 1 type: Transform - - uid: 543 + - color: '#0055CCFF' + type: AtmosPipeColor + - uid: 386 components: - - rot: 3.141592653589793 rad - pos: -0.5,-11.5 + - rot: -1.5707963267948966 rad + pos: 0.5,-0.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor -- proto: GasVentScrubber - entities: - - uid: 544 + - uid: 387 components: - - rot: -1.5707963267948966 rad - pos: 2.5,5.5 + - pos: -0.5,9.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 545 + - uid: 431 components: - - rot: 3.141592653589793 rad - pos: 0.5,0.5 + - pos: -4.5,-1.5 parent: 1 type: Transform - - uid: 546 + - color: '#0055CCFF' + type: AtmosPipeColor +- proto: GasVentScrubber + entities: + - uid: 285 components: - - rot: 1.5707963267948966 rad - pos: -3.5,-1.5 + - rot: 3.141592653589793 rad + pos: -1.5,-4.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 547 + - uid: 286 components: - rot: -1.5707963267948966 rad - pos: 3.5,-1.5 + pos: 2.5,-7.5 parent: 1 type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 548 + - uid: 290 components: - rot: -1.5707963267948966 rad - pos: 3.5,-6.5 + pos: 2.5,5.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 549 + - uid: 291 components: - rot: 1.5707963267948966 rad - pos: -1.5,-10.5 + pos: -0.5,0.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 550 + - uid: 299 components: - - rot: -1.5707963267948966 rad - pos: 5.5,-4.5 + - pos: -7.5,-2.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 551 + - uid: 385 components: - - rot: 1.5707963267948966 rad - pos: 0.5,-4.5 + - pos: 7.5,-2.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 552 + - uid: 393 components: - - rot: 1.5707963267948966 rad - pos: -5.5,-4.5 + - rot: 3.141592653589793 rad + pos: 0.5,-8.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 553 + - uid: 439 components: - - pos: 0.5,9.5 + - pos: -3.5,-1.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 554 + - uid: 440 components: - - rot: 1.5707963267948966 rad - pos: -0.5,5.5 + - pos: 0.5,9.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - proto: GravityGeneratorMini entities: - - uid: 555 + - uid: 437 components: - - pos: -2.5,7.5 + - pos: 0.5,6.5 parent: 1 type: Transform - proto: Grille @@ -4412,51 +3853,13 @@ entities: pos: 5.5,-9.5 parent: 1 type: Transform -- proto: GunSafe +- proto: GunSafeShuttleT1Spawner entities: - - uid: 576 + - uid: 70 components: - pos: 3.5,6.5 parent: 1 type: Transform - - locked: False - type: Lock - - air: - volume: 200 - immutable: False - temperature: 293.14975 - moles: - - 1.8968438 - - 7.1357465 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - type: EntityStorage - - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 392 - - 390 - - 389 - - 393 - - 579 - - 391 - - 578 - - 577 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - type: ContainerContainer - proto: Gyroscope entities: - uid: 580 @@ -4523,18 +3926,21 @@ entities: - pos: 1.501635,10.979151 parent: 1 type: Transform -- proto: IntercomCommand +- proto: IngotGold1 entities: - - uid: 591 + - uid: 463 components: - - pos: -2.5,10.5 + - pos: -2.6976614,2.3970013 parent: 1 type: Transform -- proto: IntercomSecurity - entities: - - uid: 592 + - uid: 464 components: - - pos: 1.5,10.5 + - pos: -2.4656172,2.5517735 + parent: 1 + type: Transform + - uid: 468 + components: + - pos: -2.6460953,2.7065454 parent: 1 type: Transform - proto: KitchenMicrowave @@ -4551,15 +3957,6 @@ entities: - pos: 3.5,-1.5 parent: 1 type: Transform -- proto: LockerFreezerBase - entities: - - uid: 408 - components: - - pos: -1.5,-0.5 - parent: 1 - type: Transform - - locked: False - type: Lock - air: volume: 200 immutable: False @@ -4578,55 +3975,41 @@ entities: - 0 - 0 type: EntityStorage - - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 415 - - 414 - - 412 - - 410 - - 411 - - 413 - - 409 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - type: ContainerContainer +- proto: LockerFreezerBase + entities: + - uid: 472 + components: + - pos: -1.5,-1.5 + parent: 1 + type: Transform +- proto: LockerMercenaryFilled + entities: + - uid: 276 + components: + - pos: 2.5,4.5 + parent: 1 + type: Transform - proto: LockerParamedicFilled entities: - - uid: 595 + - uid: 410 components: - pos: 2.5,-7.5 parent: 1 type: Transform - - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - type: EntityStorage -- proto: LockerSalvageSpecialistFilledHardsuit +- proto: LockerSalvageSpecialistFilled entities: - - uid: 596 + - uid: 411 components: - pos: -3.5,-6.5 parent: 1 type: Transform +- proto: LockerWallMedicalFilled + entities: + - uid: 597 + components: + - pos: 2.5,-5.5 + parent: 1 + type: Transform - air: volume: 200 immutable: False @@ -4637,56 +4020,19 @@ entities: - 0 - 0 - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - type: EntityStorage -- proto: LockerWallMedicalFilled - entities: - - uid: 597 - components: - - pos: 2.5,-5.5 - parent: 1 - type: Transform -- proto: MagazineBoxMagnum - entities: - - uid: 389 - components: - - flags: InContainer - type: MetaData - - parent: 576 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: MedicalBed - entities: - - uid: 598 - components: - - pos: 5.5,-6.5 - parent: 1 - type: Transform -- proto: MedicalTrackingImplanter - entities: - - uid: 398 - components: - - pos: 2.646165,4.387697 - parent: 1 - type: Transform - - uid: 399 - components: - - pos: 2.3362565,4.5056906 - parent: 1 - type: Transform -- proto: MedkitCombatFilled + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + type: EntityStorage +- proto: MedicalBed entities: - - uid: 599 + - uid: 598 components: - - pos: 2.490187,-6.4109445 + - pos: 5.5,-6.5 parent: 1 type: Transform - proto: Mirror @@ -4705,20 +4051,6 @@ entities: pos: 4.5,-9.5 parent: 1 type: Transform -- proto: NitrogenCanister - entities: - - uid: 602 - components: - - pos: 0.5,6.5 - parent: 1 - type: Transform -- proto: OxygenCanister - entities: - - uid: 603 - components: - - pos: -1.5,7.5 - parent: 1 - type: Transform - proto: PaperBin10 entities: - uid: 604 @@ -4847,22 +4179,9 @@ entities: type: Transform - proto: Rack entities: - - uid: 624 - components: - - rot: -1.5707963267948966 rad - pos: 2.5,7.5 - parent: 1 - type: Transform - - uid: 625 - components: - - rot: -1.5707963267948966 rad - pos: 3.5,4.5 - parent: 1 - type: Transform - - uid: 626 + - uid: 394 components: - - rot: -1.5707963267948966 rad - pos: 2.5,4.5 + - pos: 3.5,4.5 parent: 1 type: Transform - uid: 627 @@ -4945,6 +4264,28 @@ entities: type: Transform - proto: RandomSpawner entities: + - uid: 256 + components: + - pos: 0.5,-11.5 + parent: 1 + type: Transform + - uid: 451 + components: + - pos: -1.5,9.5 + parent: 1 + type: Transform + - uid: 477 + components: + - rot: 1.5707963267948966 rad + pos: -6.5,-4.5 + parent: 1 + type: Transform + - uid: 478 + components: + - rot: 1.5707963267948966 rad + pos: 6.5,-4.5 + parent: 1 + type: Transform - uid: 641 components: - pos: -4.5,-1.5 @@ -4995,11 +4336,6 @@ entities: - pos: -2.5,-8.5 parent: 1 type: Transform - - uid: 651 - components: - - pos: -1.5,9.5 - parent: 1 - type: Transform - uid: 652 components: - pos: 11.5,-2.5 @@ -5020,31 +4356,16 @@ entities: - pos: -11.5,-2.5 parent: 1 type: Transform - - uid: 656 - components: - - pos: -5.5,-4.5 - parent: 1 - type: Transform - uid: 657 components: - pos: 1.5,-3.5 parent: 1 type: Transform - - uid: 658 - components: - - pos: 5.5,-4.5 - parent: 1 - type: Transform - uid: 659 components: - pos: -1.5,-10.5 parent: 1 type: Transform - - uid: 660 - components: - - pos: 0.5,-11.5 - parent: 1 - type: Transform - uid: 661 components: - pos: 0.5,-8.5 @@ -5060,20 +4381,6 @@ entities: - pos: -0.5,11.5 parent: 1 type: Transform -- proto: RandomVendingDrinks - entities: - - uid: 664 - components: - - pos: 0.5,-9.5 - parent: 1 - type: Transform -- proto: RandomVendingSnacks - entities: - - uid: 665 - components: - - pos: -1.5,-1.5 - parent: 1 - type: Transform - proto: ReinforcedWindow entities: - uid: 666 @@ -5243,6 +4550,15 @@ entities: type: DeviceLinkSink - proto: SignalButton entities: + - uid: 412 + components: + - pos: -2.5,-2.5 + parent: 1 + type: Transform + - linkedPorts: + 2: + - Pressed: DoorBolt + type: DeviceLinkSource - uid: 693 components: - pos: 1.5,11.5 @@ -5325,19 +4641,18 @@ entities: - pos: -4.5,0.5 parent: 1 type: Transform -- proto: SinkStemlessWater +- proto: SinkStemless entities: - - uid: 703 + - uid: 480 components: - - pos: 2.5,-10.5 + - pos: 3.5,2.5 parent: 1 type: Transform -- proto: SinkWide +- proto: SinkStemlessWater entities: - - uid: 704 + - uid: 703 components: - - rot: 1.5707963267948966 rad - pos: 2.5,1.5 + - pos: 2.5,-10.5 parent: 1 type: Transform - proto: SMESBasic @@ -5354,55 +4669,6 @@ entities: - pos: 2.6583714,-10.571913 parent: 1 type: Transform -- proto: soda_dispenser - entities: - - uid: 707 - components: - - pos: 3.5,2.5 - parent: 1 - type: Transform -- proto: SpaceCash - entities: - - uid: 708 - components: - - pos: -2.6022344,2.537315 - parent: 1 - type: Transform - - uid: 709 - components: - - pos: -2.4616094,2.6545024 - parent: 1 - type: Transform - - uid: 710 - components: - - pos: -2.6256719,2.77169 - parent: 1 - type: Transform - - uid: 711 - components: - - pos: -2.6959844,2.7951274 - parent: 1 - type: Transform - - uid: 712 - components: - - pos: -2.3912969,2.7013774 - parent: 1 - type: Transform - - uid: 713 - components: - - pos: -2.4616094,2.67794 - parent: 1 - type: Transform - - uid: 714 - components: - - pos: -2.5553594,2.67794 - parent: 1 - type: Transform - - uid: 715 - components: - - pos: -2.5787969,2.818565 - parent: 1 - type: Transform - proto: SpawnPointBartender entities: - uid: 716 @@ -5424,9 +4690,9 @@ entities: type: Transform - proto: SpawnPointMercenary entities: - - uid: 719 + - uid: 398 components: - - pos: 4.5,-1.5 + - pos: 2.5,6.5 parent: 1 type: Transform - proto: SpawnPointParamedic @@ -5438,40 +4704,37 @@ entities: type: Transform - proto: SpawnPointSalvageSpecialist entities: - - uid: 721 + - uid: 415 components: - - pos: -2.5,-6.5 + - pos: -2.5,-7.5 parent: 1 type: Transform -- proto: SpeedLoaderMagnum +- proto: Stairs entities: - - uid: 390 + - uid: 473 components: - - flags: InContainer - type: MetaData - - parent: 576 + - rot: -1.5707963267948966 rad + pos: -5.5,-3.5 + parent: 1 type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - - uid: 391 + - uid: 474 components: - - flags: InContainer - type: MetaData - - parent: 576 + - rot: -1.5707963267948966 rad + pos: -5.5,-4.5 + parent: 1 type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - - uid: 392 + - uid: 475 components: - - flags: InContainer - type: MetaData - - parent: 576 + - rot: 1.5707963267948966 rad + pos: 5.5,-3.5 + parent: 1 + type: Transform + - uid: 476 + components: + - rot: 1.5707963267948966 rad + pos: 5.5,-4.5 + parent: 1 type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: StoolBar entities: - uid: 722 @@ -5494,30 +4757,32 @@ entities: type: Transform - proto: SubstationWallBasic entities: - - uid: 725 + - uid: 465 components: - - pos: -1.5,8.5 + - rot: -1.5707963267948966 rad + pos: 1.5,-7.5 parent: 1 type: Transform - - uid: 726 + - uid: 467 components: - - pos: 1.5,-7.5 + - rot: -1.5707963267948966 rad + pos: 1.5,4.5 parent: 1 type: Transform -- proto: SuitStorageBase +- proto: SuitStorageEVA entities: - - uid: 378 + - uid: 727 components: - - pos: 3.5,5.5 + - pos: -7.5,-5.5 parent: 1 type: Transform - air: volume: 200 immutable: False - temperature: 293.14966 + temperature: 293.1496 moles: - - 1.8968438 - - 7.1357465 + - 1.7459903 + - 6.568249 - 0 - 0 - 0 @@ -5529,34 +4794,29 @@ entities: - 0 - 0 type: EntityStorage - - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 387 - - 384 - - 385 - - 382 - - 388 - - 381 - - 383 - - 379 - - 386 - - 380 - type: ContainerContainer -- proto: SuitStorageEVA - entities: - - uid: 727 - components: - - pos: -7.5,-5.5 - parent: 1 - type: Transform - uid: 728 components: - pos: 7.5,-5.5 parent: 1 type: Transform + - air: + volume: 200 + immutable: False + temperature: 293.1496 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + type: EntityStorage - proto: SuitStorageEVAPrisoner entities: - uid: 396 @@ -5582,6 +4842,27 @@ entities: - 0 - 0 type: EntityStorage +- proto: SuitStorageMercenary + entities: + - uid: 483 + components: + - pos: 3.5,5.5 + parent: 1 + type: Transform +- proto: SuitStorageParamedic + entities: + - uid: 404 + components: + - pos: 3.5,-8.5 + parent: 1 + type: Transform +- proto: SuitStorageSalv + entities: + - uid: 482 + components: + - pos: -2.5,-6.5 + parent: 1 + type: Transform - proto: TableCarpet entities: - uid: 729 @@ -5776,18 +5057,6 @@ entities: pos: 2.5,-11.5 parent: 1 type: Transform -- proto: TrackingImplanter - entities: - - uid: 762 - components: - - pos: 3.4641175,4.4740067 - parent: 1 - type: Transform - - uid: 763 - components: - - pos: 3.7141175,4.3958817 - parent: 1 - type: Transform - proto: VendingBarDrobe entities: - uid: 397 @@ -5804,6 +5073,13 @@ entities: - pos: 5.5,-1.5 parent: 1 type: Transform +- proto: VendingMachineBountyVend + entities: + - uid: 413 + components: + - pos: 2.5,7.5 + parent: 1 + type: Transform - proto: VendingMachineTankDispenserEVA entities: - uid: 765 @@ -5836,15 +5112,13 @@ entities: - pos: -1.5,3.5 parent: 1 type: Transform -- proto: WallPlastitanium +- proto: WallReinforced entities: - - uid: 769 + - uid: 470 components: - pos: 1.5,-7.5 parent: 1 type: Transform -- proto: WallReinforced - entities: - uid: 770 components: - pos: 1.5,3.5 @@ -6665,28 +5939,6 @@ entities: - pos: 0.5,1.5 parent: 1 type: Transform -- proto: WeaponRevolverMateba - entities: - - uid: 393 - components: - - flags: InContainer - type: MetaData - - parent: 576 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: WeaponShotgunSawnEmpty - entities: - - uid: 577 - components: - - flags: InContainer - type: MetaData - - parent: 576 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: Windoor entities: - uid: 924 @@ -6703,4 +5955,11 @@ entities: pos: 1.5,-11.5 parent: 1 type: Transform +- proto: Wrench + entities: + - uid: 391 + components: + - pos: 0.4459281,7.562047 + parent: 1 + type: Transform ... diff --git a/Resources/Prototypes/_NF/Shipyard/sprinter.yml b/Resources/Prototypes/_NF/Shipyard/sprinter.yml index 8d23eb4b11d..1231c1cb700 100644 --- a/Resources/Prototypes/_NF/Shipyard/sprinter.yml +++ b/Resources/Prototypes/_NF/Shipyard/sprinter.yml @@ -2,17 +2,17 @@ id: Sprinter name: KC Sprinter description: A light freighter often picked by bounty hunters due to its quick acceleration, expedition capable. - price: 75020 + price: 61500 # 15% tax category: Medium group: Expedition - shuttlePath: /Maps/Shuttles/sprinter.yml - + shuttlePath: /Maps/_NF/Shuttles/sprinter.yml + - type: gameMap id: Sprinter mapName: 'KC Sprinter' - mapPath: /Maps/Shuttles/sprinter.yml + mapPath: /Maps/_NF/Shuttles/sprinter.yml minPlayers: 0 - stations: + stations: Sprinter: stationProto: StandardFrontierExpeditionVessel components: @@ -27,4 +27,4 @@ Bartender: [ 0, 0 ] Paramedic: [ 0, 0 ] Mercenary: [ 0, 0 ] - SalvageSpecialist: [ 0, 0 ] + SalvageSpecialist: [ 0, 0 ] From f9c813f4bc00aec42fda3a2219f46e497704e98c Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sun, 7 Jan 2024 20:46:21 +0000 Subject: [PATCH 02/12] Automatic Changelog (#832) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 38b6b1699de..74b5d11171f 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -2723,3 +2723,9 @@ Entries: message: Praeda was reworked. id: 4733 time: '2024-01-07T19:48:50.0000000+00:00' +- author: TsjipTsjip + changes: + - type: Tweak + message: Sprinter was reworked. + id: 4734 + time: '2024-01-07T20:45:57.0000000+00:00' From 2d6c9d4b523ad74ae7784d8fa90c5dbec897242d Mon Sep 17 00:00:00 2001 From: Mnemosyne <153693227+mnemosynium@users.noreply.github.com> Date: Mon, 8 Jan 2024 02:58:09 -0500 Subject: [PATCH 03/12] Remove shitcurity and cargonia references (#836) * Remove description references to shitcurity and cargonia * Update comments * Update banners.yml * Undo removal from Praeda --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml | 2 +- Resources/Prototypes/Entities/Clothing/Eyes/specific.yml | 3 +-- .../Entities/Objects/Consumable/Drinks/drinks_bottles.yml | 2 +- .../Prototypes/Entities/Structures/Decoration/banners.yml | 6 ++---- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 5b704878b35..4c35147b71a 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -115,7 +115,7 @@ parent: ClothingEyesBase id: ClothingEyesGlassesSunglasses name: sun glasses - description: Useful both for security and cargonia. + description: Useful for security. # Frontier - description change components: - type: Sprite sprite: Clothing/Eyes/Glasses/sunglasses.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml b/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml index c04f3482870..b67614f1333 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml @@ -2,7 +2,7 @@ parent: ClothingEyesBase id: ClothingEyesChameleon # no flash immunity, sorry name: sun glasses - description: Useful both for security and cargonia. + description: Useful for security. # Frontier - description change suffix: Chameleon components: - type: Tag @@ -18,4 +18,3 @@ interfaces: - key: enum.ChameleonUiKey.Key type: ChameleonBoundUserInterface - diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index a253bae40a4..2c9b2b2df31 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -97,7 +97,7 @@ parent: DrinkBottleBaseFull id: DrinkCognacBottleFull name: cognac bottle - description: A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time. + description: A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. # Frontier - description change components: - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Entities/Structures/Decoration/banners.yml b/Resources/Prototypes/Entities/Structures/Decoration/banners.yml index cc0c90503d0..bb020fd9f60 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/banners.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/banners.yml @@ -41,7 +41,7 @@ id: BannerCargo parent: BannerBase name: cargo banner - description: A banner displaying the colors of the cargo department. Not. Cargonia. + description: A banner displaying the colors of the cargo department. # Frontier - description change components: - type: Sprite sprite: Structures/Decoration/banner.rsi @@ -101,7 +101,7 @@ id: BannerSecurity parent: BannerBase name: security banner - description: A banner displaying the colors of the shitcurity department. Security, my bad. + description: A banner displaying the colors of the security department. # Frontier - description change components: - type: Sprite sprite: Structures/Decoration/banner.rsi @@ -146,5 +146,3 @@ - type: Sprite sprite: Structures/Decoration/banner.rsi state: banner-green - - From f53ea0e891bddfae9b63998e4e3a73c2e17f723b Mon Sep 17 00:00:00 2001 From: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Date: Mon, 8 Jan 2024 11:48:40 +0100 Subject: [PATCH 04/12] Xeno noghostrole (#845) * Create pr-labeler.yml * Update labeler.yml * Move proto components around * Update xeno.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../Prototypes/Entities/Mobs/NPCs/xeno.yml | 17 +++++++++-------- .../Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml | 9 +++++++++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml index 8bf82afd674..2e064d7d4aa 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml @@ -94,14 +94,15 @@ spawned: - id: FoodMeatXeno amount: 5 - - type: GhostRole - allowMovement: true - allowSpeech: true - makeSentient: true - name: ghost-role-information-xeno-name - description: ghost-role-information-xeno-description - rules: ghost-role-information-xeno-rules - - type: GhostTakeoverAvailable + # Frontier - Remove GhostRole from all xenos + # - type: GhostRole + # allowMovement: true + # allowSpeech: true + # makeSentient: true + # name: ghost-role-information-xeno-name + # description: ghost-role-information-xeno-description + # rules: ghost-role-information-xeno-rules + # - type: GhostTakeoverAvailable - type: TypingIndicator proto: alien - type: Temperature diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml index 89a1482b633..8d9ecad383c 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml @@ -2,6 +2,7 @@ name: Queen parent: MobXenoQueen id: MobXenoQueenDungeon + suffix: Ghost components: - type: Tag tags: @@ -9,3 +10,11 @@ - type: SalvageMobRestrictions - type: ReplacementAccent accent: xeno + - type: GhostRole + allowMovement: true + allowSpeech: true + makeSentient: true + name: ghost-role-information-xeno-name + description: ghost-role-information-xeno-description + rules: ghost-role-information-xeno-rules + - type: GhostTakeoverAvailable From 9b37edd1a9b9e82113e0017b02a9a050fbfa03ad Mon Sep 17 00:00:00 2001 From: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Date: Mon, 8 Jan 2024 18:06:58 +0100 Subject: [PATCH 05/12] Mapchecker (#844) * Create pr-labeler.yml * Update labeler.yml * Mapchecker initial version * Create frontier-mapchecker.yml * Update whitelists * Unrestrict allowable stamps and cat ears * Thanos snap illegal shit * Update frontier-mapchecker.yml * Fix aggressive matching * Add TODO note * Revert "Thanos snap illegal shit" This reverts commit 20abe7b9d902071878f5f43a1b85fbd2074a585b. * Introduce technical debt into whitelist. * Fix conditional checking semantics. * Add blanket-whitelisting for maps, these are never checked. * Actually skip blanket-whitelisted files. Also remove a print I left in on accident. * Fix bugs I introduced before * Move blackmarket whitelists to their own conditional matching group, to demonstrate this works mostly * Add verbosity flag to mapchecker * Merge upstream/master into origin/master, adjust default paths * Make encryption keys except for common and traffic tagged with DO NOT MAP * Technical debt for encryption keys * Some more blacklists: Radios and the x-01 multiphase * Resolve future merge conflict with #821 * Expand mapchecker to accept group overrides per-shuttle * Update MapChecker documentation * Resolve pipeline failures * De-upset mapchecker --- .github/mapchecker/README.md | 42 ++++++++++++++++++- .github/mapchecker/mapchecker.py | 14 ++++++- .../Shipyard/Prototypes/VesselPrototype.cs | 7 ++++ Resources/Prototypes/_NF/Shipyard/cleric.yml | 1 + Resources/Prototypes/_NF/Shipyard/fighter.yml | 1 + Resources/Prototypes/_NF/Shipyard/rogue.yml | 1 + 6 files changed, 64 insertions(+), 2 deletions(-) diff --git a/.github/mapchecker/README.md b/.github/mapchecker/README.md index 0e99a897e26..f31a97246aa 100644 --- a/.github/mapchecker/README.md +++ b/.github/mapchecker/README.md @@ -6,8 +6,31 @@ directory which are marked as `DO NOT MAP`, `DEBUG`, ... and verifies that map c ## Usage -Glad I do not have to write this myself! Get detailed help information by running: `./mapchecker.py --help` +Glad I do not have to write this myself! Get detailed help information by running: +`python3 .github/mapchecker/mapchecker.py --help` +The following help block is printed: +``` +usage: mapchecker.py [-h] [-v] [-p PROTOTYPES_PATH [PROTOTYPES_PATH ...]] [-m MAP_PATH [MAP_PATH ...]] [-w WHITELIST] + +Map prototype usage checker for Frontier Station 14. + +options: + -h, --help show this help message and exit + -v, --verbose Sets log level to DEBUG if present, spitting out a lot more information. False by default,. + -p PROTOTYPES_PATH [PROTOTYPES_PATH ...], --prototypes_path PROTOTYPES_PATH [PROTOTYPES_PATH ...] + Directory holding entity prototypes. Default: All entity prototypes in the Frontier Station 14 codebase. + -m MAP_PATH [MAP_PATH ...], --map_path MAP_PATH [MAP_PATH ...] + Map PROTOTYPES or directory of map prototypes to check. Can mix and match.Default: All maps in the Frontier Station 14 codebase. + -w WHITELIST, --whitelist WHITELIST + YML file that lists map names and prototypes to allow for them. +``` + +You should generally not need to configure `-p`, `-m` or `-w`, as they are autofilled with sensible defaults. You can do +this: +- Set `-p` to only check against prototypes in a specific directory. +- Set `-m` to just check a specific map. (Make sure to **point it at the prototype**, not the map file itself!) +- Set `-v` with `-m` set as per above to get detailed information about a possible rejection for just that map. ## Configuration @@ -31,3 +54,20 @@ If a map has a prototype and you believe it should be whitelisted, add a key for gameMap prototype), and add the prototype ID's to its list. The whitelist the checker uses by default is `.github/mapchecker/whitelist.yml`. + +## Shuttle group override + +It is possible that a shuttle is set to group `None` because it is only used in custom shipyard listings. In this case, +you can force the MapChecker script to treat it as a different shipyard group by adding the following to the vessel +prototype: + +```yml + ... + group: None + # Add this line below. + mapchecker_group_override: ShipyardGroupHere + ... +``` + +Note that for now this will cause a warning to be generated, but it will not cause a failure if the shuttle matches the +criteria for the overridden group. diff --git a/.github/mapchecker/mapchecker.py b/.github/mapchecker/mapchecker.py index 2ba739d9121..e57606487ec 100755 --- a/.github/mapchecker/mapchecker.py +++ b/.github/mapchecker/mapchecker.py @@ -120,6 +120,7 @@ # Collect all prototypes and sort into the collectors. for proto_file in proto_paths: with open(proto_file, "r") as proto: + logger.debug(f"Reading prototype file '{proto_file}'.") file_data = yaml.load(proto, Loader=YamlLoaderIgnoringTags) if file_data is None: continue @@ -146,7 +147,6 @@ for item in conditionally_illegal_prototypes[key]: logger.debug(f" - {item}") - # ================================================================================================================== # PHASE 2: Check all maps in map_proto_paths for illegal prototypes. @@ -164,6 +164,9 @@ map_name = map_proto # The map name that will be reported over output. map_file_location = None shipyard_group = None # Shipyard group of this map, if it's a shuttle. + # Shipyard override of this map, in the case it's a custom shipyard shuttle but needs to be treated as a + # specific group. + shipyard_override = None for item in file_data: if item["type"] == "gameMap": @@ -174,6 +177,7 @@ if item["type"] == "vessel": # This yaml entry is a vessel descriptor! shipyard_group = item["group"] if "group" in item.keys() else None + shipyard_override = item["mapchecker_group_override"] if "mapchecker_group_override" in item.keys() else None if map_file_location is None: # Silently skip. If the map doesn't have a mapPath, it won't appear in game anyways. @@ -185,6 +189,14 @@ logger.warning(f"Map '{map_name}' (from prototype '{map_proto}') was blanket-whitelisted. Skipping it.") continue + if shipyard_override is not None: + # Log a warning, indicating the override and the normal group this shuttle belongs to, then set + # shipyard_group to the override. + logger.warning(f"Map '{map_name}' (from prototype '{map_proto}') is using mapchecker_group_override. " + f"This map will be treated as a '{shipyard_override}' shuttle. (Normally: " + f"'{shipyard_group}'))") + shipyard_group = shipyard_override + logger.debug(f"Starting checks for '{map_name}' (Path: '{map_file_location}' | Shipyard: '{shipyard_group}')") # Now construct a temporary list of all prototype ID's that are illegal for this map based on conditionals. diff --git a/Content.Shared/Shipyard/Prototypes/VesselPrototype.cs b/Content.Shared/Shipyard/Prototypes/VesselPrototype.cs index 4749f6be7ed..c025c9feacc 100644 --- a/Content.Shared/Shipyard/Prototypes/VesselPrototype.cs +++ b/Content.Shared/Shipyard/Prototypes/VesselPrototype.cs @@ -39,6 +39,13 @@ public sealed class VesselPrototype : IPrototype [DataField("group")] public string Group = string.Empty; + /// Frontier - Add this field for the MapChecker script. + /// + /// The MapChecker override group for this vessel. + /// + [DataField("mapchecker_group_override")] + public string MapcheckerGroup = string.Empty; + /// /// Relative directory path to the given shuttle, i.e. `/Maps/Shuttles/yourshittle.yml` /// diff --git a/Resources/Prototypes/_NF/Shipyard/cleric.yml b/Resources/Prototypes/_NF/Shipyard/cleric.yml index f4f706fd8db..77422bbf2ae 100644 --- a/Resources/Prototypes/_NF/Shipyard/cleric.yml +++ b/Resources/Prototypes/_NF/Shipyard/cleric.yml @@ -5,6 +5,7 @@ price: 10800 #Appraisal is 10500 category: Small group: None + mapchecker_group_override: Security # Treat this as a security vessel for mapchecker purposes shuttlePath: /Maps/Shuttles/cleric.yml - type: gameMap diff --git a/Resources/Prototypes/_NF/Shipyard/fighter.yml b/Resources/Prototypes/_NF/Shipyard/fighter.yml index ae8ec1a2610..560e4556021 100644 --- a/Resources/Prototypes/_NF/Shipyard/fighter.yml +++ b/Resources/Prototypes/_NF/Shipyard/fighter.yml @@ -5,6 +5,7 @@ price: 9000 #not sure how much mark up % to add but the appraisal is 8491$ category: Small group: None + mapchecker_group_override: Security # Treat this as a security vessel for mapchecker purposes shuttlePath: /Maps/Shuttles/fighter.yml - type: gameMap diff --git a/Resources/Prototypes/_NF/Shipyard/rogue.yml b/Resources/Prototypes/_NF/Shipyard/rogue.yml index de155d51d9f..33d40b8bb20 100644 --- a/Resources/Prototypes/_NF/Shipyard/rogue.yml +++ b/Resources/Prototypes/_NF/Shipyard/rogue.yml @@ -5,6 +5,7 @@ price: 8200 #the appraisal is 7941$ category: Small group: None + mapchecker_group_override: Security # Treat this as a security vessel for mapchecker purposes shuttlePath: /Maps/Shuttles/rogue.yml - type: gameMap From a29937d678f1b11464df00c5c1319c5931f40946 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Tue, 9 Jan 2024 01:57:21 +0200 Subject: [PATCH 06/12] ChefVend Ingredients (#847) * Salt & Pepper * Cooking Mama, raisin and chips * Fixing missing info * Egg man Harry told me to up the keg price * No need to up it all. --- .../VendingMachines/Inventories/chefvend.yml | 16 ++- .../Objects/Consumable/Food/ingredients.yml | 107 ++++++++++++++++++ .../Food/ingredients.rsi/cocoa-chip-big.png | Bin 0 -> 448 bytes .../Consumable/Food/ingredients.rsi/meta.json | 23 ++++ .../Food/ingredients.rsi/pepper-big.png | Bin 0 -> 508 bytes .../Food/ingredients.rsi/raisin-big.png | Bin 0 -> 501 bytes .../Food/ingredients.rsi/salt-big.png | Bin 0 -> 569 bytes 7 files changed, 141 insertions(+), 5 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/ingredients.yml create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/ingredients.rsi/cocoa-chip-big.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/ingredients.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/ingredients.rsi/pepper-big.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/ingredients.rsi/raisin-big.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/ingredients.rsi/salt-big.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml index 8c0eecb347e..78ee1fcc35c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml @@ -1,11 +1,17 @@ - type: vendingMachineInventory id: ChefvendInventory startingInventory: - ReagentContainerFlour: 2 - ReagentContainerCornmeal: 2 - ReagentContainerSugar: 2 - ReagentContainerRice: 2 - FoodCondimentPacketSalt: 4 + ReagentContainerFlour: 3 # Frontier - 2<3 + ReagentContainerCornmeal: 3 # Frontier - 2<3 + ReagentContainerSugar: 3 # Frontier - 2<3 + ReagentContainerRice: 3 # Frontier - 2<3 + ReagentContainerRaisin: 3 # Frontier + ReagentContainerChocolate: 3 # Frontier +# FoodCondimentPacketSalt: 4 # Frontier - Replaced with big salt + ReagentContainerSalt: 3 # Frontier + ReagentContainerPepper: 3 # Frontier + DrinkKegPlasticKetchup: 1 # Frontier - Refills + DrinkKegPlasticMustard: 1 # Frontier - Refills FoodCondimentBottleEnzyme: 2 FoodCondimentBottleHotsauce: 2 FoodCondimentBottleKetchup: 2 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/ingredients.yml new file mode 100644 index 00000000000..97111e3e096 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/ingredients.yml @@ -0,0 +1,107 @@ +# Lots of misc stuff in here, hard to parent it. + +# Powder (For when you throw stuff like flour and it explodes) + +# Reagent Containers + +- type: entity + parent: [ReagentPacketBase, ItemHeftyBase] + id: ReagentContainerSalt + name: salt container + description: A big container of salt. Good for cooking! + components: + - type: Sprite + sprite: _NF/Objects/Consumable/Food/ingredients.rsi + state: salt-big + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: TableSalt + Quantity: 50 + - type: Drink + solution: food + useSound: + path: /Audio/Items/eating_1.ogg + +- type: entity + parent: [ReagentPacketBase, ItemHeftyBase] + id: ReagentContainerPepper + name: pepper container + description: A big container of pepper. Good for cooking! + components: + - type: Sprite + sprite: _NF/Objects/Consumable/Food/ingredients.rsi + state: pepper-big + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: Blackpepper + Quantity: 50 + +- type: entity + parent: BaseItem + id: ReagentContainerRaisin + name: raisin bag + description: A big bag of raisin. Good for baking! + components: + - type: Sprite + sprite: _NF/Objects/Consumable/Food/ingredients.rsi + state: raisin-big + - type: FlavorProfile + flavors: + - raisins + - type: Tag + tags: + - Fruit + - type: Damageable + damageContainer: Inorganic + +- type: entity + parent: ReagentPacketBase + id: ReagentContainerChocolate + name: chocolate chips bag + description: A big bag of chocolate chips. Good for cooking! + components: + - type: Sprite + sprite: _NF/Objects/Consumable/Food/ingredients.rsi + state: cocoa-chip-big + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: CocoaPowder + Quantity: 50 + +- type: entity + parent: DrinkKegPlastic + id: DrinkKegPlasticKetchup + name: ketchup keg + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 600 + reagents: + - ReagentId: Ketchup + Quantity: 600 + - type: StaticPrice + price: 60 + +- type: entity + parent: DrinkKegPlastic + id: DrinkKegPlasticMustard + name: mustard keg + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 600 + reagents: + - ReagentId: Mustard + Quantity: 600 + - type: StaticPrice + price: 60 diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/ingredients.rsi/cocoa-chip-big.png b/Resources/Textures/_NF/Objects/Consumable/Food/ingredients.rsi/cocoa-chip-big.png new file mode 100644 index 0000000000000000000000000000000000000000..791c9a3dca893fb1220d05a11365c3c37af066cb GIT binary patch literal 448 zcmV;x0YCnUP)Px$U`a$lR9J=Wm7#0HKorKmjhF_mgNltp#h6@8MMUfZwG(5mFc}w!sI97>+@#v%TckT)`?P`l1%wI55AgbUSF3gW>J|NqR=2?Mmv~<-005TjmDc3(WH{^Q z7O1dX4LZ{Dc^;7|)1Xj=_Q#X{8e%l?gWUG9uY8j(99xosAWG|{FVYcv|oFL}X{oNZj7 qSpWb44rN$LW=%~1DgXcg2mk;800000(o>TF0000Px$oJmAMR9J=Wl|f4aK@`V-MnNQd@TQ-@ix3MH_yJPvm_*+|7V;Z(2!g&rhao8H z=wUks(rqt6mo9dQLXaXC3Op=o;9)xC>b6?Wu2vBHgN2#p&3pg%=FJR5L`3{Cu`r9O z)l2FBm(Q<<@};~;2qBZn6acridjM8emp|EbyB%!1iD4MZe&_%oSDMEq;s y0Y(RvsXgP7CjbBd4rN$LW=%~1DgXcg2mk;800000(o>TF0000Px$l}SWFR9J=Wl|4(tP!xvWiY>vme&A4|phJhOUAjA2=#tS6T?7YzK%o=|aVS#o z2RH~_9CYj=*r}sXg#HDKwnh=ORtUY3IJ76UHRhgzPTmJXZti`P^X8oU0VouT|4v9I zuud%iK)RT6*A^3j+D>n%ZB|+#07&cy>j7Y1?h!D{8Q0L0Qk@Zv0T`Mk6EfyFqG?tZ zmVMiv5j}}?G3EY>0kfQOJXD0ru50i!w#;do>1 z=X(Ia&C~7Q8Hh(?FrqQo0~=aI^VJw*nW`OJhd7gvH3u$_&b+n|4(x#)c+CPk17spw z$f0(89;nS0a%=-Lt%7VJhpUqd-?8o8t%>JfTLrYaOb4TYbgx$%UVk{uPAo42W-0%z zj{=UHs#hEAz=U+S+E~(ELr=mU*bu_`u>|9or9AFl9?*X4O25y}l@`$;L?1hcd)!x8 z%rpsUM+|~8#f5bm(v03*UH8>Y2ki7LG%GFEM#L%soow8t#XSiX3WWjyz5sZGpdBX@ rL-GIs01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXXu0mjfJK@Ta literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/ingredients.rsi/salt-big.png b/Resources/Textures/_NF/Objects/Consumable/Food/ingredients.rsi/salt-big.png new file mode 100644 index 0000000000000000000000000000000000000000..9a53760e147207b2fca00478708f78ee20535a69 GIT binary patch literal 569 zcmV-90>=G`P)Px$*-1n}R9J=WmBDHgQ51&1!h{KeymJxhzP02mB<0Q66`v~p)MFpabZv|5l% zd=a5PubU>jfy)T}c|N?UU5$a$;W02;h5hz2Z&#lJP`$mwNB>7^acu*avEN?i-lIdl zeC_gj?M7@^2dzOdlq1*FbpT4GIX>^UP5HGklp}_6#4=s6OjkM^8&a|BQnBmtvt_zss#~Ip zHBrUdY;QtCIRX&P0sNYUBvA`a&W->Wo*&MB29o8C1P6oOgm@aX46Lp_n`&ZQyimyW zXP%Ddc@oV+avm(xjr(pWM?BBd{{;TV#JGX1;;C!ZYPF Date: Mon, 8 Jan 2024 23:57:48 +0000 Subject: [PATCH 07/12] Automatic Changelog (#847) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 74b5d11171f..07bbe318be7 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -2729,3 +2729,9 @@ Entries: message: Sprinter was reworked. id: 4734 time: '2024-01-07T20:45:57.0000000+00:00' +- author: ghostprince + changes: + - type: Add + message: NT Has added more ingredients to the ChefVend to allow ease of cooking. + id: 4735 + time: '2024-01-08T23:57:21.0000000+00:00' From b4d3d266e3fe18524463ff81546edfbd495a4504 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Tue, 9 Jan 2024 04:09:46 +0200 Subject: [PATCH 08/12] Shuttle Loader Fix (#851) * Loader * Update loader.yml * Update loader.yml --- Resources/Maps/{ => _NF}/Shuttles/loader.yml | 77 ++++++++++++-------- Resources/Prototypes/_NF/Shipyard/loader.yml | 4 +- 2 files changed, 48 insertions(+), 33 deletions(-) rename Resources/Maps/{ => _NF}/Shuttles/loader.yml (93%) diff --git a/Resources/Maps/Shuttles/loader.yml b/Resources/Maps/_NF/Shuttles/loader.yml similarity index 93% rename from Resources/Maps/Shuttles/loader.yml rename to Resources/Maps/_NF/Shuttles/loader.yml index 787ffc25e6e..84289612009 100644 --- a/Resources/Maps/Shuttles/loader.yml +++ b/Resources/Maps/_NF/Shuttles/loader.yml @@ -3,11 +3,11 @@ meta: postmapinit: false tilemap: 0: Space - 84: FloorSteel - 92: FloorSteelMono - 96: FloorTechMaint - 112: Lattice - 113: Plating + 85: FloorSteel + 93: FloorSteelMono + 97: FloorTechMaint + 113: Lattice + 114: Plating entities: - proto: "" entities: @@ -21,19 +21,19 @@ entities: - chunks: 0,0: ind: 0,0 - tiles: VAAAAAAAVAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAXAAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAcQAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: VQAAAAAAVQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAVQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAVQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAVQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAXQAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAVQAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAVQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,0: ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcQAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAXAAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAVAAAAAAAVAAAAAAAVAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAXQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAVQAAAAAAVQAAAAAAVQAAAAAA version: 6 0,-1: ind: 0,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAVAAAAAAAVAAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAXAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAVQAAAAAAVQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAXQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 type: MapGrid - type: Broadphase @@ -548,26 +548,41 @@ entities: type: Transform - proto: CableHV entities: - - uid: 179 + - uid: 176 + components: + - pos: -1.5,-4.5 + parent: 1 + type: Transform + - uid: 180 + components: + - pos: -1.5,-2.5 + parent: 1 + type: Transform + - uid: 182 + components: + - pos: -0.5,-4.5 + parent: 1 + type: Transform + - uid: 250 components: - pos: -0.5,-2.5 parent: 1 type: Transform - - uid: 249 + - uid: 251 components: - pos: -0.5,-3.5 parent: 1 type: Transform - proto: CableMV entities: - - uid: 181 + - uid: 174 components: - - pos: -0.5,-2.5 + - pos: -1.5,-4.5 parent: 1 type: Transform - - uid: 182 + - uid: 181 components: - - pos: -0.5,-3.5 + - pos: -1.5,-3.5 parent: 1 type: Transform - uid: 183 @@ -580,12 +595,16 @@ entities: - pos: -1.5,-1.5 parent: 1 type: Transform + - uid: 249 + components: + - pos: -1.5,-2.5 + parent: 1 + type: Transform - proto: CableTerminal entities: - - uid: 175 + - uid: 178 components: - - rot: 1.5707963267948966 rad - pos: -1.5,-2.5 + - pos: -0.5,-3.5 parent: 1 type: Transform - proto: CarpetOrange @@ -1293,9 +1312,9 @@ entities: type: AtmosPipeColor - proto: GravityGeneratorMini entities: - - uid: 119 + - uid: 175 components: - - pos: -0.5,-4.5 + - pos: -0.5,-3.5 parent: 1 type: Transform - proto: Grille @@ -1392,10 +1411,9 @@ entities: type: Transform - proto: Gyroscope entities: - - uid: 174 + - uid: 252 components: - - rot: 1.5707963267948966 rad - pos: -1.5,-4.5 + - pos: -0.5,-2.5 parent: 1 type: Transform - proto: LockerCaptainFilled @@ -1435,15 +1453,12 @@ entities: pos: -1.5,-2.5 parent: 1 type: Transform - - on: True - type: FuelGenerator - storage: Plasma: 3000 type: MaterialStorage - bodyType: Static type: Physics - - endTime: 0 - type: InsertingMaterialStorage + - type: InsertingMaterialStorage - type: ItemCooldown - proto: Poweredlight entities: @@ -1590,9 +1605,9 @@ entities: type: Transform - proto: SMESBasic entities: - - uid: 178 + - uid: 179 components: - - pos: -0.5,-2.5 + - pos: -0.5,-4.5 parent: 1 type: Transform - proto: SpawnPointCargoTechnician @@ -1611,9 +1626,9 @@ entities: type: Transform - proto: SubstationBasic entities: - - uid: 176 + - uid: 119 components: - - pos: -0.5,-3.5 + - pos: -1.5,-4.5 parent: 1 type: Transform - proto: Table diff --git a/Resources/Prototypes/_NF/Shipyard/loader.yml b/Resources/Prototypes/_NF/Shipyard/loader.yml index 76b0f527476..fa63cfcc30b 100644 --- a/Resources/Prototypes/_NF/Shipyard/loader.yml +++ b/Resources/Prototypes/_NF/Shipyard/loader.yml @@ -5,12 +5,12 @@ price: 18000 category: Small group: Civilian - shuttlePath: /Maps/Shuttles/loader.yml + shuttlePath: /Maps/_NF/Shuttles/loader.yml - type: gameMap id: Loader mapName: 'NC Loader' - mapPath: /Maps/Shuttles/loader.yml + mapPath: /Maps/_NF/Shuttles/loader.yml minPlayers: 0 stations: Loader: From 4f5f186bcb1342d7b5068709f4afe1a2796fb02a Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Tue, 9 Jan 2024 05:15:07 +0200 Subject: [PATCH 09/12] Unbreak (#852) --- .../en-US/deltav/advertisements/vending/{pride.yml => pride.ftl} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Locale/en-US/deltav/advertisements/vending/{pride.yml => pride.ftl} (100%) diff --git a/Resources/Locale/en-US/deltav/advertisements/vending/pride.yml b/Resources/Locale/en-US/deltav/advertisements/vending/pride.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/advertisements/vending/pride.yml rename to Resources/Locale/en-US/deltav/advertisements/vending/pride.ftl From c020d54b9b610d692c30b513b431a5cac54ef776 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Tue, 9 Jan 2024 05:52:40 +0200 Subject: [PATCH 10/12] Janitor Locker (#583) * Jani SUSsuit * Suit * Locker * Update meta.json * Boots * LockerFill * Cap stuff * Galoshes? * Update service.yml * Update magboots.yml * Jani * Missing files * Janitor Locker Rework * Update service.yml * RSI * Janitor Locker Content * Update meta.json * Update meta.json --- .../_NF/Catalog/Fills/Lockers/service.yml | 14 ++++++ .../_NF/Entities/Clothing/Shoes/magboots.yml | 32 ++++++++++++-- .../Storage/Closets/Lockers/lockers.yml | 26 +++++++++++ .../magboots-galoshes.rsi/equipped-FEET.png | Bin 0 -> 1031 bytes .../Boots/magboots-galoshes.rsi/icon-on.png | Bin 0 -> 469 bytes .../Boots/magboots-galoshes.rsi/icon.png | Bin 0 -> 468 bytes .../magboots-galoshes.rsi/inhand-left.png | Bin 0 -> 353 bytes .../magboots-galoshes.rsi/inhand-right.png | Bin 0 -> 360 bytes .../Boots/magboots-galoshes.rsi/meta.json | 41 ++++++++++++++++++ .../on-equipped-FEET.png | Bin 0 -> 999 bytes .../magboots-galoshes.rsi/on-inhand-left.png | Bin 0 -> 355 bytes .../magboots-galoshes.rsi/on-inhand-right.png | Bin 0 -> 374 bytes .../Structures/Storage/closet.rsi/janitor.png | Bin 0 -> 835 bytes .../Storage/closet.rsi/janitor_door.png | Bin 0 -> 830 bytes .../Storage/closet.rsi/janitor_open.png | Bin 0 -> 814 bytes .../Structures/Storage/closet.rsi/meta.json | 14 +++++- .../Storage/closet.rsi/sparking.png | Bin 0 -> 166 bytes 17 files changed, 122 insertions(+), 5 deletions(-) create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/Lockers/service.yml create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/equipped-FEET.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/icon-on.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/on-equipped-FEET.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/on-inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/on-inhand-right.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/janitor.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/janitor_door.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/janitor_open.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/sparking.png diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/service.yml new file mode 100644 index 00000000000..1afddeb68c7 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/service.yml @@ -0,0 +1,14 @@ +- type: entity + id: LockerJanitorFilled + suffix: Filled + parent: LockerJanitor + components: + - type: StorageFill + contents: + - id: ClothingBeltJanitorFilled + - id: ClothingHeadsetService + - id: MopItem + - id: BoxMousetrap + - id: BoxTrashbag + - id: BoxLightMixed + - id: Plunger diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml index d3b98d6bb62..f9181dc363a 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml @@ -2,7 +2,7 @@ parent: ClothingShoesBootsMag id: ClothingShoesBootsMagCombat name: combat magboots - description: combat magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. + description: Combat magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. components: - type: Sprite sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi @@ -42,7 +42,7 @@ parent: ClothingShoesBootsMagCombat id: ClothingShoesBootsMagMercenary name: mercenary magboots - description: mercenary magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. + description: Mercenary magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. components: - type: Sprite sprite: _NF/Clothing/Shoes/Boots/magboots-mercenary.rsi @@ -56,7 +56,7 @@ parent: ClothingShoesBootsMagCombat id: ClothingShoesBootsMagPirate name: pirate magboots - description: pirate magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. + description: Pirate magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. components: - type: Sprite sprite: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi @@ -66,6 +66,21 @@ - type: Magboots toggleAction: ActionToggleMagbootsPirate +- type: entity + parent: ClothingShoesBootsMag + id: ClothingShoesBootsMagGaloshes + name: galoshes magboots + description: Galoshes magnetic boots, often used during cleaning activity to ensure the user remains safely attached to the floor. + components: + - type: Sprite + sprite: _NF/Clothing/Shoes/Boots/magboots-galoshes.rsi + state: icon + - type: Clothing + sprite: _NF/Clothing/Shoes/Boots/magboots-galoshes.rsi + - type: Magboots + toggleAction: ActionToggleMagbootsGaloshes + - type: NoSlip + - type: entity id: ActionToggleMagbootsCombat parent: ActionBaseToggleMagboots @@ -91,4 +106,13 @@ components: - type: InstantAction icon: { sprite: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi, state: icon } - iconOn: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi/icon-on.png \ No newline at end of file + iconOn: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi/icon-on.png + +- type: entity + id: ActionToggleMagbootsGaloshes + parent: ActionBaseToggleMagboots + noSpawn: true + components: + - type: InstantAction + icon: { sprite: _NF/Clothing/Shoes/Boots/magboots-galoshes.rsi, state: icon } + iconOn: _NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/icon-on.png diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml index bc090347817..8ad7ca3c39c 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -25,3 +25,29 @@ map: ["enum.WeldableLayers.BaseWelded"] - type: AccessReader access: [["Captain"], ["Mercenary"]] + +# Janitor +- type: entity + id: LockerJanitor + parent: LockerBaseSecure + name: janitor locker + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: janitor + stateDoorOpen: janitor_open + stateDoorClosed: janitor_door + - type: Sprite + sprite: _NF/Structures/Storage/closet.rsi + noRot: true + layers: + - state: generic + map: ["enum.StorageVisualLayers.Base"] + - state: generic_door + map: ["enum.StorageVisualLayers.Door"] + - state: locked + map: ["enum.StorageVisualLayers.Lock"] + shader: unshaded + - state: welded + visible: false + map: ["enum.WeldableLayers.BaseWelded"] diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/equipped-FEET.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..859ba9ca7ce95f843df260145a76e8fa509f54e7 GIT binary patch literal 1031 zcmV+i1o-=jP))=wPR0Y45CQVu)tszMfaTQz~1P9T@ zufczytKh022#O%$=I+-b63?|li_{x#&cl1}dpLOmp_FYDz3?a$OTL?#NNTfl^IG#W z5yC`iC6+ZjXDppg@$dS$r9su3gzEMGy}GM4XL<%SvjvY zz}W_L-8)$~`y(~V4p|nwoIrFAI<6tIP|51|oZ~x~UXx#R1-p9?ll$$9-`Egm_uQyW z_W%F_RY^oaRCt{2nz3sXK@`Tn6}vRynmZv2k_E3xqnIlK;RgSJ2tlxsbap8fNpW?M zq&#eGMA$2?h=th5fM5{|8;b;T5Qq>DWFg&kWAWVN*6gishRZ!P@7D~oGraHH@Ah_! zd4QrQilQirq9}@@D2k#eilQjWH6h|`veqIxHZGrk`veSzz}hn#?d=+u)Pbedi~a7l zW!3dE>ZxyxVb#6K+4TL3agW!F*FJP8cHjVDr8y>+(W4d}8#gZc`H;qGKLNh_PoDGc?FMJl!m^Fd4larVz^k{# zF&95OnC{J&>2Gz5`di&_eO3TJ-x*h*r{cMZJ4tcO#q0C5pKBmQe|xj2zr7i*&kEpP z8yGd{&D%>!thq>Q%|)8`Qd%E1X#X@BHArJHr1|Uj#r1qX7}CB`gI}Bd8T{Aaeg;`j z!2gT}AZ(|0MZ7e(Ey|kNTUHr8<0i=kTxKV1|V%f8Vx|& zfHWF_v;k?ZeE{s!;c;fw6HvvZegWS)K>^I7C!mU|eg$8={{n?0rwr&nZK0EttX&bg zMkgU{WD~qG2|62`MNdE#Rs90_{7TOT%X$KOX-K6odTH^f{!dRn1O-sm6R^>ymt&X> zK6|^yZL~?VtY5*Gpa3TI1kA-@CVZHStNRsv`322R0_?Ycc1!>O002ovPDHLkV1gpH B;dlT5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/icon-on.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/icon-on.png new file mode 100644 index 0000000000000000000000000000000000000000..e5b2b09a22948b71889d3e3b9aca836e21d93634 GIT binary patch literal 469 zcmV;`0V@89P)Px$k4Z#9R9J=WlfO#>VHn3hMNKND(2u1EG8BT^8ZM$6Y7Cd4h@gLDY6B8Cy?uu4CO+5)XqMyAG6$PO_>z&E08*fR-)RzNraE;1B?r4l|1^a0n0OW?VW^Q-z`F5vzP!pd-3t`m()4w3J388K91fVu%t!q@DMW+BZ*3AQ0&VX9dTUq=BZ!i7B z5TK#IColdGK&`Y4R9(wF!AP*XZZwa_U`Yc10+2Ef;o#ul(BFIkX?c>0SaZX&00000 LNkvXXu0mjf6FAKd literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/icon.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9e77c247343585f5a301cdb6e637dd382e4e3cb6 GIT binary patch literal 468 zcmV;_0W1EAP)Px$j!8s8R9J=Wld($zVHn1LMVm$`L@hy}VGz{ja1q^5V+axy5j45ARkYL}5J>+( zd!U1X(GWQZ!3}4NP=jb8T%aLb4mLH|@Oj*cde>E(_gn71=l%Ge=X>ux@bK{P7MDFX8yvvM6m z(`Fc}4lq3lG{q+|LO6B6_AiKSL2L)cBhZ|3)(!Mm(J6q<4f_C&GoaPXR#v|tFi8Kj z1ZbJ>x!XSk&>9^B&D07nFtN~Ix0Px$8%ab#RCt{2+M!DWVHn5puVOF{Y%U9eb-^O62@{KdfFPJ<$!xQ0SsIuYT`?bm z!Gi^xAeIFMVaXs|cnvS2MeyAFPA1<^d7tCudG3zmP4@#yk|arzB&AW6gsLQTJ8`W_ z!ubJVR{ei!&~Al6yA>XX@xhOYYtjGN3ryQz$5QHn0M+&_n`^N?y@10ZjGv&{m`#5j zi>U{8JA~zDI68r|9_%#X>N4()C;9v9T1Yvp=o6X^7!|Ox5x>}|h{6Nxw?YZU156smOFh3wkl9bRp>8HrIxWR~S00000NkvXXu0mjfQ)8YW literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..2fe73f4639eac2bac3bc176e3906e485edbc272f GIT binary patch literal 360 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zl{{S>Ln`LH zy|vJrIZ@*H$NNVTKb8pWaXVt6*Pw?PBBAy^ST7lQwmVT-`2R6AYBl zseiHM$+vq;SFbB6R-fy3>G0mQsh4w)-Q&6cXX_)Ccc)!THG7x-b++DUvTf^f@t1F6 ztoB9R30B>Ia(@BqCjOU(TdU$$#2>#@^38Ppstcc)!L9-l3nn?emyhs%@t4_k>0idx zE%)pLzO1!Rn0nzi`?SivU)zEFW3RbB{NrO__|RX&q>^`1U!yy78%VpStDnm{r-UW| D3l*oP literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/meta.json b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/meta.json new file mode 100644 index 00000000000..d4ad31cb0bf --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe Based and edited by Dvir001 (GitHub)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "on-equipped-FEET", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "icon-on" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/on-equipped-FEET.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/on-equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..81a9385cbda5d1429592e27bde97c0421f777ba3 GIT binary patch literal 999 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d>Qb`Ho)PG(@xm{>Z|*86aP zNSl1N>q;?pSr-|jjKT~@kt2bx9|SE4VckDX%{NMMt)i!3p=gW@3;V^R>krm1Sp8s? z0!Np^qi64~D+!(7>ePKjI`7=!>i5+amCOsLnQYF#b~7w6tYQ z%1*yKsC<~k)1>5-PU7Rq6QU-adG(vEu4b}M_wfna4{NQn_#|>fT70WctnbQcFP7Pu zt=9U!zq0Dug@mQm(L%H2njdWCpSAsAwl;?yfAfRa98&TR_Jn-Z_x4kMzbHR+>%H2H z`1Z@)tCqb#aFea%u63mOZ)MX{e34>%<~Wq_S*=st6mas@_c@QPXT(j8FJawXEin1_ z+wS`}1k%6XS>gMgfq}`?)5S5QV$R!HhS?&4BCY2;Ryrx_j7`;?p=BF%ir$L{_@k;*Vbr0z9{+O1?PssgAU)${ha#snbVJ@ z_Kbdhj5+_-&EMAWMXX`k3+JDY?_HP`VG-k6zk|gm?Yftyf5X25PVV;Aw*U7Inb~E3KbuR=u48igx_zGc50*7+o}c_#5GKPAw^y&f z^~cW*H)pTE^#1+SufMB5{#wOQx2JsHUY(=d!sYL$A9vcbSLgRuwxloR<)?n_wg$<| zeQC&azqhB^=g6+?P1j;4|5TX#HPii@`N=KHQj0g9xnHBPUi|aLh;P2uziz!c|6qUH zH{%umxc;m+V8~{^MmiDmn<3=**Pw1vt=y3@>RP<=#Th{*PIvR z+)W)r_dD?frZ<0n!MS4by7&b%{$JgEaMip9N3medKF2V-Rr}v)wya=SRmHTe`cqNQ z=7rA_?*Du{FCz?Ois*q*TgL9pIh_Jxmw(l@2GlXteg3oDF67l^Ut<8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/on-inhand-left.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/on-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..9b0bc0320e62a2cf53652a0bc31cc4f6d812dcec GIT binary patch literal 355 zcmV-p0i6DcP)Px$9Z5t%RCt{2+M!AWK^({NucC70%7Jlx08#J-L?1x0_yB^qaIQf3c&NBRF;lFWyAW4!WNs^>Es)A4zgzJO) zSrvq%O~SD9KQ$ivK!DxzX4rdbQg&f>873cR0GL}GPJR$c2C#73XKShtK>HLP8qbtn z$Xdh64-!t%y?wr?%1e?YNs=TPx$FiAu~RCt{2+ObN*P#A{cSE;3oOTob*f)^lo2i`!%#S0MJI!W;g+}w5PBzOf5 z;#`C-g${y(APViEAatpqkRc918a2?SR88c4mYl=M2_HWv)A>P?BuSDaNwKg)6n2Oj zwfGr!h>mxO{yNvBCe1&Wwt4@2G2#{Ko-H{ zIj)!i~xRw(t# zy7`e9HdAB>Iv$N$+$%`lo@hCDC&@*R@t)poNVg%Ny`y(HPjRhHc#Q7t?*XL{qhQc( zU69rL=0Gq?1tB8M>I>$8>WOAk4%A+1#ON%g4$W`txJ5P)HM5wZDzTd zLD5Qu?f>pP$#7u#iV%B+!F$M{c84!l>+onu1J)_Gk=)hQ<>2W3iEuHK-dK&Xg z8i3^g4?YZ{y>L>6={{|d^`ok5j6s})DmBRHq{&4`sH>E`^St}RhiZNJg z!Z8B^PY&XTmC7M~(W{0Uv8Sc8ZZ2>tv=EKX&!;b6Yc3uSA8kH6VFsgTHiMyqO6ivO z81i9lJNIY<47d<@`6c&yE@C{`3I=b#%T1rZzk51L$nNLW^>5>G1LdNvi{-1;DmjU< T_M_vs%lBqcxmYWV^UaO#OC$f1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/janitor_door.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/janitor_door.png new file mode 100644 index 0000000000000000000000000000000000000000..575b90fd3598fc2bedb39f40e0c771f1074cfdee GIT binary patch literal 830 zcmd5(&ubGw6rMB@)kJQxwA6p`K}Dw6hA!Q8w^1^mT3KqPs8@BF6cUK1 zz_A^fVx_@K6X%>m2!SN<3^1JqHH)W+meF_?G$15Fv;<)wJs!UDG*#{su7f21fAB#M z=4CYxZaJj|Bz{8v=-(h)ApUTL3L)(mU?HUaj(==G?tT8WOu11o`J&#tQXvPf8^+wq zqf6}*k;wCzJ-Zc-ZAACR=zXTPqkym@AzQ%61@S~_N~cVH@- zFwoPfm^%7YTiNReViC>A USou-;c;Vh8D&$J$=9x<8JKfp=E&u=k literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/janitor_open.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/janitor_open.png new file mode 100644 index 0000000000000000000000000000000000000000..c087bdb226e0cf628b96285b89ceb7b58a23eb5b GIT binary patch literal 814 zcmd5(O=uHA6rR`ymSW3@ISeI-hepVh9I}|h4g~DTrcD+b!?gYrunQ?l3 z#bn7rjG$tvXe#2NP-ww}t%|eRsgpl4$+EzG2XBb`R?RH~>kieVVk+Bpmy^_~nXlp`F*LTXd9i0?fzg9EviRCg) zT43T)yTEI<w z-tz1I>Y`^DhD?LV)c`BzL0RE4TuM zG?7tIIfW@s44fEK#}s1>A|MkWEa4X&8D(a|lu0mwu`n~kOaOYiy5^a2+-K4PB>#W# z&hn39HFwUb>?qMcfj{~;U<>pgu5hiPHF+}<{4jSy&flBu|GYOI91gy^ zvb8^W?fk9om)i#>XD42K+!a_N_n*!jAIg6Dwy*K<+1xbB^c7BKCPqfc0LI3TN;gMu ObfQcuYcC!?d-*$Dr~|(M literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json index e7a90856b44..53980c8fa3a 100644 --- a/Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json @@ -4,9 +4,18 @@ "x": 32, "y": 32 }, - "copyright": "Taken from tgstation, mercenary locker is a resprited armory locker by erhardsteinhauer (discord)", + "copyright": "Taken from tgstation, mercenary locker is a resprited armory locker by erhardsteinhauer (discord), janitor is by SungYandy", "license": "CC-BY-SA-3.0", "states": [ + { + "name": "janitor" + }, + { + "name": "janitor_door" + }, + { + "name": "janitor_open" + }, { "name": "generic" }, @@ -30,6 +39,9 @@ }, { "name": "welded" + }, + { + "name": "sparking" } ] } diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/sparking.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/sparking.png new file mode 100644 index 0000000000000000000000000000000000000000..b027535b060972adc1e3d20cdf1c07297c249ac2 GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0P3?wHke>@jRu?6^qxB}@PKW5l4zD@zM7)yfu zf*Bm1-ADs+{5)M8Lp07OCrFemVC<4)X}H07q=MlH*NICBiR?2t_5* Date: Tue, 9 Jan 2024 03:53:06 +0000 Subject: [PATCH 11/12] Automatic Changelog (#583) --- Resources/Changelog/Changelog.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 07bbe318be7..1fea79dd0ba 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -2735,3 +2735,11 @@ Entries: message: NT Has added more ingredients to the ChefVend to allow ease of cooking. id: 4735 time: '2024-01-08T23:57:21.0000000+00:00' +- author: SungYandy + changes: + - type: Add + message: >- + NT Provided the janitors with fancy new lockers, coming to your ships + soon. + id: 4736 + time: '2024-01-09T03:52:40.0000000+00:00' From 0277223a52ab929995f1c1c4cb5e68f726300d55 Mon Sep 17 00:00:00 2001 From: Debug <49997488+DebugOk@users.noreply.github.com> Date: Tue, 9 Jan 2024 04:57:27 +0100 Subject: [PATCH 12/12] Create shipyard tests (#485) * Create ShipyardTests.cs * Fix shipyard test failures * Remove map changes * Update rosebudmki.yml --------- Co-authored-by: Dvir --- .../Tests/_NF/ShipyardTests.cs | 100 ++++++++++++++++++ .../Entities/Clothing/Head/misc.yml | 2 +- .../Prototypes/_NF/Shipyard/marauder.yml | 2 +- .../Prototypes/_NF/Shipyard/svnugget.yml | 2 +- Resources/Prototypes/_NF/Shipyard/svtide.yml | 2 +- 5 files changed, 104 insertions(+), 4 deletions(-) create mode 100644 Content.IntegrationTests/Tests/_NF/ShipyardTests.cs diff --git a/Content.IntegrationTests/Tests/_NF/ShipyardTests.cs b/Content.IntegrationTests/Tests/_NF/ShipyardTests.cs new file mode 100644 index 00000000000..9e3cbac5a9d --- /dev/null +++ b/Content.IntegrationTests/Tests/_NF/ShipyardTests.cs @@ -0,0 +1,100 @@ +using System.Linq; +using Content.Server.Cargo.Systems; +using Content.Shared.Shipyard.Prototypes; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; +using Robust.Shared.Map; +using Robust.Shared.Map.Components; +using Robust.Shared.Prototypes; + +namespace Content.IntegrationTests.Tests._NF; + +[TestFixture] +public sealed class ShipyardTest +{ + [Test] + public async Task CheckAllShuttleGrids() + { + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; + + var entManager = server.ResolveDependency(); + var protoManager = server.ResolveDependency(); + var mapLoader = entManager.System(); + var mapManager = server.ResolveDependency(); + + await server.WaitPost(() => + { + Assert.Multiple(() => + { + foreach (var vessel in protoManager.EnumeratePrototypes()) + { + var mapId = mapManager.CreateMap(); + + try + { + Assert.That(mapLoader.TryLoad(mapId, vessel.ShuttlePath.ToString(), out var roots)); + Assert.That(roots.Where(uid => entManager.HasComponent(uid)), Is.Not.Empty); + } + catch (Exception ex) + { + throw new Exception($"Failed to load shuttle {vessel.ShuttlePath}", ex); + } + + try + { + mapManager.DeleteMap(mapId); + } + catch (Exception ex) + { + throw new Exception($"Failed to delete map {vessel.ShuttlePath}", ex); + } + } + }); + }); + await server.WaitRunTicks(1); + await pair.CleanReturnAsync(); + } + + [Test] + public async Task NoShipyardShipArbitrage() + { + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; + + var entManager = server.ResolveDependency(); + var mapLoader = server.ResolveDependency().GetEntitySystem(); + var mapManager = server.ResolveDependency(); + var protoManager = server.ResolveDependency(); + var pricing = server.ResolveDependency().GetEntitySystem(); + + await server.WaitAssertion(() => + { + Assert.Multiple(() => + { + foreach (var vessel in protoManager.EnumeratePrototypes()) + { + var mapId = mapManager.CreateMap(); + double combinedPrice = 0; + + Assert.That(mapLoader.TryLoad(mapId, vessel.ShuttlePath.ToString(), out var roots)); + var shuttle = roots.FirstOrDefault(uid => entManager.HasComponent(uid)); + + pricing.AppraiseGrid(shuttle, null, (uid, price) => + { + combinedPrice += price; + }); + + Assert.That(combinedPrice, Is.AtMost(vessel.Price), + $"Found arbitrage on {vessel.ID} shuttle! Cost is {vessel.Price} but sell is {combinedPrice}!"); + Assert.That(vessel.Price - combinedPrice, Is.GreaterThan(vessel.Price * 0.05), + $"Arbitrage possible on {vessel.ID}. {vessel.Price} - {combinedPrice} = {vessel.Price - combinedPrice} > 5% of the buy price!"); + + mapManager.DeleteMap(mapId); + } + }); + }); + + await pair.CleanReturnAsync(); + } +} diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index f8c633c5d45..4aa4372b628 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -150,7 +150,7 @@ sprite: Clothing/Head/Misc/fancycrown.rsi - type: Clothing sprite: Clothing/Head/Misc/fancycrown.rsi - - type: MobPrice + - type: StaticPrice price: 3000 - type: AddAccentClothing accent: MobsterAccent diff --git a/Resources/Prototypes/_NF/Shipyard/marauder.yml b/Resources/Prototypes/_NF/Shipyard/marauder.yml index 165172c731e..c97a5756715 100644 --- a/Resources/Prototypes/_NF/Shipyard/marauder.yml +++ b/Resources/Prototypes/_NF/Shipyard/marauder.yml @@ -2,7 +2,7 @@ id: Marauder name: NSF Marauder description: A heavy corvette, the marauder class is a dedicated deep space patrol vessel outfitted with a reduced radar cross-section and heavily fortified against hostile assault. - price: 100220 + price: 111550 category: Large group: Security shuttlePath: /Maps/Shuttles/marauder.yml diff --git a/Resources/Prototypes/_NF/Shipyard/svnugget.yml b/Resources/Prototypes/_NF/Shipyard/svnugget.yml index 745546f3c31..b8b06329a9e 100644 --- a/Resources/Prototypes/_NF/Shipyard/svnugget.yml +++ b/Resources/Prototypes/_NF/Shipyard/svnugget.yml @@ -2,7 +2,7 @@ id: svnugget name: SV Nugget description: A flying hunk of wood and metal disguised as a kitchen shuttle. Not FDA approved. - price: 12250 + price: 12985 category: Small group: Scrap shuttlePath: /Maps/Shuttles/svnugget.yml diff --git a/Resources/Prototypes/_NF/Shipyard/svtide.yml b/Resources/Prototypes/_NF/Shipyard/svtide.yml index 5795fc84319..b2d4a6390ae 100644 --- a/Resources/Prototypes/_NF/Shipyard/svtide.yml +++ b/Resources/Prototypes/_NF/Shipyard/svtide.yml @@ -2,7 +2,7 @@ id: svtide name: SV Tide description: A cheaply made mass-produced shuttle made from salvaged wrecks. For the seasoned assistant. - price: 9150 + price: 9700 category: Small group: Scrap shuttlePath: /Maps/Shuttles/svtide.yml