From 26ed235ce141c9f5fe853c846ee436deab9c84e4 Mon Sep 17 00:00:00 2001 From: "Alice \"Arimah\" Heurlin" <30327355+arimah@users.noreply.github.com> Date: Mon, 3 Jun 2024 20:42:26 +0200 Subject: [PATCH 01/25] Ceres (Update): Restock boxes + various tweaks (#1456) * Update Ceres with restock boxes & other tweaks * Update Ceres according to review * Add beakers to service techfab recipes --- .../Locale/en-US/_NF/guidebook/guides.ftl | 1 + Resources/Maps/_NF/Shuttles/ceres.yml | 1170 +++++++++-------- .../Entities/Structures/Machines/lathe.yml | 2 + .../Prototypes/_NF/Guidebook/shipyard.yml | 6 + Resources/Prototypes/_NF/Shipyard/ceres.yml | 4 +- .../_NF/Guidebook/Shipyard/Ceres.xml | 107 ++ 6 files changed, 749 insertions(+), 541 deletions(-) create mode 100644 Resources/ServerInfo/_NF/Guidebook/Shipyard/Ceres.xml diff --git a/Resources/Locale/en-US/_NF/guidebook/guides.ftl b/Resources/Locale/en-US/_NF/guidebook/guides.ftl index 8dfafe82a29..f6e62550a42 100644 --- a/Resources/Locale/en-US/_NF/guidebook/guides.ftl +++ b/Resources/Locale/en-US/_NF/guidebook/guides.ftl @@ -3,6 +3,7 @@ guide-entry-bank = NT Galactic Bank guide-entry-shipyard = Shipyard guide-entry-shipyard-ambition = Ambition guide-entry-shipyard-brigand = Brigand +guide-entry-shipyard-ceres = Ceres guide-entry-shipyard-gasbender = Gasbender guide-entry-shipyard-harbormaster = Harbormaster guide-entry-shipyard-kilderkin = Kilderkin diff --git a/Resources/Maps/_NF/Shuttles/ceres.yml b/Resources/Maps/_NF/Shuttles/ceres.yml index 95074bd496e..695e02d5b38 100644 --- a/Resources/Maps/_NF/Shuttles/ceres.yml +++ b/Resources/Maps/_NF/Shuttles/ceres.yml @@ -43,19 +43,19 @@ entities: version: 6 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXgAAAAAAXgAAAAACXgAAAAACXgAAAAAAXgAAAAAAfQAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXgAAAAAAXgAAAAACXgAAAAADXgAAAAADXgAAAAADPwAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXgAAAAADXgAAAAACXgAAAAAAXgAAAAABXgAAAAADfQAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAACfQAAAAAAfQAAAAAAZwAAAAADfQAAAAAAawAAAAAAawAAAAAAawAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAeQAAAAADeQAAAAAAeQAAAAADfQAAAAAAawAAAAAAawAAAAAAawAAAAAAZgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAeQAAAAABeQAAAAADeQAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAeQAAAAAAeQAAAAADeQAAAAABfQAAAAAALgAAAAADAAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIgAAAAAAIgAAAAADfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAADfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAIwAAAAADIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAABIgAAAAABIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAACIgAAAAADIgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAIgAAAAABIgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAABfQAAAAAAIwAAAAADIgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAHgAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXgAAAAAAXgAAAAACXgAAAAACXgAAAAAAXgAAAAAAfQAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXgAAAAAAXgAAAAACXgAAAAADXgAAAAADXgAAAAADPwAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXgAAAAADXgAAAAACXgAAAAAAXgAAAAABXgAAAAADfQAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAACfQAAAAAAfQAAAAAAZwAAAAADfQAAAAAAawAAAAAAawAAAAAAawAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAeQAAAAADeQAAAAAAeQAAAAADfQAAAAAAawAAAAAAawAAAAAAawAAAAAAZgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAeQAAAAABeQAAAAADeQAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAeQAAAAAAeQAAAAADeQAAAAABfQAAAAAALgAAAAADAAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIgAAAAAAIgAAAAADfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAADfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAIwAAAAADIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAABIgAAAAABIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAACIgAAAAADIgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAIgAAAAABIgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAABfQAAAAAAIwAAAAADIgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAHgAAAAAA version: 6 0,-1: ind: 0,-1 - tiles: PwAAAAAAfQAAAAAAcAAAAAACcAAAAAACcAAAAAACcAAAAAABcAAAAAADbwAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAdAAAAAACcAAAAAAAcAAAAAABcAAAAAAAcAAAAAACcAAAAAACbwAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAfQAAAAAAbwAAAAADbwAAAAADbwAAAAADbwAAAAADbwAAAAACbwAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAdAAAAAADdAAAAAABfQAAAAAAdAAAAAADdAAAAAAAdAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAXAAAAAACXAAAAAADXAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAXAAAAAAAXAAAAAACXAAAAAABIgAAAAAAHgAAAAADHgAAAAABIwAAAAACIwAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAABLgAAAAABLgAAAAACIwAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAACfQAAAAAAfAAAAAAAAAAAAAAALgAAAAABfQAAAAAAHgAAAAADHgAAAAADHgAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAACHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAABfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAADIgAAAAABIwAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAABIgAAAAACHgAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAAIgAAAAABIgAAAAACHgAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAACIgAAAAABHgAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAABIwAAAAAAfQAAAAAALgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAACfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: PwAAAAAAfQAAAAAAcAAAAAACcAAAAAACcAAAAAACcAAAAAABcAAAAAADbwAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAdAAAAAACcAAAAAAAcAAAAAABcAAAAAAAcAAAAAACcAAAAAACbwAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAfQAAAAAAbwAAAAADbwAAAAADbwAAAAADbwAAAAADbwAAAAACbwAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAdAAAAAADdAAAAAABfQAAAAAAdAAAAAADdAAAAAAAdAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAXAAAAAACXAAAAAADXAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAXAAAAAAAXAAAAAACXAAAAAABIgAAAAAAHgAAAAADHgAAAAABIwAAAAACIwAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAABLgAAAAABLgAAAAACIwAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAACfQAAAAAAfAAAAAAAAAAAAAAALgAAAAABfQAAAAAAHgAAAAADHgAAAAADHgAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAHgAAAAACHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAABfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAADIgAAAAABIwAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAABIgAAAAACHgAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAAIgAAAAABIgAAAAACHgAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAACIgAAAAABHgAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAABIwAAAAAAfQAAAAAALgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAACfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-2: ind: -1,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAADfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAADfQAAAAAAIwAAAAAAIwAAAAABIwAAAAADfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIwAAAAADHgAAAAABHgAAAAADHgAAAAACfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIwAAAAABHgAAAAABfQAAAAAAZwAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIwAAAAAAHgAAAAACZwAAAAABXgAAAAADXgAAAAABXgAAAAACXgAAAAACXgAAAAADXgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAACfQAAAAAAfQAAAAAAXgAAAAACXgAAAAAAXgAAAAADXgAAAAABXgAAAAAAXgAAAAABXgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAXgAAAAADXgAAAAADXgAAAAACXgAAAAACXgAAAAADXgAAAAACXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXgAAAAABXgAAAAACXgAAAAAAXgAAAAAAXgAAAAACXgAAAAABXgAAAAAC + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAADfQAAAAAAIwAAAAAAIwAAAAABIwAAAAADIgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIwAAAAADHgAAAAABHgAAAAADHgAAAAACIgAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIwAAAAABHgAAAAABfQAAAAAAZwAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIwAAAAAAHgAAAAACZwAAAAABXgAAAAADXgAAAAABXgAAAAACXgAAAAACXgAAAAADXgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAACfQAAAAAAfQAAAAAAXgAAAAACXgAAAAAAXgAAAAADXgAAAAABXgAAAAAAXgAAAAABXgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAXgAAAAADXgAAAAADXgAAAAACXgAAAAACXgAAAAADXgAAAAACXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXgAAAAABXgAAAAACXgAAAAAAXgAAAAAAXgAAAAACXgAAAAABXgAAAAAC version: 6 0,-2: ind: 0,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAALQAAAAAALQAAAAAALQAAAAAAfQAAAAAALgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAALQAAAAAALQAAAAAALQAAAAAALQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALQAAAAAALQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACZwAAAAADbwAAAAACbwAAAAACbwAAAAADbwAAAAAAbwAAAAACdAAAAAAALQAAAAAALQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACfQAAAAAAbwAAAAADbwAAAAADbwAAAAAAbwAAAAACbwAAAAABfQAAAAAAfQAAAAAAfQAAAAAALgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACbwAAAAABcAAAAAABcAAAAAAAcAAAAAABcAAAAAAAcAAAAAABbwAAAAADfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAABbwAAAAABcAAAAAACcAAAAAAAcAAAAAADcAAAAAABcAAAAAADbwAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAALQAAAAAALQAAAAAALQAAAAAALQAAAAAAfQAAAAAALgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAALQAAAAAALQAAAAAALQAAAAAALQAAAAAALQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALQAAAAAALQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACZwAAAAADbwAAAAACbwAAAAACbwAAAAADbwAAAAAAbwAAAAACdAAAAAAALQAAAAAALQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACfQAAAAAAbwAAAAADbwAAAAADbwAAAAAAbwAAAAACbwAAAAABfQAAAAAAfQAAAAAAfQAAAAAALgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACbwAAAAABcAAAAAABcAAAAAAAcAAAAAABcAAAAAAAcAAAAAABbwAAAAADfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAABbwAAAAABcAAAAAACcAAAAAAAcAAAAAADcAAAAAABcAAAAAADbwAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 - type: Broadphase - type: Physics @@ -83,15 +83,15 @@ entities: color: '#FFFFFFFF' id: Bot decals: - 162: 8,-10 - 163: 8,-11 + 152: 8,-10 + 153: 8,-11 - node: color: '#FFFFFFFF' id: Box decals: - 159: 7,-11 - 168: -3,-12 - 169: -2,-12 + 151: 7,-11 + 154: -3,-12 + 155: -2,-12 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerNe @@ -120,12 +120,12 @@ entities: color: '#FFFFFFFF' id: BrickTileDarkEndE decals: - 112: 7,-10 + 110: 7,-10 - node: color: '#FFFFFFFF' id: BrickTileDarkEndW decals: - 113: 6,-10 + 111: 6,-10 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerNe @@ -198,37 +198,37 @@ entities: color: '#334E6DC8' id: BrickTileWhiteInnerNe decals: - 115: 3,-12 + 113: 3,-12 - node: color: '#EFB34196' id: BrickTileWhiteInnerNw decals: - 121: 0,-12 + 119: 0,-12 - node: color: '#80C71FFF' id: BrickTileWhiteInnerSe decals: - 133: -1,-7 + 126: -1,-7 - node: color: '#334E6DC8' id: BrickTileWhiteInnerSw decals: - 117: 5,-10 + 115: 5,-10 - node: color: '#80C71FFF' id: BrickTileWhiteInnerSw decals: - 134: 1,-7 + 127: 1,-7 - node: color: '#EFB34196' id: BrickTileWhiteInnerSw decals: - 130: 0,-10 + 123: 0,-10 - node: color: '#334E6DC8' id: BrickTileWhiteLineE decals: - 114: 3,-11 + 112: 3,-11 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineE @@ -239,7 +239,7 @@ entities: color: '#80C71FFF' id: BrickTileWhiteLineN decals: - 135: 0,-9 + 128: 0,-9 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineN @@ -251,7 +251,7 @@ entities: color: '#80C71FFF' id: BrickTileWhiteLineS decals: - 132: 0,-7 + 125: 0,-7 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineS @@ -263,12 +263,12 @@ entities: color: '#334E6DC8' id: BrickTileWhiteLineW decals: - 116: 5,-11 + 114: 5,-11 - node: color: '#EFB34196' id: BrickTileWhiteLineW decals: - 120: 0,-11 + 118: 0,-11 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineW @@ -328,72 +328,72 @@ entities: color: '#474F52D3' id: Dirt decals: - 142: -7,-23 - 143: -9,-21 + 135: -7,-23 + 136: -9,-21 - node: cleanable: True color: '#474F52B7' id: DirtHeavyMonotile decals: - 144: -9,-22 + 137: -9,-22 - node: cleanable: True color: '#474F52DF' id: DirtHeavyMonotile decals: - 140: -8,-23 - 141: -9,-20 + 133: -8,-23 + 134: -9,-20 - node: cleanable: True color: '#474F52F2' id: DirtHeavyMonotile decals: - 145: -6,-23 + 138: -6,-23 - node: cleanable: True color: '#474F527F' id: DirtLight decals: - 150: -8,-21 + 143: -8,-21 - node: cleanable: True color: '#474F5295' id: DirtLight decals: - 146: -8,-22 - 149: -7,-22 + 139: -8,-22 + 142: -7,-22 - node: cleanable: True color: '#FFFFFFFF' id: DirtLight decals: - 137: 1,-12 - 138: 0,-10 - 139: 2,-11 - 151: -6,-20 + 130: 1,-12 + 131: 0,-10 + 132: 2,-11 + 144: -6,-20 - node: cleanable: True color: '#474F529E' id: DirtMedium decals: - 147: -8,-20 + 140: -8,-20 - node: cleanable: True color: '#474F52D6' id: DirtMedium decals: - 148: -6,-22 + 141: -6,-22 - node: cleanable: True color: '#FFFFFFFF' id: DirtMedium decals: - 136: 0,-12 + 129: 0,-12 - node: color: '#334E6DC8' id: MiniTileCheckerAOverlay decals: - 118: 4,-11 + 116: 4,-11 - node: color: '#80C71FFF' id: MiniTileCheckerAOverlay @@ -418,45 +418,45 @@ entities: 17: -2,-4 18: -2,-3 19: -1,-4 - 131: 0,-8 + 124: 0,-8 - node: color: '#EFB34196' id: MiniTileCheckerBOverlay decals: - 119: -1,-11 + 117: -1,-11 - node: color: '#791500FF' id: MiniTileWhiteInnerNe decals: - 157: -3,-17 + 150: -3,-17 - node: color: '#791500FF' id: MiniTileWhiteLineE decals: - 124: -3,-14 - 152: -3,-15 - 153: -3,-16 + 122: -3,-14 + 145: -3,-15 + 146: -3,-16 - node: color: '#791500FF' id: MiniTileWhiteLineN decals: - 154: -2,-17 - 155: -1,-17 - 156: 0,-17 + 147: -2,-17 + 148: -1,-17 + 149: 0,-17 - node: color: '#FFFFFFFF' id: WarnLineN decals: 54: 2,-13 55: 3,-13 - 122: -6,-12 + 120: -6,-12 - node: color: '#FFFFFFFF' id: WarnLineW decals: 52: 2,-13 53: 3,-13 - 123: -6,-12 + 121: -6,-12 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNe @@ -501,107 +501,92 @@ entities: version: 2 data: tiles: + 0,-1: + 0: 14335 0,0: - 0: 3 1: 4 -1,0: 1: 4 - 0: 8 - -1,-2: - 1: 276 - 0: 65256 -1,-1: - 0: 61183 - 1: 256 - 0,-2: - 0: 65523 - 1: 4 - 0,-1: - 0: 65535 - 1,-2: - 1: 2418 - 0: 4236 - 1,-1: - 0: 17 + 0: 36078 1: 256 -3,-3: 1: 8 - 0: 34944 + -2,-3: + 0: 30580 -3,-2: - 0: 8 1: 128 - -2,-4: - 0: 65535 - -2,-3: - 0: 65535 -2,-2: - 0: 55 - 1: 968 + 0: 3 + 2: 968 + -2,-4: + 0: 28398 + -2,-5: + 0: 61167 -1,-4: - 0: 65535 + 0: 3067 -1,-3: - 0: 36863 - 1: 20480 - 0,-4: + 0: 247 + 1: 4096 + 2: 16384 + -1,-2: + 2: 276 + 0: 60544 + -1,-5: 0: 65535 + 0,-4: + 0: 52733 0,-3: - 0: 16383 - 1: 16384 + 0: 4607 + 2: 16384 + 0,-2: + 0: 63281 + 2: 4 + 0,-5: + 0: 65503 1,-4: - 0: 65535 - 1,-3: 0: 61439 + 1,-3: + 0: 52976 1: 4096 - 2,-4: - 0: 4369 + 1,-2: + 2: 2418 + 0: 8 + 1,-1: + 1: 256 + 1,-5: + 0: 65407 2,-3: - 0: 13105 + 0: 4368 1: 2 2,-2: - 0: 19 - 1: 288 - -2,-5: - 0: 65535 + 0: 1 + 2: 256 + 1: 32 + -3,-6: + 1: 72 + 0: 35840 + -3,-5: + 0: 12 + 1: 64 + 2: 2048 -2,-6: - 0: 65527 - 1: 8 + 0: 24565 -1,-6: - 0: 61671 - 1: 3856 - -1,-5: - 0: 65535 + 1: 1 + 2: 3616 0,-6: - 0: 61692 - 1: 3840 - 0,-5: - 0: 65535 + 2: 3968 1,-6: - 0: 65261 - 1: 274 - 1,-5: - 0: 65535 - 2,-5: - 0: 4407 - 1: 576 - -2,-7: - 0: 65024 - -1,-7: - 0: 29440 - 0,-7: - 0: 51200 - 1,-7: - 0: 65280 - 2,-7: - 0: 4096 + 1: 1 + 0: 3808 2,-6: - 0: 30513 + 0: 13072 1: 66 - -3,-6: - 1: 72 - 0: 52352 - -3,-5: - 0: 140 - 1: 2112 + 2,-5: + 0: 3 + 2: 512 + 1: 64 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -633,6 +618,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + immutable: True + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -652,7 +652,7 @@ entities: - 775 - 419 - 382 - - 677 + - 685 - 566 - 417 - 418 @@ -666,8 +666,6 @@ entities: - 590 - 299 - 774 - - type: AtmosDevice - joinedGrid: 2 - uid: 494 components: - type: Transform @@ -677,9 +675,7 @@ entities: devices: - 241 - 301 - - 458 - - type: AtmosDevice - joinedGrid: 2 + - 459 - uid: 495 components: - type: Transform @@ -691,8 +687,6 @@ entities: - 646 - 698 - 771 - - type: AtmosDevice - joinedGrid: 2 - uid: 585 components: - type: Transform @@ -700,12 +694,10 @@ entities: parent: 2 - type: DeviceList devices: - - 283 + - 284 - 265 - 299 - 769 - - type: AtmosDevice - joinedGrid: 2 - uid: 588 components: - type: Transform @@ -715,7 +707,7 @@ entities: devices: - 180 - 382 - - 422 + - 423 - 416 - 415 - 419 @@ -726,18 +718,17 @@ entities: - 529 - 496 - 396 - - 677 - - type: AtmosDevice - joinedGrid: 2 + - 685 - proto: AirCanister entities: - - uid: 802 + - uid: 803 components: - type: Transform + anchored: True pos: 7.5,-10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 + - type: Physics + bodyType: Static - proto: AirlockCommand entities: - uid: 130 @@ -778,12 +769,12 @@ entities: - type: Transform pos: 0.5,-7.5 parent: 2 - - uid: 546 + - uid: 547 components: - type: Transform pos: 1.5,-19.5 parent: 2 - - uid: 671 + - uid: 677 components: - type: Transform pos: 1.5,-14.5 @@ -859,6 +850,22 @@ entities: - type: Transform pos: 8.5,-21.5 parent: 2 +- proto: AlwaysPoweredlightGreen + entities: + - uid: 818 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-6.5 + parent: 2 +- proto: AlwaysPoweredlightRed + entities: + - uid: 389 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-6.5 + parent: 2 - proto: APCBasic entities: - uid: 457 @@ -956,36 +963,26 @@ entities: - type: Transform pos: 2.5,-21.5 parent: 2 - - uid: 531 - components: - - type: Transform - pos: 4.5,-22.5 - parent: 2 - uid: 533 components: - type: Transform pos: -0.5,-21.5 parent: 2 - - uid: 573 + - uid: 572 components: - type: Transform - pos: -3.5,-21.5 + pos: -3.5,-23.5 parent: 2 - - uid: 580 + - uid: 575 components: - type: Transform - pos: 4.5,-21.5 + pos: 4.5,-23.5 parent: 2 - uid: 581 components: - type: Transform pos: 5.5,-23.5 parent: 2 - - uid: 582 - components: - - type: Transform - pos: -4.5,-23.5 - parent: 2 - uid: 583 components: - type: Transform @@ -1014,7 +1011,7 @@ entities: - uid: 696 components: - type: Transform - pos: -3.5,-22.5 + pos: 3.5,-22.5 parent: 2 - uid: 703 components: @@ -1041,6 +1038,11 @@ entities: - type: Transform pos: 9.5,-23.5 parent: 2 + - uid: 729 + components: + - type: Transform + pos: -2.5,-22.5 + parent: 2 - uid: 747 components: - type: Transform @@ -1141,9 +1143,29 @@ entities: - type: Transform pos: -3.5,-1.5 parent: 2 +- proto: BenchSofaLeft + entities: + - uid: 739 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,-22.5 + parent: 2 + - type: Physics + bodyType: Static +- proto: BenchSofaRight + entities: + - uid: 286 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,-21.5 + parent: 2 + - type: Physics + bodyType: Static - proto: BoozeDispenser entities: - - uid: 228 + - uid: 229 components: - type: Transform pos: -0.5,-13.5 @@ -1155,6 +1177,50 @@ entities: - type: Transform pos: -0.73503387,-5.6378756 parent: 2 +- proto: ButtonFrameCaution + entities: + - uid: 578 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-6.5 + parent: 2 + - uid: 580 + components: + - type: Transform + pos: 1.5,-13.5 + parent: 2 + - uid: 582 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-18.5 + parent: 2 + - uid: 654 + components: + - type: Transform + pos: 6.5,-7.5 + parent: 2 + - uid: 813 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,-20.5 + parent: 2 +- proto: ButtonFrameGrey + entities: + - uid: 640 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-20.5 + parent: 2 + - uid: 649 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,-8.5 + parent: 2 - proto: CableApcExtension entities: - uid: 100 @@ -1182,20 +1248,15 @@ entities: - type: Transform pos: -7.5,-19.5 parent: 2 - - uid: 127 - components: - - type: Transform - pos: -2.5,-14.5 - parent: 2 - uid: 128 components: - type: Transform - pos: -3.5,-14.5 + pos: -2.5,-14.5 parent: 2 - uid: 129 components: - type: Transform - pos: -5.5,-14.5 + pos: -3.5,-14.5 parent: 2 - uid: 148 components: @@ -1205,14 +1266,19 @@ entities: - uid: 149 components: - type: Transform - pos: -1.5,-14.5 + pos: -5.5,-14.5 parent: 2 - uid: 158 components: - type: Transform - pos: -0.5,-14.5 + pos: -1.5,-14.5 parent: 2 - uid: 167 + components: + - type: Transform + pos: -0.5,-14.5 + parent: 2 + - uid: 168 components: - type: Transform pos: -0.5,-15.5 @@ -1644,12 +1710,12 @@ entities: parent: 2 - proto: CableHV entities: - - uid: 119 + - uid: 127 components: - type: Transform pos: -3.5,-11.5 parent: 2 - - uid: 229 + - uid: 234 components: - type: Transform pos: -1.5,-11.5 @@ -1659,19 +1725,19 @@ entities: - type: Transform pos: -1.5,-11.5 parent: 2 - - uid: 539 + - uid: 545 components: - type: Transform pos: -3.5,-10.5 parent: 2 - - uid: 709 + - uid: 770 components: - type: Transform pos: -2.5,-11.5 parent: 2 - proto: CableMV entities: - - uid: 168 + - uid: 176 components: - type: Transform pos: -2.5,-10.5 @@ -1686,7 +1752,7 @@ entities: - type: Transform pos: 2.5,-10.5 parent: 2 - - uid: 238 + - uid: 240 components: - type: Transform pos: -3.5,-10.5 @@ -1761,39 +1827,39 @@ entities: - type: Transform pos: 1.5,-12.5 parent: 2 - - uid: 570 + - uid: 571 components: - type: Transform pos: 2.5,-16.5 parent: 2 - - uid: 794 + - uid: 795 components: - type: Transform pos: 0.5,-16.5 parent: 2 - - uid: 795 + - uid: 796 components: - type: Transform pos: -0.5,-16.5 parent: 2 - - uid: 796 + - uid: 797 components: - type: Transform pos: -1.5,-16.5 parent: 2 - - uid: 797 + - uid: 798 components: - type: Transform pos: -2.5,-16.5 parent: 2 - - uid: 798 + - uid: 799 components: - type: Transform pos: -3.5,-16.5 parent: 2 - proto: CableTerminal entities: - - uid: 179 + - uid: 182 components: - type: Transform rot: -1.5707963267948966 rad @@ -1886,7 +1952,7 @@ entities: parent: 2 - proto: ChairFolding entities: - - uid: 460 + - uid: 464 components: - type: Transform rot: -1.5707963267948966 rad @@ -2006,14 +2072,14 @@ entities: parent: 2 - proto: ClosetChefFilled entities: - - uid: 799 + - uid: 800 components: - type: Transform pos: 4.5,-18.5 parent: 2 - proto: ComputerShuttle entities: - - uid: 437 + - uid: 458 components: - type: Transform pos: 7.5,-7.5 @@ -2028,7 +2094,7 @@ entities: parent: 2 - proto: ComputerWallmountWithdrawBankATM entities: - - uid: 338 + - uid: 339 components: - type: Transform pos: 1.5,-15.5 @@ -2146,11 +2212,15 @@ entities: entities: - uid: 621 components: + - type: MetaData + name: transport to botany - type: Transform pos: 4.5,-13.5 parent: 2 - uid: 622 components: + - type: MetaData + name: transport to kitchen - type: Transform pos: 1.5,-6.5 parent: 2 @@ -2163,7 +2233,7 @@ entities: parent: 2 - proto: Dropper entities: - - uid: 472 + - uid: 474 components: - type: Transform rot: 3.141592653589793 rad @@ -2171,7 +2241,7 @@ entities: parent: 2 - proto: EmergencyLight entities: - - uid: 1 + - uid: 3 components: - type: Transform rot: 3.141592653589793 rad @@ -2343,7 +2413,7 @@ entities: - type: Transform pos: 1.5,-14.5 parent: 2 - - uid: 677 + - uid: 685 components: - type: Transform pos: 1.5,-17.5 @@ -2370,19 +2440,19 @@ entities: fixtures: {} - proto: FoodCartCold entities: - - uid: 656 + - uid: 414 components: - type: Transform rot: 3.141592653589793 rad - pos: 8.5,-22.5 + pos: 7.5,-22.5 parent: 2 - proto: FoodCartHot entities: - - uid: 640 + - uid: 684 components: - type: Transform rot: 3.141592653589793 rad - pos: 7.5,-22.5 + pos: 6.5,-22.5 parent: 2 - proto: FoodContainerEgg entities: @@ -2422,8 +2492,6 @@ entities: - type: Transform pos: -1.5,-8.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - proto: GasPipeBend @@ -2451,7 +2519,7 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 284 + - uid: 287 components: - type: Transform rot: -1.5707963267948966 rad @@ -2459,7 +2527,7 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 297 + - uid: 298 components: - type: Transform rot: 3.141592653589793 rad @@ -2475,14 +2543,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 394 + - uid: 397 components: - type: Transform pos: -3.5,-15.5 parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 411 + - uid: 412 components: - type: Transform rot: 3.141592653589793 rad @@ -2515,7 +2583,7 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 547 + - uid: 570 components: - type: Transform pos: 2.5,-16.5 @@ -2524,14 +2592,6 @@ entities: color: '#990000FF' - proto: GasPipeStraight entities: - - uid: 3 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,-13.5 - parent: 2 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 73 components: - type: Transform @@ -2540,6 +2600,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 74 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-13.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 131 components: - type: Transform @@ -2719,7 +2787,7 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 282 + - uid: 283 components: - type: Transform pos: 2.5,-18.5 @@ -2747,7 +2815,7 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 292 + - uid: 297 components: - type: Transform rot: 1.5707963267948966 rad @@ -2755,7 +2823,7 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 303 + - uid: 304 components: - type: Transform rot: -1.5707963267948966 rad @@ -2763,14 +2831,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 304 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,-16.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - uid: 308 components: - type: Transform @@ -2805,8 +2865,8 @@ entities: - uid: 316 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 3.5,-19.5 + rot: -1.5707963267948966 rad + pos: -2.5,-16.5 parent: 2 - type: AtmosPipeColor color: '#990000FF' @@ -2845,22 +2905,22 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 340 + - uid: 338 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-14.5 + rot: 1.5707963267948966 rad + pos: 3.5,-19.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#990000FF' - uid: 341 components: - type: Transform rot: -1.5707963267948966 rad - pos: 0.5,-16.5 + pos: -1.5,-14.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#0055CCFF' - uid: 342 components: - type: Transform @@ -2870,6 +2930,14 @@ entities: - type: AtmosPipeColor color: '#0055CCFF' - uid: 346 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-16.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 347 components: - type: Transform rot: -1.5707963267948966 rad @@ -2877,7 +2945,7 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 347 + - uid: 349 components: - type: Transform rot: -1.5707963267948966 rad @@ -2885,7 +2953,7 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 349 + - uid: 350 components: - type: Transform rot: -1.5707963267948966 rad @@ -2893,7 +2961,7 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 350 + - uid: 351 components: - type: Transform rot: -1.5707963267948966 rad @@ -2901,7 +2969,7 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 351 + - uid: 352 components: - type: Transform rot: 1.5707963267948966 rad @@ -2909,7 +2977,7 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 352 + - uid: 353 components: - type: Transform rot: -1.5707963267948966 rad @@ -2917,7 +2985,7 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 353 + - uid: 355 components: - type: Transform rot: 3.141592653589793 rad @@ -2925,7 +2993,7 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 358 + - uid: 383 components: - type: Transform rot: -1.5707963267948966 rad @@ -2933,14 +3001,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 383 + - uid: 394 components: - type: Transform pos: 3.5,-13.5 parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 402 + - uid: 403 components: - type: Transform rot: -1.5707963267948966 rad @@ -2948,7 +3016,7 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 403 + - uid: 411 components: - type: Transform rot: -1.5707963267948966 rad @@ -3126,7 +3194,7 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 273 + - uid: 274 components: - type: Transform rot: 1.5707963267948966 rad @@ -3134,7 +3202,7 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 287 + - uid: 292 components: - type: Transform rot: 3.141592653589793 rad @@ -3142,7 +3210,7 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 339 + - uid: 340 components: - type: Transform rot: 1.5707963267948966 rad @@ -3150,7 +3218,7 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 355 + - uid: 358 components: - type: Transform rot: 1.5707963267948966 rad @@ -3166,7 +3234,7 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 513 + - uid: 539 components: - type: Transform pos: -0.5,-16.5 @@ -3183,29 +3251,25 @@ entities: color: '#0055CCFF' - proto: GasPort entities: - - uid: 412 + - uid: 422 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,-10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasPressurePump entities: - - uid: 267 + - uid: 273 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasVentPump entities: - - uid: 283 + - uid: 284 components: - type: Transform pos: 5.5,-9.5 @@ -3213,8 +3277,6 @@ entities: - type: DeviceNetwork deviceLists: - 585 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 323 @@ -3222,8 +3284,6 @@ entities: - type: Transform pos: -5.5,-9.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 426 @@ -3232,11 +3292,9 @@ entities: rot: -1.5707963267948966 rad pos: -4.5,-16.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 458 + - uid: 459 components: - type: Transform pos: -1.5,-10.5 @@ -3244,8 +3302,6 @@ entities: - type: DeviceNetwork deviceLists: - 494 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 496 @@ -3254,8 +3310,6 @@ entities: rot: 3.141592653589793 rad pos: -5.5,-21.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 590 @@ -3263,8 +3317,6 @@ entities: - type: Transform pos: 3.5,-10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 633 @@ -3273,8 +3325,6 @@ entities: rot: 1.5707963267948966 rad pos: 5.5,-15.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 646 @@ -3282,8 +3332,6 @@ entities: - type: Transform pos: 1.5,-3.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 727 @@ -3292,8 +3340,6 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,-21.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasVentScrubber @@ -3304,8 +3350,6 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,-10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 265 @@ -3314,8 +3358,6 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,-10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 300 @@ -3324,8 +3366,6 @@ entities: rot: -1.5707963267948966 rad pos: 8.5,-19.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 322 @@ -3333,8 +3373,6 @@ entities: - type: Transform pos: -6.5,-9.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 344 @@ -3343,11 +3381,9 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,-16.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 422 + - uid: 423 components: - type: Transform rot: 3.141592653589793 rad @@ -3356,8 +3392,6 @@ entities: - type: DeviceNetwork deviceLists: - 588 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 529 @@ -3366,8 +3400,6 @@ entities: rot: 1.5707963267948966 rad pos: -7.5,-19.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 591 @@ -3376,8 +3408,6 @@ entities: rot: 3.141592653589793 rad pos: 1.5,-11.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 698 @@ -3385,8 +3415,6 @@ entities: - type: Transform pos: -0.5,-3.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - proto: GravityGeneratorMini @@ -3548,15 +3576,15 @@ entities: - type: Transform pos: 8.5,-15.5 parent: 2 - - uid: 274 + - uid: 276 components: - type: Transform - pos: -1.5,-15.5 + pos: 8.5,-23.5 parent: 2 - - uid: 276 + - uid: 282 components: - type: Transform - pos: 8.5,-23.5 + pos: -1.5,-15.5 parent: 2 - uid: 302 components: @@ -3598,11 +3626,6 @@ entities: - type: Transform pos: 10.5,-20.5 parent: 2 - - uid: 655 - components: - - type: Transform - pos: -2.5,-20.5 - parent: 2 - uid: 669 components: - type: Transform @@ -3613,23 +3636,25 @@ entities: - type: Transform pos: -0.5,-20.5 parent: 2 - - uid: 741 + - uid: 751 components: - type: Transform - pos: -4.5,-22.5 + pos: -9.5,-20.5 parent: 2 - - uid: 751 + - uid: 761 components: - type: Transform - pos: -9.5,-20.5 + pos: -3.5,-22.5 parent: 2 - proto: Gyroscope entities: - - uid: 266 + - uid: 267 components: - type: Transform pos: 8.5,-9.5 parent: 2 + - type: Thruster + originalPowerLoad: 1500 - proto: HospitalCurtainsOpen entities: - uid: 490 @@ -3811,7 +3836,7 @@ entities: parent: 2 - proto: PortableGeneratorPacmanShuttle entities: - - uid: 176 + - uid: 179 components: - type: Transform pos: -2.5,-11.5 @@ -3820,7 +3845,7 @@ entities: on: False - type: Physics bodyType: Static - - uid: 234 + - uid: 235 components: - type: Transform pos: -1.5,-11.5 @@ -3841,7 +3866,7 @@ entities: - type: Transform pos: -8.5,-20.5 parent: 2 - - uid: 226 + - uid: 228 components: - type: Transform pos: 0.5,-18.5 @@ -3858,12 +3883,6 @@ entities: parent: 2 - proto: Poweredlight entities: - - uid: 106 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,-6.5 - parent: 2 - uid: 201 components: - type: Transform @@ -3875,12 +3894,6 @@ entities: - type: Transform pos: 0.5,-21.5 parent: 2 - - uid: 389 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 4.5,-6.5 - parent: 2 - uid: 390 components: - type: Transform @@ -3926,12 +3939,12 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,-12.5 parent: 2 - - uid: 578 + - uid: 573 components: - type: Transform pos: 9.5,-19.5 parent: 2 - - uid: 662 + - uid: 671 components: - type: Transform rot: -1.5707963267948966 rad @@ -3955,6 +3968,18 @@ entities: - type: Transform pos: -6.5,-21.5 parent: 2 + - uid: 661 + components: + - type: Transform + pos: 6.5,-21.5 + parent: 2 +- proto: Rack + entities: + - uid: 307 + components: + - type: Transform + pos: 8.5,-22.5 + parent: 2 - proto: Railing entities: - uid: 153 @@ -4007,7 +4032,7 @@ entities: parent: 2 - proto: RandomPainting entities: - - uid: 236 + - uid: 238 components: - type: Transform rot: 3.141592653589793 rad @@ -4050,13 +4075,41 @@ entities: - type: Transform pos: -1.5,-1.5 parent: 2 +- proto: ServiceTechFab + entities: + - uid: 106 + components: + - type: Transform + pos: 7.5,-12.5 + parent: 2 +- proto: SheetGlass + entities: + - uid: 820 + components: + - type: Transform + pos: 7.63264,-13.474377 + parent: 2 - proto: SheetPlasma entities: - - uid: 697 + - uid: 709 components: - type: Transform pos: -2,-10.5 parent: 2 +- proto: SheetPlastic + entities: + - uid: 817 + components: + - type: Transform + pos: 7.3556504,-13.585793 + parent: 2 +- proto: SheetSteel + entities: + - uid: 819 + components: + - type: Transform + pos: 7.38264,-13.422256 + parent: 2 - proto: ShuttersNormalOpen entities: - uid: 293 @@ -4067,7 +4120,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 239 + - 814 - uid: 294 components: - type: Transform @@ -4076,7 +4129,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 239 + - 814 - uid: 295 components: - type: Transform @@ -4085,7 +4138,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 239 + - 814 - uid: 296 components: - type: Transform @@ -4093,7 +4146,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 239 + - 814 - uid: 311 components: - type: Transform @@ -4102,7 +4155,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 239 + - 814 - uid: 312 components: - type: Transform @@ -4111,7 +4164,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 239 + - 814 - uid: 360 components: - type: Transform @@ -4119,7 +4172,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 239 + - 814 - uid: 361 components: - type: Transform @@ -4127,7 +4180,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 239 + - 814 - uid: 413 components: - type: Transform @@ -4136,7 +4189,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 239 + - 814 - uid: 540 components: - type: Transform @@ -4144,7 +4197,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 414 + - 812 - uid: 639 components: - type: Transform @@ -4152,7 +4205,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 414 + - 812 - uid: 652 components: - type: Transform @@ -4160,7 +4213,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 670 + - 816 - uid: 653 components: - type: Transform @@ -4168,7 +4221,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 414 + - 812 - uid: 659 components: - type: Transform @@ -4176,7 +4229,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 670 + - 816 - uid: 663 components: - type: Transform @@ -4184,7 +4237,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 670 + - 816 - uid: 690 components: - type: Transform @@ -4193,7 +4246,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 414 + - 812 - uid: 720 components: - type: Transform @@ -4202,7 +4255,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 729 + - 811 - uid: 721 components: - type: Transform @@ -4211,7 +4264,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 729 + - 811 - uid: 722 components: - type: Transform @@ -4220,7 +4273,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 729 + - 811 - uid: 723 components: - type: Transform @@ -4228,7 +4281,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 729 + - 811 - uid: 724 components: - type: Transform @@ -4236,7 +4289,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 729 + - 811 - uid: 731 components: - type: Transform @@ -4244,7 +4297,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 730 + - 815 - uid: 732 components: - type: Transform @@ -4252,7 +4305,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 730 + - 815 - uid: 733 components: - type: Transform @@ -4261,7 +4314,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 730 + - 815 - uid: 734 components: - type: Transform @@ -4270,7 +4323,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 730 + - 815 - uid: 735 components: - type: Transform @@ -4279,7 +4332,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 730 + - 815 - uid: 737 components: - type: Transform @@ -4288,7 +4341,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 414 + - 812 - uid: 753 components: - type: Transform @@ -4296,7 +4349,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 670 + - 816 - uid: 758 components: - type: Transform @@ -4304,7 +4357,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 670 + - 816 - uid: 759 components: - type: Transform @@ -4312,7 +4365,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 670 + - 816 - uid: 760 components: - type: Transform @@ -4320,15 +4373,15 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 670 + - 816 - uid: 762 components: - type: Transform - pos: -4.5,-22.5 + pos: -3.5,-22.5 parent: 2 - type: DeviceLinkSink links: - - 670 + - 816 - proto: ShuttersWindowOpen entities: - uid: 313 @@ -4339,7 +4392,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 744 + - 655 - uid: 385 components: - type: Transform @@ -4347,7 +4400,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 387 + - 810 - uid: 386 components: - type: Transform @@ -4355,8 +4408,8 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 387 - - uid: 466 + - 810 + - uid: 472 components: - type: Transform rot: -1.5707963267948966 rad @@ -4364,7 +4417,7 @@ entities: parent: 2 - type: DeviceLinkSink links: - - 744 + - 655 - proto: ShuttleWindow entities: - uid: 85 @@ -4517,7 +4570,7 @@ entities: - type: Transform pos: 8.5,-16.5 parent: 2 - - uid: 401 + - uid: 402 components: - type: Transform pos: -1.5,-15.5 @@ -4567,11 +4620,6 @@ entities: - type: Transform pos: 6.5,-23.5 parent: 2 - - uid: 684 - components: - - type: Transform - pos: -2.5,-20.5 - parent: 2 - uid: 688 components: - type: Transform @@ -4582,57 +4630,71 @@ entities: - type: Transform pos: 10.5,-21.5 parent: 2 + - uid: 730 + components: + - type: Transform + pos: -3.5,-22.5 + parent: 2 - uid: 752 components: - type: Transform pos: -9.5,-20.5 parent: 2 - - uid: 761 +- proto: SignalButton + entities: + - uid: 810 components: + - type: MetaData + name: bar shutter button - type: Transform - pos: -4.5,-22.5 + pos: 1.5,-13.5 parent: 2 + - type: DeviceLinkSource + linkedPorts: + 386: + - Pressed: Toggle + 385: + - Pressed: Toggle - proto: SignalButtonDirectional entities: - - uid: 239 + - uid: 655 components: + - type: MetaData + name: kitchen shutter button - type: Transform rot: 1.5707963267948966 rad - pos: -1.5,-6.5 + pos: 1.5,-18.5 parent: 2 - type: DeviceLinkSource linkedPorts: - 294: - - Pressed: Toggle - 293: - - Pressed: Toggle - 413: - - Pressed: Toggle - 360: - - Pressed: Toggle - 361: - - Pressed: Toggle - 296: - - Pressed: Toggle - 311: - - Pressed: Toggle - 312: + 472: - Pressed: Toggle - 295: + 313: - Pressed: Toggle - - uid: 387 + - uid: 811 components: + - type: MetaData + name: shutter button - type: Transform - pos: 0.5,-12.5 + rot: -1.5707963267948966 rad + pos: -4.5,-8.5 parent: 2 - type: DeviceLinkSource linkedPorts: - 386: + 724: - Pressed: Toggle - 385: + 723: - Pressed: Toggle - - uid: 414 + 720: + - Pressed: Toggle + 721: + - Pressed: Toggle + 722: + - Pressed: Toggle + - uid: 812 components: + - type: MetaData + name: shutter button - type: Transform rot: 1.5707963267948966 rad pos: 7.5,-20.5 @@ -4649,50 +4711,38 @@ entities: - Pressed: Toggle 639: - Pressed: Toggle - - uid: 670 + - uid: 814 components: + - type: MetaData + name: shutter button - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,-20.5 + rot: 1.5707963267948966 rad + pos: -1.5,-6.5 parent: 2 - type: DeviceLinkSource linkedPorts: - 758: + 294: - Pressed: Toggle - 652: + 293: - Pressed: Toggle - 663: + 413: - Pressed: Toggle - 759: + 360: - Pressed: Toggle - 753: + 361: - Pressed: Toggle - 760: + 296: - Pressed: Toggle - 659: + 311: - Pressed: Toggle - 762: + 312: - Pressed: Toggle - - uid: 729 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-8.5 - parent: 2 - - type: DeviceLinkSource - linkedPorts: - 722: - - Pressed: Toggle - 721: - - Pressed: Toggle - 720: - - Pressed: Toggle - 723: - - Pressed: Toggle - 724: - - Pressed: Toggle - - uid: 730 + 295: + - Pressed: Toggle + - uid: 815 components: + - type: MetaData + name: shutter button - type: Transform pos: 6.5,-7.5 parent: 2 @@ -4708,37 +4758,63 @@ entities: - Pressed: Toggle 735: - Pressed: Toggle - - uid: 744 + - uid: 816 components: + - type: MetaData + name: dock shutter button - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-18.5 + rot: 3.141592653589793 rad + pos: -4.5,-20.5 parent: 2 - type: DeviceLinkSource linkedPorts: - 313: + 758: + - Pressed: Toggle + 652: + - Pressed: Toggle + 663: + - Pressed: Toggle + 759: + - Pressed: Toggle + 753: - Pressed: Toggle - 466: + 760: + - Pressed: Toggle + 659: + - Pressed: Toggle + 762: - Pressed: Toggle - proto: SignBar entities: - - uid: 545 + - uid: 387 components: - type: Transform - pos: -1.5,-13.5 + pos: -3.5,-21.5 parent: 2 - - uid: 800 + - uid: 546 components: - type: Transform - pos: -4.5,-21.5 + pos: -1.5,-13.5 parent: 2 - - uid: 803 + - uid: 804 components: - type: Transform pos: -7.5,-18.5 parent: 2 - proto: SignDirectionalFood entities: + - uid: 88 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,-22.5 + parent: 2 + - uid: 94 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-23.5 + parent: 2 - uid: 607 components: - type: Transform @@ -4754,7 +4830,7 @@ entities: parent: 2 - proto: SignElectricalMed entities: - - uid: 801 + - uid: 802 components: - type: Transform pos: -0.5,-11.5 @@ -4769,14 +4845,14 @@ entities: parent: 2 - proto: SMESBasic entities: - - uid: 459 + - uid: 460 components: - type: Transform pos: -3.5,-11.5 parent: 2 - proto: soda_dispenser entities: - - uid: 235 + - uid: 236 components: - type: Transform pos: 0.5,-13.5 @@ -4795,20 +4871,6 @@ entities: - type: Transform pos: 0.5,-3.5 parent: 2 -- proto: SpawnPointBotanist - entities: - - uid: 575 - components: - - type: Transform - pos: 0.5,-1.5 - parent: 2 -- proto: SpawnPointChef - entities: - - uid: 572 - components: - - type: Transform - pos: 4.5,-14.5 - parent: 2 - proto: SpawnPointLatejoin entities: - uid: 650 @@ -4816,20 +4878,6 @@ entities: - type: Transform pos: 1.5,-10.5 parent: 2 -- proto: SpawnPointPilot - entities: - - uid: 661 - components: - - type: Transform - pos: 7.5,-9.5 - parent: 2 -- proto: SpawnPointServiceWorker - entities: - - uid: 626 - components: - - type: Transform - pos: 0.5,-14.5 - parent: 2 - proto: SprayBottleSpaceCleaner entities: - uid: 766 @@ -4839,7 +4887,7 @@ entities: parent: 2 - proto: SubstationBasic entities: - - uid: 510 + - uid: 513 components: - type: Transform pos: -3.5,-10.5 @@ -4865,12 +4913,12 @@ entities: - type: Transform pos: 8.5,-8.5 parent: 2 - - uid: 182 + - uid: 226 components: - type: Transform pos: 2.5,-18.5 parent: 2 - - uid: 240 + - uid: 266 components: - type: Transform pos: 3.5,-18.5 @@ -4928,19 +4976,19 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-16.5 parent: 2 - - uid: 464 + - uid: 466 components: - type: Transform pos: 1.5,-17.5 parent: 2 - proto: TableCounterWood entities: - - uid: 770 + - uid: 793 components: - type: Transform pos: 0.5,-15.5 parent: 2 - - uid: 793 + - uid: 794 components: - type: Transform pos: -0.5,-15.5 @@ -4964,7 +5012,7 @@ entities: - type: Transform pos: -6.5,-9.5 parent: 2 - - uid: 397 + - uid: 401 components: - type: Transform pos: 0.5,-13.5 @@ -5004,7 +5052,7 @@ entities: - type: Transform pos: -3.5,-14.5 parent: 2 - - uid: 509 + - uid: 510 components: - type: Transform pos: -0.5,-13.5 @@ -5017,46 +5065,62 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,-17.5 parent: 2 + - type: Thruster + originalPowerLoad: 1500 - uid: 224 components: - type: Transform pos: -6.5,-5.5 parent: 2 + - type: Thruster + originalPowerLoad: 1500 - uid: 225 components: - type: Transform pos: 7.5,-5.5 parent: 2 + - type: Thruster + originalPowerLoad: 1500 - uid: 259 components: - type: Transform rot: 1.5707963267948966 rad pos: -8.5,-17.5 parent: 2 + - type: Thruster + originalPowerLoad: 1500 - uid: 486 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,-5.5 parent: 2 + - type: Thruster + originalPowerLoad: 1500 - uid: 544 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,-5.5 parent: 2 + - type: Thruster + originalPowerLoad: 1500 - uid: 756 components: - type: Transform rot: 3.141592653589793 rad - pos: -2.5,-21.5 + pos: -1.5,-21.5 parent: 2 + - type: Thruster + originalPowerLoad: 1500 - uid: 757 components: - type: Transform rot: 3.141592653589793 rad - pos: 3.5,-21.5 + pos: 2.5,-21.5 parent: 2 + - type: Thruster + originalPowerLoad: 1500 - proto: VariantCubeBox entities: - uid: 233 @@ -5073,10 +5137,10 @@ entities: parent: 2 - proto: VendingMachineChefDrobe entities: - - uid: 689 + - uid: 714 components: - type: Transform - pos: 6.5,-21.5 + pos: 5.5,-21.5 parent: 2 - proto: VendingMachineChefvend entities: @@ -5087,24 +5151,17 @@ entities: parent: 2 - proto: VendingMachineCondiments entities: - - uid: 571 + - uid: 626 components: - type: Transform pos: -0.5,-15.5 parent: 2 -- proto: VendingMachineDinnerware - entities: - - uid: 388 - components: - - type: Transform - pos: 7.5,-12.5 - parent: 2 - proto: VendingMachineHydrobe entities: - - uid: 739 + - uid: 159 components: - type: Transform - pos: 6.5,-22.5 + pos: 5.5,-22.5 parent: 2 - proto: VendingMachineNutri entities: @@ -5113,6 +5170,27 @@ entities: - type: Transform pos: -1.5,-5.5 parent: 2 +- proto: VendingMachineRestockBooze + entities: + - uid: 239 + components: + - type: Transform + pos: 8.2885895,-22.483995 + parent: 2 +- proto: VendingMachineRestockChefvend + entities: + - uid: 689 + components: + - type: Transform + pos: 8.642728,-22.360958 + parent: 2 +- proto: VendingMachineRestockCondimentStation + entities: + - uid: 809 + components: + - type: Transform + pos: 8.6115055,-22.640354 + parent: 2 - proto: VendingMachineSeedsUnlocked entities: - uid: 145 @@ -5297,11 +5375,6 @@ entities: - type: Transform pos: 0.5,-12.5 parent: 2 - - uid: 74 - components: - - type: Transform - pos: 1.5,-18.5 - parent: 2 - uid: 75 components: - type: Transform @@ -5352,6 +5425,11 @@ entities: - type: Transform pos: 2.5,-20.5 parent: 2 + - uid: 119 + components: + - type: Transform + pos: 1.5,-18.5 + parent: 2 - uid: 121 components: - type: Transform @@ -5367,36 +5445,26 @@ entities: - type: Transform pos: 4.5,-20.5 parent: 2 - - uid: 159 - components: - - type: Transform - pos: 0.5,-20.5 - parent: 2 - uid: 166 components: - type: Transform pos: -3.5,-20.5 parent: 2 - - uid: 285 + - uid: 230 components: - type: Transform - pos: 1.5,-12.5 + pos: -4.5,-7.5 parent: 2 - - uid: 286 + - uid: 285 components: - type: Transform - pos: 5.5,-21.5 + pos: 1.5,-12.5 parent: 2 - - uid: 298 + - uid: 303 components: - type: Transform pos: 1.5,-13.5 parent: 2 - - uid: 307 - components: - - type: Transform - pos: 5.5,-22.5 - parent: 2 - uid: 356 components: - type: Transform @@ -5417,10 +5485,10 @@ entities: - type: Transform pos: -4.5,-20.5 parent: 2 - - uid: 474 + - uid: 388 components: - type: Transform - pos: 1.5,-15.5 + pos: 5.5,-7.5 parent: 2 - uid: 489 components: @@ -5432,6 +5500,16 @@ entities: - type: Transform pos: 3.5,-9.5 parent: 2 + - uid: 509 + components: + - type: Transform + pos: 1.5,-15.5 + parent: 2 + - uid: 531 + components: + - type: Transform + pos: 0.5,-20.5 + parent: 2 - uid: 541 components: - type: Transform @@ -5457,6 +5535,11 @@ entities: - type: Transform pos: -6.5,-20.5 parent: 2 + - uid: 656 + components: + - type: Transform + pos: -4.5,-23.5 + parent: 2 - uid: 658 components: - type: Transform @@ -5472,21 +5555,41 @@ entities: - type: Transform pos: 10.5,-19.5 parent: 2 - - uid: 685 + - uid: 693 components: - type: Transform - pos: -1.5,-13.5 + pos: -2.5,-20.5 parent: 2 - - uid: 693 + - uid: 697 components: - type: Transform - pos: -4.5,-21.5 + pos: -1.5,-13.5 parent: 2 - uid: 725 components: - type: Transform pos: 8.5,-18.5 parent: 2 + - uid: 741 + components: + - type: Transform + pos: -3.5,-21.5 + parent: 2 + - uid: 744 + components: + - type: Transform + pos: 5.5,-23.5 + parent: 2 + - uid: 807 + components: + - type: Transform + pos: 4.5,-21.5 + parent: 2 + - uid: 808 + components: + - type: Transform + pos: 4.5,-22.5 + parent: 2 - proto: WallShuttleDiagonal entities: - uid: 24 @@ -5547,12 +5650,6 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,-6.5 parent: 2 - - uid: 88 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-7.5 - parent: 2 - uid: 90 components: - type: Transform @@ -5570,11 +5667,6 @@ entities: - type: Transform pos: 6.5,-6.5 parent: 2 - - uid: 94 - components: - - type: Transform - pos: 5.5,-7.5 - parent: 2 - uid: 95 components: - type: Transform @@ -5597,12 +5689,6 @@ entities: rot: 1.5707963267948966 rad pos: -8.5,-23.5 parent: 2 - - uid: 230 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-21.5 - parent: 2 - uid: 343 components: - type: Transform @@ -5621,17 +5707,17 @@ entities: rot: -1.5707963267948966 rad pos: -6.5,-18.5 parent: 2 - - uid: 649 + - uid: 662 components: - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,-23.5 + rot: 1.5707963267948966 rad + pos: 3.5,-21.5 parent: 2 - - uid: 654 + - uid: 670 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 4.5,-21.5 + rot: 3.141592653589793 rad + pos: -2.5,-21.5 parent: 2 - uid: 674 components: @@ -5639,12 +5725,6 @@ entities: rot: 3.141592653589793 rad pos: 10.5,-22.5 parent: 2 - - uid: 714 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,-23.5 - parent: 2 - uid: 743 components: - type: Transform @@ -5656,6 +5736,18 @@ entities: rot: 1.5707963267948966 rad pos: -9.5,-22.5 parent: 2 + - uid: 801 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-23.5 + parent: 2 + - uid: 806 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-23.5 + parent: 2 - proto: WarpPointShip entities: - uid: 584 @@ -5672,7 +5764,7 @@ entities: parent: 2 - proto: WindoorSecure entities: - - uid: 423 + - uid: 437 components: - type: Transform rot: -1.5707963267948966 rad @@ -5680,7 +5772,7 @@ entities: parent: 2 - proto: Wrench entities: - - uid: 804 + - uid: 805 components: - type: Transform pos: 7.5,-10.5 diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml index 2f51bd3517c..3090e4ccc15 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml @@ -120,6 +120,8 @@ - ServiceFoodPlateSmall - ServiceFoodPlateTin - ServiceFoodKebabSkewer + - Beaker + - LargeBeaker - ClothingOuterSuitEmergency - ClothingHeadHelmetEVA - ClothingOuterHardsuitEVA diff --git a/Resources/Prototypes/_NF/Guidebook/shipyard.yml b/Resources/Prototypes/_NF/Guidebook/shipyard.yml index 2849998257d..fa7273265df 100644 --- a/Resources/Prototypes/_NF/Guidebook/shipyard.yml +++ b/Resources/Prototypes/_NF/Guidebook/shipyard.yml @@ -5,6 +5,7 @@ children: - ShipyardAmbition - ShipyardBrigand + - ShipyardCeres - ShipyardGasbender - ShipyardHarbormaster - ShipyardKilderkin @@ -24,6 +25,11 @@ name: guide-entry-shipyard-brigand text: "/ServerInfo/_NF/Guidebook/Shipyard/Brigand.xml" +- type: guideEntry + id: ShipyardCeres + name: guide-entry-shipyard-ceres + text: "/ServerInfo/_NF/Guidebook/Shipyard/Ceres.xml" + - type: guideEntry id: ShipyardGasbender name: guide-entry-shipyard-gasbender diff --git a/Resources/Prototypes/_NF/Shipyard/ceres.yml b/Resources/Prototypes/_NF/Shipyard/ceres.yml index b3e4056e99f..a35385f6aba 100644 --- a/Resources/Prototypes/_NF/Shipyard/ceres.yml +++ b/Resources/Prototypes/_NF/Shipyard/ceres.yml @@ -1,6 +1,6 @@ - type: vessel id: Ceres - name: NC Ceres + name: SBB Ceres description: A medium-size, high-class restaurant ship with ample seating, integrated botany and a dining room for VIP guests price: 49500 category: Medium @@ -9,7 +9,7 @@ - type: gameMap id: Ceres - mapName: 'NC Ceres' + mapName: 'SBB Ceres' mapPath: /Maps/_NF/Shuttles/ceres.yml minPlayers: 0 stations: diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Ceres.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Ceres.xml new file mode 100644 index 00000000000..c80607a7b2e --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Ceres.xml @@ -0,0 +1,107 @@ + + # CERES-CLASS SERVICE SHUTTLE + + + + + + [color=#a4885c]Ship Size:[/color] Medium + + [color=#a4885c]Recommended Crew:[/color] 2-4 + + [color=#a4885c]Power Gen Type:[/color] Plasma + + [color=#a4885c]Expeditions:[/color] None + + [color=#a4885c]IFF Console:[/color] None + + [color=#a4885c]Available Roles:[/color] Contractor, Pilot, Mercenary + + "A medium-size, high-class restaurant ship with ample seating, integrated botany and a dining room for VIP guests." + + [italic]Brought to you by BlueBird Starship Design & Construction.[/italic] + + # Piloting + + + + After clicking the shuttle console, you should see a radar view of the shuttle. Here are the steps for piloting the shuttle back and forth: + + - First, disconnect any airlocks that are connected to the dock. + - Then, you actually get to pilot the shuttle. The controls are fairly simple, with [color=#028ed9]"W"[/color] and [color=#028ed9]"S"[/color] being forward and backward, [color=#028ed9]"A"[/color] and [color=#028ed9]"D"[/color] being left and right, and [color=#028ed9]"Q"[/color] and [color=#028ed9]"E"[/color] being rotating left and right; and [color=#028ed9]"spacebar"[/color] being the brake and moving precicely by holding the [color=#028ed9]"spacebar"[/color] while doing other inputs. + + # Hiring crew + + + + + + As a Captain of a Nanotrasen vessel, you have the authority to hire, fire, demote, or promote crew members at will. There are two ways you as a Captain can go about hiring crew: you can either use the [color=#a4885c]station records computer[/color] on your ship to open crew slots (jobs available vary from ship to ship) or invite through in-game communications other players to your crew. + + # PREFLIGHT CHECKLIST + + ## 1. Power supply + + ## 1.1. Battery units + + + + + + + - Check that the SMES unit is anchored to the floor. + - Check that the substation unit is anchored to the floor. + - Check that the APC unit's Main Breaker is toggled on. + - Check the APC unit's current Load (W). + + ## 1.2. P.A.C.M.A.N. generator unit + + + + + + - Check that P.A.C.M.A.N. generator units are anchored to the floor. + - Check that P.A.C.M.A.N. generator units are fueled. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation. + - Check that P.A.C.M.A.N. generator units are set to HV output. + - Set Target Power to [bold]12 kW[/bold] on each generator unit. + - Start P.A.C.M.A.N. generator units. + + ## 2. Atmospherics + + ## 2.1. Distribution Loop + + + + + + + - Check that the air canister is anchored to connector port. + - Check that the distribution pump is set to normal pressure. + - Enable the distribution pump. + + ## 2.2. Waste Loop + + + + + + - Enable waste loop pump. + - Disable Auto Mode on the Air Alarm in the Engine Room. + - Set the Air Alarm in the Engine Room to Filtering (Wide). + + ## 3. Other checks + + + + + + - Check that the gyroscope is anchored, powered, and enabled. + - Check that the mini gravity generator is anchored, powered, and enabled. + + # GETTING THE MOST OUT OF THE CERES + + - The Ceres is designed for multi-person crews. Consider having a dedicated botanist to grow quality produce. + - Though unorthodox, the disposal units are designed to safely and efficiently transport produce from botany to kitchen. Make use of them! + - Don't be afraid to adjust the table and seating layout to suit your needs. + - For serving food to a larger party, the food carts in the freezer may simplify transportation. + From 469cf2a3aebff192513d89f420dbfa1f0264b73e Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Mon, 3 Jun 2024 18:42:58 +0000 Subject: [PATCH 02/25] Automatic Changelog (#1456) --- Resources/Changelog/Changelog.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index a5b22151117..2bdc1676430 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4767,3 +4767,11 @@ Entries: message: Pirate Cove got new equipment shipment. id: 5004 time: '2024-06-03T01:05:56.0000000+00:00' +- author: arimah + changes: + - type: Tweak + message: >- + The Ceres is no longer under NanoTrasen branding: look for SBB Ceres + instead. + id: 5005 + time: '2024-06-03T18:42:27.0000000+00:00' From e97e1c2bd086668c1a6a3f81a6875b799bb222cb Mon Sep 17 00:00:00 2001 From: Myzumi <34660019+Myzumi@users.noreply.github.com> Date: Tue, 4 Jun 2024 16:02:23 +0200 Subject: [PATCH 03/25] Adds Admin teleporter (#1469) * Added admin handheld teleporter * Small changes and visuals * Web Edit Pro * Update admin_hand_teleporter.yml * Update portal.yml * Update admin_hand_teleporter.yml * Changed Visuals --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../Prototypes/_NF/Entities/Effects/portal.yml | 16 ++++++++++++++++ .../Objects/Devices/admin_hand_teleporter.yml | 9 +++++++++ 2 files changed, 25 insertions(+) create mode 100644 Resources/Prototypes/_NF/Entities/Effects/portal.yml create mode 100644 Resources/Prototypes/_NF/Objects/Devices/admin_hand_teleporter.yml diff --git a/Resources/Prototypes/_NF/Entities/Effects/portal.yml b/Resources/Prototypes/_NF/Entities/Effects/portal.yml new file mode 100644 index 00000000000..3eb35fbc5e9 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Effects/portal.yml @@ -0,0 +1,16 @@ +- type: entity + id: BasePortalAdmin + perent: BasePortal + abstract: true + description: This one looks more like a special bluespace portal. + components: + - type: Portal + canTeleportToOtherMaps: true + +- type: entity + id: PortalAdminStart + parent: [BasePortalAdmin, PortalArtifact] + +- type: entity + id: PortalAdminEnd + parent: [BasePortalAdmin, PortalArtifact] diff --git a/Resources/Prototypes/_NF/Objects/Devices/admin_hand_teleporter.yml b/Resources/Prototypes/_NF/Objects/Devices/admin_hand_teleporter.yml new file mode 100644 index 00000000000..bb31b5d0486 --- /dev/null +++ b/Resources/Prototypes/_NF/Objects/Devices/admin_hand_teleporter.yml @@ -0,0 +1,9 @@ +- type: entity + id: HandTeleporterAdmin + parent: HandTeleporter + suffix: Admeme + description: "An upgraded Teleporter that can ignore some restrictions the original had, but is strongly restricted to experienced CC users." + components: + - type: HandTeleporter + firstPortalPrototype: "PortalAdminStart" + secondPortalPrototype: "PortalAdminEnd" From 9eba9153552ae160d35961838103f8cf48cc05c1 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Tue, 4 Jun 2024 14:02:52 +0000 Subject: [PATCH 04/25] Automatic Changelog (#1469) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 2bdc1676430..39089e3e281 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4775,3 +4775,9 @@ Entries: instead. id: 5005 time: '2024-06-03T18:42:27.0000000+00:00' +- author: Myzumi + changes: + - type: Add + message: Added Admeme Hand teleporter + id: 5006 + time: '2024-06-04T14:02:24.0000000+00:00' From bae2f3786caeea5f1b8910cc9a5f41f97e1cee56 Mon Sep 17 00:00:00 2001 From: Myzumi <34660019+Myzumi@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:26:13 +0200 Subject: [PATCH 05/25] Fixes Typo (#1470) --- Resources/Prototypes/_NF/Entities/Effects/portal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Effects/portal.yml b/Resources/Prototypes/_NF/Entities/Effects/portal.yml index 3eb35fbc5e9..fe2795bddd0 100644 --- a/Resources/Prototypes/_NF/Entities/Effects/portal.yml +++ b/Resources/Prototypes/_NF/Entities/Effects/portal.yml @@ -1,6 +1,6 @@ - type: entity id: BasePortalAdmin - perent: BasePortal + parent: BasePortal abstract: true description: This one looks more like a special bluespace portal. components: From 4cea1a01a758d173d3aa172ac1280a3f8f0fa98a Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Tue, 4 Jun 2024 15:26:41 +0000 Subject: [PATCH 06/25] Automatic Changelog (#1470) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 39089e3e281..068b32bcd15 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4781,3 +4781,9 @@ Entries: message: Added Admeme Hand teleporter id: 5006 time: '2024-06-04T14:02:24.0000000+00:00' +- author: Myzumi + changes: + - type: Fix + message: Admeme Teleporter hotfix + id: 5007 + time: '2024-06-04T15:26:13.0000000+00:00' From fe167faa7915c390143e197b8e17ba5929c46cd3 Mon Sep 17 00:00:00 2001 From: Dvir Date: Wed, 5 Jun 2024 01:35:06 +0300 Subject: [PATCH 07/25] Fixing --- .../Inventories/lesslethalvend.yml | 1 - .../Weapons/Ammunition/Boxes/pistol.yml | 14 ------------ .../Weapons/Guns/Ammunition/Boxes/pistol.yml | 17 ++++++++++++++ .../Ammunition/Cartridges/pistol.yml | 18 ++++++++------- .../Ammunition/Magazines/pistol.yml | 22 ++++++++++--------- .../Ammunition/Projectiles/chem.yml | 0 .../Ammunition/Projectiles/pistol.yml | 1 + .../Ammunition/SpeedLoaders/heavy_rifle.yml | 0 .../Guns/Ammunition/SpeedLoaders/pistol.yml | 1 + .../{ => Guns}/Ammunition/explosives.yml | 0 10 files changed, 41 insertions(+), 33 deletions(-) delete mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Boxes/pistol.yml rename Resources/Prototypes/_NF/Entities/Objects/Weapons/{ => Guns}/Ammunition/Cartridges/pistol.yml (96%) rename Resources/Prototypes/_NF/Entities/Objects/Weapons/{ => Guns}/Ammunition/Magazines/pistol.yml (97%) rename Resources/Prototypes/_NF/Entities/Objects/Weapons/{ => Guns}/Ammunition/Projectiles/chem.yml (100%) rename Resources/Prototypes/_NF/Entities/Objects/Weapons/{ => Guns}/Ammunition/Projectiles/pistol.yml (94%) rename Resources/Prototypes/_NF/{ => Entities}/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml (100%) rename Resources/Prototypes/_NF/Entities/Objects/Weapons/{ => Guns}/Ammunition/explosives.yml (100%) diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml index 25abbe278a9..4bee76153f4 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml @@ -14,7 +14,6 @@ MagazineBoxRifleRubber: 8 MagazineBoxLightRifleRubber: 4 MagazineBoxCaselessRifleRubber: 4 - SpeedLoaderRifleHeavy: 10 SpeedLoaderRifleHeavyRubber: 10 contrabandInventory: WeaponRifleBB: 2 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Boxes/pistol.yml deleted file mode 100644 index eeb59461bd7..00000000000 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Boxes/pistol.yml +++ /dev/null @@ -1,14 +0,0 @@ -- type: entity - parent: BaseMagazineBoxPistol - id: MagazineBoxPistolEmp - name: ammunition box (.35 auto emp) - components: - - type: BallisticAmmoProvider - proto: CartridgePistolEmp - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: emp diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml index 5b3aba79f09..7ef05673de8 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml @@ -1,3 +1,4 @@ +# Upstream - type: entity parent: BaseMagazineBoxPistol id: MagazineBoxPistolRubber @@ -12,3 +13,19 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - state: rubber + +# Frontier +- type: entity + parent: BaseMagazineBoxPistol + id: MagazineBoxPistolEmp + name: ammunition box (.35 auto emp) + components: + - type: BallisticAmmoProvider + proto: CartridgePistolEmp + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: emp diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml similarity index 96% rename from Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/pistol.yml rename to Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml index 36dd79ce38f..0d5d65e42a7 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/pistol.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml @@ -1,11 +1,4 @@ -- type: entity - id: CartridgePistolEmp - name: cartridge (.35 auto emp) - parent: BaseCartridgePistol - components: - - type: CartridgeAmmo - proto: BulletPistolEmp - +# Upstream - type: entity id: CartridgePistolRubber name: cartridge (.35 auto rubber) @@ -20,3 +13,12 @@ - state: tip map: [ "enum.AmmoVisualLayers.Tip" ] color: "#43c4f7" + +# Frontier +- type: entity + id: CartridgePistolEmp + name: cartridge (.35 auto emp) + parent: BaseCartridgePistol + components: + - type: CartridgeAmmo + proto: BulletPistolEmp diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml similarity index 97% rename from Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/pistol.yml rename to Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index 486a6ff5471..27b8002b18d 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -1,10 +1,11 @@ +# Upstream - type: entity - id: MagazinePistolSubMachineGunEmp - name: SMG magazine (.35 auto emp) - parent: BaseMagazinePistolSubMachineGun + id: MagazinePistolRubber + name: pistol magazine (.35 auto rubber) + parent: BaseMagazinePistol components: - type: BallisticAmmoProvider - proto: CartridgePistolEmp + proto: CartridgePistolRubber - type: Sprite layers: - state: rubber @@ -13,9 +14,9 @@ map: ["enum.GunVisualLayers.Mag"] - type: entity - id: MagazinePistolRubber - name: pistol magazine (.35 auto rubber) - parent: BaseMagazinePistol + id: MagazinePistolSubMachineGunRubber + name: SMG magazine (.35 auto rubber) + parent: BaseMagazinePistolSubMachineGun components: - type: BallisticAmmoProvider proto: CartridgePistolRubber @@ -26,13 +27,14 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] +# Frontier - type: entity - id: MagazinePistolSubMachineGunRubber - name: SMG magazine (.35 auto rubber) + id: MagazinePistolSubMachineGunEmp + name: SMG magazine (.35 auto emp) parent: BaseMagazinePistolSubMachineGun components: - type: BallisticAmmoProvider - proto: CartridgePistolRubber + proto: CartridgePistolEmp - type: Sprite layers: - state: rubber diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Projectiles/chem.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/chem.yml similarity index 100% rename from Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Projectiles/chem.yml rename to Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/chem.yml diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml similarity index 94% rename from Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Projectiles/pistol.yml rename to Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml index 53aadeeb588..34b33492a99 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Projectiles/pistol.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml @@ -1,3 +1,4 @@ +# Upstream - type: entity id: BulletPistolEmp name: bullet (.35 auto emp) diff --git a/Resources/Prototypes/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml similarity index 100% rename from Resources/Prototypes/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml rename to Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml index 99435076361..db1a4d07339 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml @@ -1,3 +1,4 @@ +# Upstream - type: entity id: SpeedLoaderPistolRubber name: "speed loader (.35 auto rubber)" diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml similarity index 100% rename from Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml rename to Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml From c5a8cefc3d48bfcc161c80330bfaf31351c2ea12 Mon Sep 17 00:00:00 2001 From: Dvir Date: Wed, 5 Jun 2024 02:03:56 +0300 Subject: [PATCH 08/25] Fixup --- .../Structures/Doors/Windoors/windoor.yml | 18 ++++++----------- .../Structures/Doors/Windoors/windoor.yml | 20 +++++++++++-------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml index fb0895f62cb..70d4b958258 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml @@ -3,21 +3,15 @@ id: WindoorMailLocked suffix: Mail, Locked components: - - type: AccessReader - access: [["Mail"]] # Frontier - Service Date: Wed, 5 Jun 2024 02:10:36 +0300 Subject: [PATCH 09/25] Update migration.yml --- Resources/migration.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/migration.yml b/Resources/migration.yml index b50c5992ad0..8bc30012c98 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -20,7 +20,8 @@ WindoorSecurityLocked: WindoorSecureSecurityLocked WindoorScienceLocked: WindoorSecureScienceLocked WindoorHeadOfPersonnelLocked: WindoorSecureHeadOfPersonnelLocked WindoorAtmosphericsLocked: WindoorSecureAtmosphericsLocked -WindoorParamedicLocked: WindoorSecureParamedicLocked +WindoorParamedicLocked: WindoorSecureMedicalLocked +WindoorSecureParamedicLocked: WindoorSecureMedicalLocked # 2023-07-03 ClothingHeadHelmetHelmet: ClothingHeadHelmetBasic From 41055f2a28a3c489f4dcf6fc7190995abe38c346 Mon Sep 17 00:00:00 2001 From: Dvir Date: Thu, 6 Jun 2024 00:44:13 +0300 Subject: [PATCH 10/25] Update pistol.yml --- .../Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index b55961a87f6..850be4b1307 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -304,7 +304,7 @@ - type: entity id: MagazinePistolSubMachineGunUranium - name: SMG magazine (.35 auto rubber) + name: SMG magazine (.35 auto uranium) parent: BaseMagazinePistolSubMachineGun components: - type: BallisticAmmoProvider From 652b8e99b8dab5de1950068fcd89abd8cf9cdfff Mon Sep 17 00:00:00 2001 From: Checkraze <71046427+Cheackraze@users.noreply.github.com> Date: Wed, 5 Jun 2024 19:23:48 -0400 Subject: [PATCH 11/25] Mini Auth (#1465) * initial commit * IOC * no lists in toml * maybe * hm * dependent * undo * no tolerance * maybe no instantiate * double * maybe strings * patch * proper string handling * go back * redo * lets try this way eh * auth cmon * test logging * whoops * our own record * put it inside the if * eh * the worlds a stage * or not * hu * cleanup * rearrange the try catch to include the initial connection call as well * shorten it up try to simplify * no jack * locale --- Content.Client/RCD/RCDMenu.xaml.cs | 8 +- Content.Server.Database/Model.cs | 1 + Content.Server/Administration/ServerApi.cs | 4 +- .../Connection/ConnectionManager.cs | 20 +++++ Content.Server/Entry/EntryPoint.cs | 2 + Content.Server/IoC/ServerContentIoC.cs | 3 + Content.Server/_NF/Auth/Auth.cs | 88 +++++++++++++++++++ Content.Shared/CCVar/CCVars.cs | 5 ++ Content.Shared/Chat/SharedChatSystem.cs | 8 +- .../Locale/en-US/_NF/adventure/adventure.ftl | 1 + 10 files changed, 136 insertions(+), 4 deletions(-) create mode 100644 Content.Server/_NF/Auth/Auth.cs diff --git a/Content.Client/RCD/RCDMenu.xaml.cs b/Content.Client/RCD/RCDMenu.xaml.cs index 51ec66ea444..3eb0397a690 100644 --- a/Content.Client/RCD/RCDMenu.xaml.cs +++ b/Content.Client/RCD/RCDMenu.xaml.cs @@ -68,7 +68,7 @@ public RCDMenu(EntityUid owner, RCDMenuBoundUserInterface bui) tooltip = Loc.GetString(entProto.Name); } - tooltip = char.ToUpper(tooltip[0]) + tooltip.Remove(0, 1); + tooltip = OopsConcat(char.ToUpper(tooltip[0]).ToString(), tooltip.Remove(0, 1)); var button = new RCDMenuButton() { @@ -119,6 +119,12 @@ public RCDMenu(EntityUid owner, RCDMenuBoundUserInterface bui) SendRCDSystemMessageAction += bui.SendRCDSystemMessage; } + private static string OopsConcat(string a, string b) + { + // This exists to prevent Roslyn being clever and compiling something that fails sandbox checks. + return a + b; + } + private void AddRCDMenuButtonOnClickActions(Control control) { var radialContainer = control as RadialContainer; diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs index b6ca9d95d0b..eab62702ffe 100644 --- a/Content.Server.Database/Model.cs +++ b/Content.Server.Database/Model.cs @@ -881,6 +881,7 @@ public enum ConnectionDenyReason : byte Whitelist = 1, Full = 2, Panic = 3, + Connected = 4, } public class ServerBanHit diff --git a/Content.Server/Administration/ServerApi.cs b/Content.Server/Administration/ServerApi.cs index 04fd38598fb..2f7bcbe48e2 100644 --- a/Content.Server/Administration/ServerApi.cs +++ b/Content.Server/Administration/ServerApi.cs @@ -67,7 +67,7 @@ void IPostInjectInit.PostInject() _sawmill = _logManager.GetSawmill("serverApi"); // Get - RegisterActorHandler(HttpMethod.Get, "/admin/info", InfoHandler); + RegisterHandler(HttpMethod.Get, "/admin/info", InfoHandler); //frontier - not sure why this action needs an actor RegisterHandler(HttpMethod.Get, "/admin/game_rules", GetGameRules); RegisterHandler(HttpMethod.Get, "/admin/presets", GetPresets); @@ -452,7 +452,7 @@ await context.RespondJsonAsync(new GameruleResponse /// /// Handles fetching information. /// - private async Task InfoHandler(IStatusHandlerContext context, Actor actor) + private async Task InfoHandler(IStatusHandlerContext context) //frontier - we had an actor here and never used it so we drop it for now until im compelled to re-add it { /* Information to display diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs index cd89f48d49f..4b57aa66157 100644 --- a/Content.Server/Connection/ConnectionManager.cs +++ b/Content.Server/Connection/ConnectionManager.cs @@ -2,6 +2,8 @@ using System.Runtime.InteropServices; using System.Text.Json.Nodes; using System.Threading.Tasks; +using Content.Server._NF.Auth; +using Content.Server.Administration; using Content.Server.Database; using Content.Server.GameTicking; using Content.Server.Preferences.Managers; @@ -48,6 +50,9 @@ public sealed class ConnectionManager : IConnectionManager [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly ILogManager _logManager = default!; + //frontier + [Dependency] private readonly MiniAuthManager _authManager = default!; + private readonly Dictionary _temporaryBypasses = []; private ISawmill _sawmill = default!; @@ -228,6 +233,21 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e) } } + //Frontier + //This is our little chunk that serves as a dAuth. It takes in a comma seperated list of IP:PORT, and chekcs + //the requesting player against the list of players logged in to other servers. It is intended to be failsafe. + //In the case of Admins, it shares the same bypass setting as the soft_max_player_limit + if (!_cfg.GetCVar(CCVars.AllowMultiConnect) && !adminBypass) + { + var serverListString = _cfg.GetCVar(CCVars.ServerAuthList); + var serverList = serverListString.Split(","); + foreach (var server in serverList) + { + if (await _authManager.IsPlayerConnected(server, userId)) + return (ConnectionDenyReason.Connected, Loc.GetString("multiauth-already-connected"), null); + } + } + // end Frontier return null; } diff --git a/Content.Server/Entry/EntryPoint.cs b/Content.Server/Entry/EntryPoint.cs index 3cdf3bfe8e2..4c43670a053 100644 --- a/Content.Server/Entry/EntryPoint.cs +++ b/Content.Server/Entry/EntryPoint.cs @@ -1,3 +1,4 @@ +using Content.Server._NF.Auth; using Content.Server.Acz; using Content.Server.Administration; using Content.Server.Administration.Logs; @@ -103,6 +104,7 @@ public override void Init() IoCManager.Resolve().Initialize(); IoCManager.Resolve().Initialize(); IoCManager.Resolve().Initialize(); + IoCManager.Resolve(); _voteManager.Initialize(); _updateManager.Initialize(); diff --git a/Content.Server/IoC/ServerContentIoC.cs b/Content.Server/IoC/ServerContentIoC.cs index f6800f72890..8bd866a20d3 100644 --- a/Content.Server/IoC/ServerContentIoC.cs +++ b/Content.Server/IoC/ServerContentIoC.cs @@ -1,3 +1,4 @@ +using Content.Server._NF.Auth; using Content.Server.Administration; using Content.Server.Administration.Logs; using Content.Server.Administration.Managers; @@ -61,6 +62,8 @@ public static void Register() IoCManager.Register(); IoCManager.Register(); IoCManager.Register(); + IoCManager.Register(); //Frontier + } } } diff --git a/Content.Server/_NF/Auth/Auth.cs b/Content.Server/_NF/Auth/Auth.cs new file mode 100644 index 00000000000..8ec682d07bc --- /dev/null +++ b/Content.Server/_NF/Auth/Auth.cs @@ -0,0 +1,88 @@ +using System.Net; +using System.Threading; +using System.Threading.Tasks; +using System.Net.Http; +using System.Net.Http.Json; +using System.Net.Http.Headers; +using Content.Shared.CCVar; +using Robust.Shared.Configuration; +using JetBrains.Annotations; + +namespace Content.Server._NF.Auth; + +public sealed class MiniAuthManager +{ + [Dependency] private readonly IConfigurationManager _cfg = default!; + + private readonly HttpClient _http = new(); + + /// + /// Frontier function to ping a server and check to see if the given player is currently connected to the given server. + /// Servers using this function must share an admin_api token as defined in their respective server_config.toml + /// + /// The address of the server to ping. + /// the GUID of the player to check for connection. + /// True if the response from the server is successful and the player is connected. False in any case of error, timeout, or failure. + public async Task IsPlayerConnected(string address, Guid player) + { + var connected = false; + var statusAddress = "http://" + address + "/admin/info"; + + var cancel = new CancellationToken(); + var linkedToken = CancellationTokenSource.CreateLinkedTokenSource(cancel); + linkedToken.CancelAfter(TimeSpan.FromSeconds(10)); + + _http.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("SS14Token", _cfg.GetCVar(CCVars.AdminApiToken)); + + //We need to do a try catch here because theres essentially no way to guarantee our json response is proper. + //Throughout all of this, we want it to fail to deny, not fail to allow, so if any step of our auth goes wrong, + //people can still connect. + try + { + var status = await _http.GetFromJsonAsync(statusAddress, linkedToken.Token); + + foreach (var connectedPlayer in status!.Players) + { + if (connectedPlayer.UserId == player) + { + connected = true; + break; + } + } + } + catch (Exception e) + { + } + return connected; + } + + /// + /// Record used to send the response for the info endpoint. + /// Frontier - This is a direct copy of ServerAPI.InfoResponse to match the json format. they kept it private so i just copied it + /// + [UsedImplicitly] + private sealed record InfoResponse + { + public required int RoundId { get; init; } + public required List Players { get; init; } + public required List GameRules { get; init; } + public required string? GamePreset { get; init; } + public required MapInfo? Map { get; init; } + public required string? MOTD { get; init; } + public required Dictionary PanicBunker { get; init; } + + public sealed class Player + { + public required Guid UserId { get; init; } + public required string Name { get; init; } + public required bool IsAdmin { get; init; } + public required bool IsDeadminned { get; init; } + } + + public sealed class MapInfo + { + public required string Id { get; init; } + public required string Name { get; init; } + } + } +} diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 4d9a704f521..a80567d0173 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -2045,6 +2045,11 @@ public static readonly CVarDef public static readonly CVarDef TippyEntity = CVarDef.Create("tippy.entity", "TippyClippy", CVar.SERVER | CVar.REPLICATED); // Frontier - Tippy ServerAuthList = + CVarDef.Create("frontier.auth_servers", "", CVar.CONFIDENTIAL | CVar.SERVERONLY); + + public static readonly CVarDef AllowMultiConnect = + CVarDef.Create("frontier.allow_multi_connect", true, CVar.CONFIDENTIAL | CVar.SERVERONLY); /* * DEBUG */ diff --git a/Content.Shared/Chat/SharedChatSystem.cs b/Content.Shared/Chat/SharedChatSystem.cs index e61d93efaeb..4f0b1465cd2 100644 --- a/Content.Shared/Chat/SharedChatSystem.cs +++ b/Content.Shared/Chat/SharedChatSystem.cs @@ -152,10 +152,16 @@ public string SanitizeMessageCapital(string message) if (string.IsNullOrEmpty(message)) return message; // Capitalize first letter - message = char.ToUpper(message[0]) + message.Remove(0, 1); + message = OopsConcat(char.ToUpper(message[0]).ToString(), message.Remove(0, 1)); return message; } + private static string OopsConcat(string a, string b) + { + // This exists to prevent Roslyn being clever and compiling something that fails sandbox checks. + return a + b; + } + public string SanitizeMessageCapitalizeTheWordI(string message, string theWordI = "i") { if (string.IsNullOrEmpty(message)) diff --git a/Resources/Locale/en-US/_NF/adventure/adventure.ftl b/Resources/Locale/en-US/_NF/adventure/adventure.ftl index 02872d0e3ae..a6fbf130949 100644 --- a/Resources/Locale/en-US/_NF/adventure/adventure.ftl +++ b/Resources/Locale/en-US/_NF/adventure/adventure.ftl @@ -21,6 +21,7 @@ shipyard-rules-default2 = shuttle-ftl-proximity = Nearby objects too massive for FTL! changelog-tab-title-Upstream = Upstream Changelog +multiauth-already-connected = Already connected to Frontier Official servers. public-transit-departure = Now departing for {$destination}. Estimated travel time: {$flytime} seconds. public-transit-arrival = Thank you for choosing NT Public Transit. Next transfer to {$destination} departs in {$waittime} seconds. \ No newline at end of file From 8c93948db2526acb4b506355c434fa82f649099b Mon Sep 17 00:00:00 2001 From: VividPups <150621839+VividPups@users.noreply.github.com> Date: Wed, 5 Jun 2024 18:27:21 -0500 Subject: [PATCH 12/25] Mosin Rework (#1391) * Testing? Mosin rework * Update snipers.yml * Update 2 * update 3 * Update snipers.yml * Update snipers.yml * Dumb updates updates do be dumb sometimes * WOULD THIS WORK? FUCK FUCK FU --- .../Objects/Weapons/Guns/Snipers/snipers.yml | 55 +++++++++++++++++-- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 9c9a8c77e57..42a34e78354 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -38,16 +38,63 @@ - type: StaticPrice price: 500 -- type: entity +- type: entity # Frontier - Mosin rework (PR#1391) name: Kardashev-Mosin parent: [BaseWeaponSniper, BaseGunWieldable] id: WeaponSniperMosin - description: A civilian grade weapon for hunting, or endless trench warfare. Uses .30 rifle ammo. + description: A civilian grade weapon for hunting, or endless trench warfare. Uses .30 rifle ammo. Now with new shiny bayonet! components: - type: Sprite sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi - - type: StaticPrice - price: 210 + state: base + - type: AmmoCounter + - type: Wieldable + - type: MeleeRequiresWield + - type: GunRequiresWield + - type: Gun + useKey: true + fireRate: 1 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/sniper.ogg + - type: BallisticAmmoProvider + capacity: 5 + proto: CartridgeLightRifle + whitelist: + tags: + - CartridgeLightRifle + - type: MeleeWeapon + attackRate: .85 + damage: + types: + Slash: 10 + Piercing: 5 + angle: 0 + wideAnimationRotation: -135 + animation: WeaponArcThrust + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: EmbeddableProjectile + offset: 0.15,0.15 + - type: ThrowingAngle + angle: -135 + - type: DamageOtherOnHit + damage: + types: + Slash: 5 + Piercing: 10 + - type: Sharp + - type: Clothing + quickEquip: false + slots: + - back + - suitStorage + sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi + - type: DisarmMalus + malus: 0.225 # End Frontier + - type: entity name: Hristov From 517a3d0aa7e7464a2b86d689e35d076a3a67412f Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Wed, 5 Jun 2024 23:27:46 +0000 Subject: [PATCH 13/25] Automatic Changelog (#1391) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 068b32bcd15..53c603d54b4 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4787,3 +4787,9 @@ Entries: message: Admeme Teleporter hotfix id: 5007 time: '2024-06-04T15:26:13.0000000+00:00' +- author: VividPups + changes: + - type: Tweak + message: Turns out Mosin's Bayonet had a Sheath on it + id: 5008 + time: '2024-06-05T23:27:21.0000000+00:00' From c89fbf7ed7f820869af8f61b1e3e99ad398351c3 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 6 Jun 2024 02:29:28 +0300 Subject: [PATCH 14/25] The Bird, the Vulp and the Un-Cloneable (#1316) * Vision filter accessibility option (#889) * Add option to disable vision filters * Remove DefaultVision in favor of the setting * Clean DeltaTab.xaml.cs * Fixing Vulps * Unclonable * Species vision fixes (#1150) Species vision fixes: no losing vision on nearby species vision haver getting gibbed, fix construction overlay * Update DCCVars.cs * Update OptionsMenu.xaml.cs * DeltaV * update * Update vulpkanin.yml --------- Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com> Co-authored-by: no <165581243+pissdemon@users.noreply.github.com> --- .../DeltaV/Options/UI/Tabs/DeltaTab.xaml | 23 ++++++++ .../DeltaV/Options/UI/Tabs/DeltaTab.xaml.cs | 46 +++++++++++++++ .../DeltaV/Overlays/UltraVisionOverlay.cs | 23 +++++--- .../DeltaV/Overlays/UltraVisionSystem.cs | 36 +++++++++++- .../Nyanotrasen/Overlays/DogVisionOverlay.cs | 51 ++++++++++++++++ .../{Overlays => }/DogVisionSystem.cs | 40 ++++++++----- .../Overlays/Overlays/DogVisionOverlay.cs | 45 -------------- Content.Client/Options/UI/OptionsMenu.xaml | 2 + Content.Client/Options/UI/OptionsMenu.xaml.cs | 1 + Content.Server/Cloning/CloningSystem.cs | 13 +++++ .../Traits/Assorted/UncloneableComponent.cs | 10 ++++ .../VulpLangaugeListenerComponent.cs | 7 --- .../VulpLanguageSpeakerComponent.cs | 7 --- .../VulpLanguage/VulpTranslatorComponent.cs | 7 --- .../DeltaV/Abilities/UltraVisionComponent.cs | 2 +- Content.Shared/DeltaV/CCVars/DCCVars.cs | 24 ++++++++ .../Station/SharedStationSpawningSystem.cs | 1 - .../VulpGiveTranslatorComponent.cs | 7 --- .../en-US/deltav/escape-menu/options-menu.ftl | 4 ++ .../Locale/en-US/deltav/traits/traits.ftl | 7 +++ .../VendingMachines/Inventories/vendomat.yml | 1 - .../DeltaV/Damage/modifier_sets.yml | 2 +- .../DeltaV/Entities/Mobs/Player/vulpkanin.yml | 12 ++-- .../Entities/Mobs/Species/vulpkanin.yml | 55 ++++++++---------- .../Objects/Devices/vulptranslator.yml | 14 ----- .../Prototypes/DeltaV/Traits/altvision.yml | 7 +++ .../Nyanotrasen/Entities/Mobs/NPCs/dogs.yml | 2 +- Resources/Prototypes/Traits/disabilities.yml | 9 ++- .../Prototypes/_NF/Traits/disabilities.yml | 5 -- .../creampie.rsi/creampie_vulpkanin.png | Bin 0 -> 522 bytes .../DeltaV/Effects/creampie.rsi/meta.json | 1 + .../Devices/vulp_translator.rsi/icon.png | Bin 236 -> 0 bytes .../Devices/vulp_translator.rsi/meta.json | 14 ----- 33 files changed, 301 insertions(+), 177 deletions(-) create mode 100644 Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml create mode 100644 Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml.cs create mode 100644 Content.Client/Nyanotrasen/Overlays/DogVisionOverlay.cs rename Content.Client/Nyanotrasen/Overlays/{Overlays => }/DogVisionSystem.cs (63%) delete mode 100644 Content.Client/Nyanotrasen/Overlays/Overlays/DogVisionOverlay.cs create mode 100644 Content.Server/Traits/Assorted/UncloneableComponent.cs delete mode 100644 Content.Server/_NF/VulpLanguage/VulpLangaugeListenerComponent.cs delete mode 100644 Content.Server/_NF/VulpLanguage/VulpLanguageSpeakerComponent.cs delete mode 100644 Content.Server/_NF/VulpLanguage/VulpTranslatorComponent.cs create mode 100644 Content.Shared/DeltaV/CCVars/DCCVars.cs delete mode 100644 Content.Shared/_NF/VulpLangauge/VulpGiveTranslatorComponent.cs create mode 100644 Resources/Locale/en-US/deltav/escape-menu/options-menu.ftl delete mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Devices/vulptranslator.yml delete mode 100644 Resources/Prototypes/_NF/Traits/disabilities.yml create mode 100644 Resources/Textures/DeltaV/Effects/creampie.rsi/creampie_vulpkanin.png create mode 100644 Resources/Textures/DeltaV/Effects/creampie.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Devices/vulp_translator.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Devices/vulp_translator.rsi/meta.json diff --git a/Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml b/Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml new file mode 100644 index 00000000000..f1dae68077d --- /dev/null +++ b/Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml @@ -0,0 +1,23 @@ + + + + + +