diff --git a/Resources/Maps/_NF/Shuttles/tyne.yml b/Resources/Maps/_NF/Shuttles/tyne.yml index ceee0ecaba2..78688103579 100644 --- a/Resources/Maps/_NF/Shuttles/tyne.yml +++ b/Resources/Maps/_NF/Shuttles/tyne.yml @@ -36,11 +36,11 @@ entities: version: 6 0,-1: ind: 0,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAARQAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAARQAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAdAAAAAABggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAADdAAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAADdAAAAAACggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAACdAAAAAACggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAAggAAAAAAggAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAARQAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAdAAAAAABggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAdAAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAdAAAAAACggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAACdAAAAAACggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAAggAAAAAAggAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAARQAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAdAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAARQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAdAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAARQAAAAAA version: 6 - type: Broadphase - type: Physics @@ -75,6 +75,11 @@ entities: id: BotGreyscale decals: 62: -1,2 + - node: + color: '#96DAFFFF' + id: BotGreyscale + decals: + 70: -1,-4 - node: cleanable: True color: '#96DAFFFF' @@ -87,6 +92,11 @@ entities: id: BotGreyscale decals: 63: -1,3 + - node: + color: '#FFFFFFFF' + id: Box + decals: + 68: -1,-8 - node: color: '#4B709C7F' id: BrickTileWhiteCornerNe @@ -192,8 +202,6 @@ entities: color: '#FFFFFFFF' id: DirtHeavyMonotile decals: - 38: -1,-8 - 39: 1,-8 40: -1,-7 41: 1,-7 44: 0,-1 @@ -236,9 +244,8 @@ entities: color: '#FFFFFFFF' id: StandClear decals: - 4: -1,-8 - 5: 1,-8 27: 0,-1 + 64: 0,-8 - node: color: '#FFFFFFFF' id: WarnCornerNE @@ -274,8 +281,8 @@ entities: color: '#FFFFFFFF' id: WarnLineN decals: - 2: -1,-8 - 3: 1,-8 + 65: 0,-8 + 69: 1,-8 - node: color: '#FFFFFFFF' id: WarnLineS @@ -310,17 +317,16 @@ entities: 0: 49288 2: 34 0,-3: - 0: 8192 + 0: 12288 2: 32768 - -1,-3: - 0: 32768 - 2: 8192 0,-2: - 0: 13090 + 0: 13107 2: 34952 -1,-2: - 0: 34952 + 0: 34824 2: 8738 + -1,-3: + 2: 8192 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -381,8 +387,6 @@ entities: parent: 2 - type: DeviceList devices: - - 136 - - 138 - 114 - 113 - 135 @@ -411,22 +415,22 @@ entities: - type: Transform pos: 1.5,-6.5 parent: 2 - - uid: 8 + - uid: 213 components: - type: Transform - pos: -0.5,-6.5 + pos: 0.5,-6.5 parent: 2 - proto: AirlockGlassShuttle entities: - - uid: 9 + - uid: 10 components: - type: Transform - pos: -0.5,-8.5 + pos: 1.5,-8.5 parent: 2 - - uid: 10 + - uid: 14 components: - type: Transform - pos: 1.5,-8.5 + pos: 0.5,-8.5 parent: 2 - proto: AirlockMedicalGlass entities: @@ -445,10 +449,10 @@ entities: parent: 2 - proto: AtmosDeviceFanDirectional entities: - - uid: 14 + - uid: 9 components: - type: Transform - pos: -0.5,-8.5 + pos: 0.5,-8.5 parent: 2 - uid: 15 components: @@ -621,17 +625,17 @@ entities: parent: 2 - proto: BoxBodyBag entities: - - uid: 47 + - uid: 165 components: - type: Transform - pos: -0.671875,-2.1547117 + pos: -0.6532581,-2.1312675 parent: 2 - proto: BoxPaper entities: - - uid: 13 + - uid: 111 components: - type: Transform - pos: 1.7410264,4.3407273 + pos: 1.4625001,4.3004127 parent: 2 - proto: CableApcExtension entities: @@ -695,32 +699,12 @@ entities: - type: Transform pos: 0.5,-5.5 parent: 2 - - uid: 61 - components: - - type: Transform - pos: -0.5,-5.5 - parent: 2 - - uid: 62 - components: - - type: Transform - pos: -0.5,-6.5 - parent: 2 - uid: 63 - components: - - type: Transform - pos: 1.5,-5.5 - parent: 2 - - uid: 64 - components: - - type: Transform - pos: 1.5,-6.5 - parent: 2 - - uid: 65 components: - type: Transform pos: 1.5,-7.5 parent: 2 - - uid: 66 + - uid: 64 components: - type: Transform pos: -0.5,-7.5 @@ -730,34 +714,32 @@ entities: - type: Transform pos: 0.5,-1.5 parent: 2 - - uid: 68 + - uid: 119 components: - type: Transform - pos: 0.5,5.5 + pos: 0.5,-7.5 + parent: 2 + - uid: 162 + components: + - type: Transform + pos: 0.5,-6.5 parent: 2 - proto: CableHV entities: - uid: 69 components: - type: Transform - pos: -0.5,0.5 + pos: 0.5,3.5 parent: 2 - uid: 70 components: - type: Transform pos: -0.5,1.5 parent: 2 -- proto: CableMV - entities: - - uid: 71 - components: - - type: Transform - pos: 0.5,2.5 - parent: 2 - uid: 72 components: - type: Transform - pos: -0.5,0.5 + pos: 0.5,4.5 parent: 2 - uid: 73 components: @@ -767,7 +749,24 @@ entities: - uid: 74 components: - type: Transform - pos: -0.5,1.5 + pos: 0.5,2.5 + parent: 2 + - uid: 200 + components: + - type: Transform + pos: 2.5,4.5 + parent: 2 + - uid: 202 + components: + - type: Transform + pos: 1.5,4.5 + parent: 2 +- proto: CableMV + entities: + - uid: 71 + components: + - type: Transform + pos: 2.5,4.5 parent: 2 - uid: 75 components: @@ -779,15 +778,15 @@ entities: - type: Transform pos: 0.5,4.5 parent: 2 - - uid: 77 + - uid: 78 components: - type: Transform - pos: 0.5,3.5 + pos: -1.5,4.5 parent: 2 - - uid: 78 + - uid: 157 components: - type: Transform - pos: -1.5,4.5 + pos: 1.5,4.5 parent: 2 - proto: Catwalk entities: @@ -881,11 +880,10 @@ entities: parent: 2 - proto: ClosetWallO2N2FilledRandom entities: - - uid: 1 + - uid: 68 components: - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,-1.5 + pos: -0.5,-6.5 parent: 2 - proto: ComputerCrewMonitoring entities: @@ -908,16 +906,36 @@ entities: - type: Transform pos: -0.5,5.5 parent: 2 +- proto: ComputerWallmountWithdrawBankATM + entities: + - uid: 61 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-7.5 + parent: 2 - proto: DefibrillatorCabinetFilled entities: - - uid: 102 + - uid: 47 components: - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,-6.5 + rot: 1.5707963267948966 rad + pos: -1.5,-4.5 parent: 2 - proto: EmergencyLight entities: + - uid: 13 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,1.5 + parent: 2 + - uid: 65 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-7.5 + parent: 2 - uid: 103 components: - type: Transform @@ -941,36 +959,24 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,0.5 parent: 2 +- proto: EmergencyRollerBed + entities: - uid: 107 components: - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,1.5 - parent: 2 - - uid: 108 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-7.5 + pos: -0.5,-3.5 parent: 2 -- proto: EmergencyRollerBed - entities: - uid: 109 components: - type: Transform pos: 1.5,-3.5 parent: 2 - - uid: 110 - components: - - type: Transform - pos: 1.5,-4.5 - parent: 2 - proto: ExtinguisherCabinetFilled entities: - - uid: 95 + - uid: 181 components: - type: Transform - pos: -1.5,-5.5 + pos: 1.5,-1.5 parent: 2 - proto: FaxMachineShip entities: @@ -1036,11 +1042,19 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 119 + - uid: 242 components: - type: Transform rot: -1.5707963267948966 rad - pos: 1.5,-4.5 + pos: 0.5,-7.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 248 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-3.5 parent: 2 - type: AtmosPipeColor color: '#0055CCFF' @@ -1123,15 +1137,68 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 130 + - uid: 136 components: - type: Transform - pos: 1.5,-3.5 + rot: 3.141592653589793 rad + pos: 1.5,-4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 138 + components: + - type: Transform + pos: 0.5,-5.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 155 + components: + - type: Transform + pos: 1.5,-5.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 240 + components: + - type: Transform + pos: 0.5,-6.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 241 + components: + - type: Transform + pos: 1.5,-6.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 246 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 247 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-3.5 parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasPipeTJunction entities: + - uid: 130 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-4.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 131 components: - type: Transform @@ -1148,6 +1215,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 245 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPort entities: - uid: 133 @@ -1178,15 +1253,20 @@ entities: - 3 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 136 + - uid: 244 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,-4.5 + rot: 3.141592653589793 rad + pos: 1.5,-7.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 250 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-4.5 parent: 2 - - type: DeviceNetwork - deviceLists: - - 3 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasVentScrubber @@ -1202,15 +1282,20 @@ entities: - 3 - type: AtmosPipeColor color: '#990000FF' - - uid: 138 + - uid: 243 components: - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,-3.5 + rot: 1.5707963267948966 rad + pos: -0.5,-7.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 249 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-4.5 parent: 2 - - type: DeviceNetwork - deviceLists: - - 3 - type: AtmosPipeColor color: '#990000FF' - proto: GravityGeneratorMini @@ -1300,6 +1385,13 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,6.5 parent: 2 +- proto: Gyroscope + entities: + - uid: 197 + components: + - type: Transform + pos: 1.5,2.5 + parent: 2 - proto: LockerParamedicFilled entities: - uid: 156 @@ -1314,27 +1406,49 @@ entities: - type: Transform pos: 1.5,0.5 parent: 2 +- proto: LockerWallMaterialsBasic10Filled + entities: + - uid: 102 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-5.5 + parent: 2 - proto: LockerWallMaterialsFuelPlasmaFilled entities: - - uid: 166 + - uid: 77 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,4.5 + rot: 3.141592653589793 rad + pos: -0.5,0.5 + parent: 2 +- proto: MedicalTechFab + entities: + - uid: 66 + components: + - type: Transform + pos: -0.5,-5.5 parent: 2 - proto: MedkitOxygenFilled entities: - - uid: 157 + - uid: 95 components: - type: Transform - pos: -0.3125,-2.3422117 + pos: -0.3407581,-2.3656425 parent: 2 -- proto: NFSignDock +- proto: NFPosterContrabandEmsCoords entities: - - uid: 169 + - uid: 8 components: - type: Transform - pos: 0.5,-8.5 + pos: -1.5,-3.5 + parent: 2 +- proto: NFSignEms1 + entities: + - uid: 234 + components: + - type: Transform + pos: -0.5,-8.5 parent: 2 - proto: NitrogenCanister entities: @@ -1363,17 +1477,6 @@ entities: - type: Transform pos: -0.5,1.5 parent: 2 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static -- proto: PosterLegitHelpOthers - entities: - - uid: 162 - components: - - type: Transform - pos: -1.5,-3.5 - parent: 2 - proto: PosterLegitSMEpi entities: - uid: 163 @@ -1383,18 +1486,24 @@ entities: parent: 2 - proto: PowerCellMedium entities: - - uid: 164 + - uid: 231 components: - type: Transform - pos: -0.671875,-2.5140867 + pos: -0.7001331,-2.5687675 parent: 2 - proto: PoweredLEDSmallLight entities: - - uid: 161 + - uid: 108 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-7.5 + parent: 2 + - uid: 203 components: - type: Transform rot: 3.141592653589793 rad - pos: 1.5,-0.5 + pos: -0.5,-0.5 parent: 2 - proto: PoweredlightGreen entities: @@ -1412,11 +1521,11 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,-3.5 parent: 2 - - uid: 111 + - uid: 110 components: - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,1.5 + rot: -1.5707963267948966 rad + pos: 1.5,4.5 parent: 2 - proto: PoweredlightRed entities: @@ -1426,13 +1535,6 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,-5.5 parent: 2 -- proto: PoweredSmallLight - entities: - - uid: 234 - components: - - type: Transform - pos: 0.5,-7.5 - parent: 2 - proto: Railing entities: - uid: 170 @@ -1496,12 +1598,12 @@ entities: rot: 3.141592653589793 rad pos: 3.5,1.5 parent: 2 -- proto: RandomPosterAny +- proto: RandomPosterLegit entities: - - uid: 165 + - uid: 232 components: - type: Transform - pos: 1.5,-1.5 + pos: -1.5,-7.5 parent: 2 - proto: ShuttleWindow entities: @@ -1595,31 +1697,23 @@ entities: - type: Transform pos: 2.5,0.5 parent: 2 -- proto: SmallGyroscope +- proto: SpawnPointLatejoin entities: - - uid: 155 + - uid: 251 components: - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,2.5 + pos: 0.5,-4.5 parent: 2 -- proto: SpawnPointLatejoin +- proto: StasisBed entities: - - uid: 200 + - uid: 1 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-5.5 + pos: 1.5,-4.5 parent: 2 - proto: SteelBench entities: - - uid: 201 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-3.5 - parent: 2 - - uid: 202 + - uid: 164 components: - type: Transform rot: 1.5707963267948966 rad @@ -1627,10 +1721,10 @@ entities: parent: 2 - proto: SubstationWallBasic entities: - - uid: 203 + - uid: 204 components: - type: Transform - pos: -0.5,0.5 + pos: 2.5,4.5 parent: 2 - proto: Table entities: @@ -1689,14 +1783,23 @@ entities: parent: 2 - proto: VendingMachineWallMedical entities: - - uid: 213 + - uid: 161 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-5.5 + pos: -0.5,-1.5 parent: 2 - proto: WallShuttle entities: + - uid: 62 + components: + - type: Transform + pos: -0.5,-8.5 + parent: 2 + - uid: 169 + components: + - type: Transform + pos: -0.5,-6.5 + parent: 2 - uid: 214 components: - type: Transform @@ -1782,16 +1885,6 @@ entities: - type: Transform pos: 2.5,-1.5 parent: 2 - - uid: 231 - components: - - type: Transform - pos: 0.5,-8.5 - parent: 2 - - uid: 232 - components: - - type: Transform - pos: 0.5,-6.5 - parent: 2 - uid: 233 components: - type: Transform @@ -1817,7 +1910,15 @@ entities: - type: Transform pos: -1.5,-4.5 parent: 2 -- proto: WarpPointShip +- proto: WallWeaponCapacitorRechargerOmnidirectional + entities: + - uid: 166 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-5.5 + parent: 2 +- proto: WarpPoint entities: - uid: 239 components: diff --git a/Resources/Prototypes/_NF/Shipyard/tyne.yml b/Resources/Prototypes/_NF/Shipyard/tyne.yml index e4f615d1d0a..f8be91c4700 100644 --- a/Resources/Prototypes/_NF/Shipyard/tyne.yml +++ b/Resources/Prototypes/_NF/Shipyard/tyne.yml @@ -7,13 +7,13 @@ # Discord: Tych0 # Shuttle Notes: -# +# Inspired by the Tyne-Class lifeboat: https://en.wikipedia.org/wiki/Tyne-class_lifeboat - type: vessel id: Tyne parent: BaseVessel name: SBB Tyne description: A small, agile lifeboat with an exterior deck and survivor cabin for search and rescue operations. - price: 20750 #~6% markup as it's a med ship. Appraises at ~19350. + price: 22250 #~5% markup as it's a med ship. Appraises at ~21001. category: Small group: Shipyard shuttlePath: /Maps/_NF/Shuttles/tyne.yml