diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index c410cbe43e2..7a799796446 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4680,3 +4680,17 @@ Entries: message: Fixed Clippy not hearing Service Radio id: 4993 time: '2024-05-26T14:18:25.0000000+00:00' +- author: MagnusCrowe + changes: + - type: Tweak + message: Ships can only hire contractors, pilots, and mercs now. + id: 4994 + time: '2024-05-28T15:26:52.0000000+00:00' +- author: UncaughtEx + changes: + - type: Add + message: >- + Introducing from SBI, with Blueprints graciously supplied by the NT + archives, the Crown, for all your Civilian Templar oriented needs! + id: 4995 + time: '2024-05-29T06:42:09.0000000+00:00' diff --git a/Resources/Maps/_NF/Shuttles/crown.yml b/Resources/Maps/_NF/Shuttles/crown.yml new file mode 100644 index 00000000000..c56f519efac --- /dev/null +++ b/Resources/Maps/_NF/Shuttles/crown.yml @@ -0,0 +1,1783 @@ +meta: + format: 6 + postmapinit: false +tilemap: + 0: Space + 30: FloorDark + 1: FloorGlass + 57: FloorHull + 65: FloorMetalDiamond + 107: FloorTechMaint + 124: Lattice + 125: Plating +entities: +- proto: "" + entities: + - uid: 1 + components: + - type: MetaData + name: grid + - type: Transform + parent: invalid + - type: MapGrid + chunks: + 0,0: + ind: 0,0 + tiles: QQAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAQQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAACOQAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAABOQAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAACOQAAAAAAAAAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 0,-1: + ind: 0,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAABHgAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAACHgAAAAACfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAHgAAAAACHgAAAAADHgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAawAAAAAAHgAAAAACfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,0: + ind: -1,0 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAOQAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAOQAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAAAAAAAAAOQAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,-1: + ind: -1,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAHgAAAAACHgAAAAADHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAACfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAABHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: + - node: + color: '#5E7C1696' + id: CheckerNESW + decals: + 31: 0,-6 + 32: 1,-5 + 33: 0,-5 + 34: 1,-6 + 35: 2,-5 + 36: 2,-4 + 37: 2,-6 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtHeavy + decals: + 38: 0,-5 + 39: 0,-6 + 40: 1,-6 + 41: 1,-5 + 42: 2,-5 + 43: 2,-6 + 55: -1,3 + 56: -1,4 + 57: -1,3 + 70: 1,3 + - node: + cleanable: True + angle: 1.5707963267948966 rad + color: '#FFFFFFFF' + id: DirtHeavy + decals: + 44: 0,-5 + - node: + cleanable: True + angle: 3.141592653589793 rad + color: '#FFFFFFFF' + id: DirtHeavy + decals: + 45: 1,-5 + - node: + cleanable: True + angle: 4.71238898038469 rad + color: '#FFFFFFFF' + id: DirtHeavy + decals: + 46: -2,-6 + 47: -2,-5 + - node: + cleanable: True + angle: 6.283185307179586 rad + color: '#FFFFFFFF' + id: DirtHeavy + decals: + 48: -2,-6 + - node: + cleanable: True + angle: 7.853981633974483 rad + color: '#FFFFFFFF' + id: DirtHeavy + decals: + 49: -1,-6 + 50: -1,-5 + - node: + cleanable: True + angle: 9.42477796076938 rad + color: '#FFFFFFFF' + id: DirtHeavy + decals: + 51: -2,-6 + 52: -1,-6 + 53: -2,-5 + 54: 0,-5 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtHeavyMonotile + decals: + 58: 0,4 + 59: 1,4 + 60: 1,5 + 61: 0,5 + 62: -1,5 + 71: -1,1 + 72: -1,1 + 73: -1,1 + 74: 0,1 + 75: 0,1 + 76: 1,1 + 77: 1,1 + 78: -2,-1 + 79: -1,-1 + 81: 1,-1 + 82: 2,-1 + 83: 2,-1 + 84: 1,-1 + 87: -1,-1 + 88: -2,-1 + 89: 1,-1 + 90: 1,-1 + 91: 2,-1 + 92: 2,-1 + 93: 1,-1 + 96: 0,-1 + 97: 0,-1 + - node: + cleanable: True + angle: 1.5707963267948966 rad + color: '#FFFFFFFF' + id: DirtHeavyMonotile + decals: + 98: 0,-1 + 99: 0,-1 + - node: + cleanable: True + angle: 3.141592653589793 rad + color: '#FFFFFFFF' + id: DirtHeavyMonotile + decals: + 100: 1,-1 + 101: 1,-1 + 102: 0,-1 + 103: 0,-1 + 107: -2,-3 + 108: -1,-3 + 109: -2,-3 + 110: -1,-3 + 111: 1,-3 + 112: 1,-3 + 113: 2,-3 + 114: 1,-3 + 115: 0,-3 + 116: -1,-3 + 117: -1,-3 + - node: + cleanable: True + angle: 3.141592653589793 rad + color: '#FFFFFFFF' + id: DirtLight + decals: + 104: 0,-5 + 105: 1,-5 + 106: 1,-5 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtMedium + decals: + 63: 0,3 + 64: -1,3 + 65: 0,4 + 66: 0,4 + 67: 1,4 + 68: 1,3 + 69: 1,3 + - node: + color: '#FFFFFFFF' + id: LoadingArea + decals: + 30: 0,1 + - node: + color: '#5E7C1696' + id: QuarterTileOverlayGreyscale270 + decals: + 4: -1,-4 + 5: 1,-4 + 6: -1,2 + 7: -1,4 + 8: -1,5 + 9: 0,5 + 10: 1,5 + 11: 1,4 + 12: 1,3 + 13: 1,2 + 14: 0,2 + 24: -1,3 + 27: 0,3 + 28: 0,4 + - node: + color: '#5E7C1696' + id: QuarterTileOverlayGreyscale90 + decals: + 2: -1,-4 + 3: 1,-4 + 15: -1,4 + 16: -1,5 + 17: 0,5 + 18: 1,5 + 19: 1,4 + 20: 1,3 + 21: 1,2 + 22: 0,2 + 23: -1,2 + 25: -1,3 + 26: 0,3 + 29: 0,4 + - node: + color: '#FFFFFFFF' + id: WarnLineE + decals: + 1: 2,-1 + - node: + color: '#FFFFFFFF' + id: WarnLineS + decals: + 0: -2,-1 + - type: GridAtmosphere + version: 2 + data: + tiles: + 0,0: + 0: 12593 + 1: 136 + 0,-1: + 0: 29041 + 1: 34816 + -1,0: + 0: 32896 + 1: 4403 + 0,1: + 0: 51 + 1: 64 + -1,1: + 0: 137 + 1: 64 + 1,0: + 1: 4369 + 1,-1: + 1: 4368 + 0: 1 + 1,1: + 0: 1 + 0,-2: + 1: 34928 + 0: 30592 + -1,-2: + 1: 13248 + 0: 52256 + -1,-1: + 0: 49345 + 1: 13072 + 1,-2: + 1: 4352 + uniqueMixes: + - volume: 2500 + temperature: 293.15 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 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 + - type: BecomesStation + id: Crown +- proto: AirlockGlassShuttle + entities: + - uid: 201 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-3.5 + parent: 1 + - uid: 202 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-3.5 + parent: 1 +- proto: AirlockMercenary + entities: + - uid: 59 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 + - uid: 60 + components: + - type: Transform + pos: 0.5,2.5 + parent: 1 + - uid: 161 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 + - uid: 188 + components: + - type: Transform + pos: 0.5,-3.5 + parent: 1 +- proto: APCBasic + entities: + - uid: 112 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,2.5 + parent: 1 +- proto: AtmosDeviceFanTiny + entities: + - uid: 8 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-1.5 + parent: 1 + - uid: 164 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 +- proto: Bed + entities: + - uid: 224 + components: + - type: Transform + pos: -1.5,-4.5 + parent: 1 +- proto: BedsheetUSA + entities: + - uid: 225 + components: + - type: Transform + pos: -1.5,-4.5 + parent: 1 +- proto: BlastDoorOpen + entities: + - uid: 160 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-0.5 + parent: 1 + - type: DeviceLinkSink + links: + - 35 + - uid: 165 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-0.5 + parent: 1 + - type: DeviceLinkSink + links: + - 35 +- proto: Bucket + entities: + - uid: 196 + components: + - type: Transform + pos: -0.7327081,-4.212652 + parent: 1 +- proto: ButtonFrameCaution + entities: + - uid: 7 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-1.5 + parent: 1 +- proto: CableApcExtension + entities: + - uid: 13 + components: + - type: Transform + pos: 0.5,2.5 + parent: 1 + - uid: 14 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - uid: 15 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 + - uid: 16 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 + - uid: 17 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 + - uid: 18 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 1 + - uid: 19 + components: + - type: Transform + pos: 0.5,-3.5 + parent: 1 + - uid: 20 + components: + - type: Transform + pos: 0.5,3.5 + parent: 1 + - uid: 21 + components: + - type: Transform + pos: 0.5,4.5 + parent: 1 + - uid: 22 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 1 + - uid: 23 + components: + - type: Transform + pos: -1.5,-0.5 + parent: 1 + - uid: 24 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 + - uid: 25 + components: + - type: Transform + pos: 2.5,-0.5 + parent: 1 + - uid: 28 + components: + - type: Transform + pos: -0.5,-5.5 + parent: 1 + - uid: 29 + components: + - type: Transform + pos: 0.5,-5.5 + parent: 1 + - uid: 42 + components: + - type: Transform + pos: -1.5,-5.5 + parent: 1 + - uid: 48 + components: + - type: Transform + pos: 0.5,-4.5 + parent: 1 + - uid: 85 + components: + - type: Transform + pos: -2.5,-0.5 + parent: 1 + - uid: 104 + components: + - type: Transform + pos: -0.5,2.5 + parent: 1 + - uid: 116 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 173 + components: + - type: Transform + pos: -1.5,-4.5 + parent: 1 + - uid: 174 + components: + - type: Transform + pos: 0.5,-5.5 + parent: 1 + - uid: 175 + components: + - type: Transform + pos: 1.5,-5.5 + parent: 1 + - uid: 176 + components: + - type: Transform + pos: 2.5,-5.5 + parent: 1 + - uid: 177 + components: + - type: Transform + pos: 2.5,-4.5 + parent: 1 + - uid: 207 + components: + - type: Transform + pos: -3.5,0.5 + parent: 1 + - uid: 208 + components: + - type: Transform + pos: -3.5,-0.5 + parent: 1 + - uid: 209 + components: + - type: Transform + pos: -3.5,1.5 + parent: 1 + - uid: 210 + components: + - type: Transform + pos: 3.5,-0.5 + parent: 1 + - uid: 211 + components: + - type: Transform + pos: 4.5,-0.5 + parent: 1 + - uid: 212 + components: + - type: Transform + pos: 4.5,0.5 + parent: 1 + - uid: 213 + components: + - type: Transform + pos: 4.5,1.5 + parent: 1 + - uid: 216 + components: + - type: Transform + pos: -3.5,2.5 + parent: 1 + - uid: 217 + components: + - type: Transform + pos: 4.5,2.5 + parent: 1 +- proto: CableHV + entities: + - uid: 33 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 + - uid: 37 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 + - uid: 39 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 + - uid: 71 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 1 + - uid: 79 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 + - uid: 100 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - uid: 108 + components: + - type: Transform + pos: 2.5,1.5 + parent: 1 + - uid: 109 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 + - uid: 121 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 + - uid: 124 + components: + - type: Transform + pos: 2.5,-5.5 + parent: 1 + - uid: 128 + components: + - type: Transform + pos: 1.5,-5.5 + parent: 1 + - uid: 135 + components: + - type: Transform + pos: 0.5,-5.5 + parent: 1 + - uid: 150 + components: + - type: Transform + pos: 0.5,-4.5 + parent: 1 + - uid: 172 + components: + - type: Transform + pos: 0.5,-3.5 + parent: 1 +- proto: CableMV + entities: + - uid: 12 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - uid: 36 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 89 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 + - uid: 105 + components: + - type: Transform + pos: -0.5,2.5 + parent: 1 + - uid: 119 + components: + - type: Transform + pos: 2.5,1.5 + parent: 1 +- proto: Catwalk + entities: + - uid: 2 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-2.5 + parent: 1 + - uid: 3 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-3.5 + parent: 1 + - uid: 9 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,0.5 + parent: 1 + - uid: 10 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-0.5 + parent: 1 + - uid: 11 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-2.5 + parent: 1 + - uid: 41 + components: + - type: Transform + pos: 3.5,0.5 + parent: 1 + - uid: 43 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,0.5 + parent: 1 + - uid: 44 + components: + - type: Transform + pos: -2.5,-0.5 + parent: 1 + - uid: 46 + components: + - type: Transform + pos: 3.5,-0.5 + parent: 1 + - uid: 50 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-0.5 + parent: 1 + - uid: 53 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-1.5 + parent: 1 + - uid: 57 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-1.5 + parent: 1 + - uid: 58 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-1.5 + parent: 1 + - uid: 75 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,1.5 + parent: 1 + - uid: 94 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-1.5 + parent: 1 + - uid: 101 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,0.5 + parent: 1 + - uid: 102 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,2.5 + parent: 1 + - uid: 114 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-2.5 + parent: 1 + - uid: 123 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-2.5 + parent: 1 + - uid: 199 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-2.5 + parent: 1 + - uid: 200 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-3.5 + parent: 1 + - uid: 203 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,2.5 + parent: 1 + - uid: 204 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,1.5 + parent: 1 +- proto: ChairPilotSeat + entities: + - uid: 146 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,4.5 + parent: 1 + - uid: 147 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,4.5 + parent: 1 +- proto: ClosetWall + entities: + - uid: 189 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-6.5 + parent: 1 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 191 + - 190 +- proto: ComputerFrame + entities: + - uid: 145 + components: + - type: Transform + pos: -0.5,5.5 + parent: 1 +- proto: ComputerShuttle + entities: + - uid: 143 + components: + - type: Transform + pos: 1.5,5.5 + parent: 1 +- proto: ComputerStationRecords + entities: + - uid: 144 + components: + - type: Transform + pos: 0.5,5.5 + parent: 1 +- proto: DefibrillatorCabinetFilled + entities: + - uid: 170 + components: + - type: Transform + pos: 2.5,0.5 + parent: 1 +- proto: ExtinguisherCabinetFilled + entities: + - uid: 171 + components: + - type: Transform + pos: -1.5,0.5 + parent: 1 +- proto: FaxMachineShip + entities: + - uid: 168 + components: + - type: Transform + pos: 1.5,3.5 + parent: 1 +- proto: GasPassiveVent + entities: + - uid: 62 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 63 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasPipeFourway + entities: + - uid: 64 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasPipeStraight + entities: + - uid: 38 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 65 + components: + - type: Transform + pos: 1.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 66 + components: + - type: Transform + pos: 1.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 67 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 68 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 69 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 178 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 179 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 180 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 181 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 182 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 183 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 184 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 198 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 218 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 219 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 220 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 222 + components: + - type: Transform + pos: 0.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 227 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPipeTJunction + entities: + - uid: 70 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 197 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 223 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPort + entities: + - uid: 151 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-2.5 + parent: 1 +- proto: GasPressurePump + entities: + - uid: 139 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasVentPump + entities: + - uid: 127 + components: + - type: Transform + pos: 0.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 192 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-5.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 193 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasVentScrubber + entities: + - uid: 156 + components: + - type: Transform + pos: 1.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 185 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-5.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 186 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-5.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GravityGeneratorMini + entities: + - uid: 125 + components: + - type: Transform + pos: 2.5,-2.5 + parent: 1 +- proto: Grille + entities: + - uid: 56 + components: + - type: Transform + pos: -2.5,-3.5 + parent: 1 + - uid: 76 + components: + - type: Transform + pos: 3.5,-3.5 + parent: 1 + - uid: 77 + components: + - type: Transform + pos: 2.5,3.5 + parent: 1 + - uid: 83 + components: + - type: Transform + pos: -1.5,3.5 + parent: 1 + - uid: 86 + components: + - type: Transform + pos: -0.5,6.5 + parent: 1 + - uid: 113 + components: + - type: Transform + pos: 3.5,-4.5 + parent: 1 + - uid: 115 + components: + - type: Transform + pos: -2.5,-4.5 + parent: 1 + - uid: 129 + components: + - type: Transform + pos: -1.5,6.5 + parent: 1 + - uid: 136 + components: + - type: Transform + pos: 0.5,6.5 + parent: 1 + - uid: 137 + components: + - type: Transform + pos: 1.5,6.5 + parent: 1 + - uid: 138 + components: + - type: Transform + pos: 2.5,6.5 + parent: 1 +- proto: Gyroscope + entities: + - uid: 51 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-4.5 + parent: 1 + - type: Thruster + originalPowerLoad: 1500 +- proto: IntercomCommon + entities: + - uid: 52 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,4.5 + parent: 1 +- proto: LockerMercenaryFilled + entities: + - uid: 162 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 +- proto: PortableGeneratorPacmanShuttle + entities: + - uid: 120 + components: + - type: Transform + pos: 2.5,-5.5 + parent: 1 + - type: FuelGenerator + on: False + - type: Physics + bodyType: Static +- proto: PosterLegitEnlist + entities: + - uid: 152 + components: + - type: Transform + pos: -1.5,-1.5 + parent: 1 +- proto: PoweredLEDSmallLight + entities: + - uid: 226 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-2.5 + parent: 1 +- proto: Poweredlight + entities: + - uid: 6 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,1.5 + parent: 1 +- proto: PoweredlightColoredRed + entities: + - uid: 110 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,4.5 + parent: 1 +- proto: PoweredlightExterior + entities: + - uid: 214 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,4.5 + parent: 1 + - uid: 215 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,4.5 + parent: 1 +- proto: PoweredlightRed + entities: + - uid: 166 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 1 + - uid: 167 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 +- proto: PoweredlightSodium + entities: + - uid: 49 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-5.5 + parent: 1 +- proto: RandomPosterLegit + entities: + - uid: 153 + components: + - type: Transform + pos: -1.5,4.5 + parent: 1 + - uid: 154 + components: + - type: Transform + pos: 2.5,-1.5 + parent: 1 +- proto: ReinforcedWindow + entities: + - uid: 5 + components: + - type: Transform + pos: -2.5,-3.5 + parent: 1 + - uid: 54 + components: + - type: Transform + pos: -2.5,-4.5 + parent: 1 + - uid: 55 + components: + - type: Transform + pos: 3.5,-4.5 + parent: 1 + - uid: 74 + components: + - type: Transform + pos: -1.5,3.5 + parent: 1 + - uid: 78 + components: + - type: Transform + pos: 2.5,3.5 + parent: 1 + - uid: 80 + components: + - type: Transform + pos: 3.5,-3.5 + parent: 1 + - uid: 140 + components: + - type: Transform + pos: 1.5,6.5 + parent: 1 + - uid: 141 + components: + - type: Transform + pos: 0.5,6.5 + parent: 1 + - uid: 142 + components: + - type: Transform + pos: -0.5,6.5 + parent: 1 + - uid: 155 + components: + - type: Transform + pos: 2.5,6.5 + parent: 1 + - uid: 158 + components: + - type: Transform + pos: -1.5,6.5 + parent: 1 +- proto: SheetPlasma + entities: + - uid: 191 + components: + - type: Transform + parent: 189 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: SignalButton + entities: + - uid: 35 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-1.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 165: + - Pressed: Toggle + 160: + - Pressed: Toggle +- proto: SinkStemlessWater + entities: + - uid: 195 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-5.5 + parent: 1 +- proto: SpawnPointLatejoin + entities: + - uid: 149 + components: + - type: Transform + pos: -0.5,4.5 + parent: 1 +- proto: SubstationWallBasic + entities: + - uid: 157 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,1.5 + parent: 1 +- proto: SuitStorageWallmountEVAPrisoner + entities: + - uid: 87 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-6.5 + parent: 1 + - type: Physics + canCollide: False +- proto: SuitStorageWallmountMercenary + entities: + - uid: 163 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 + - type: Physics + canCollide: False +- proto: TableReinforced + entities: + - uid: 169 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,3.5 + parent: 1 +- proto: Thruster + entities: + - uid: 84 + components: + - type: Transform + pos: -2.5,1.5 + parent: 1 + - type: Thruster + originalPowerLoad: 1500 + - uid: 93 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-5.5 + parent: 1 + - type: Thruster + originalPowerLoad: 1500 + - uid: 117 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-4.5 + parent: 1 + - type: Thruster + originalPowerLoad: 1500 + - uid: 118 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-4.5 + parent: 1 + - type: Thruster + originalPowerLoad: 1500 + - uid: 194 + components: + - type: Transform + pos: 3.5,1.5 + parent: 1 + - type: Thruster + originalPowerLoad: 1500 + - uid: 221 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-5.5 + parent: 1 + - type: Thruster + originalPowerLoad: 1500 +- proto: WallReinforced + entities: + - uid: 4 + components: + - type: Transform + pos: -1.5,-6.5 + parent: 1 + - uid: 26 + components: + - type: Transform + pos: -0.5,-6.5 + parent: 1 + - uid: 27 + components: + - type: Transform + pos: 1.5,-6.5 + parent: 1 + - uid: 30 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 + - uid: 31 + components: + - type: Transform + pos: 1.5,0.5 + parent: 1 + - uid: 32 + components: + - type: Transform + pos: -1.5,-3.5 + parent: 1 + - uid: 34 + components: + - type: Transform + pos: -0.5,0.5 + parent: 1 + - uid: 40 + components: + - type: Transform + pos: 2.5,-3.5 + parent: 1 + - uid: 45 + components: + - type: Transform + pos: -2.5,-1.5 + parent: 1 + - uid: 47 + components: + - type: Transform + pos: 3.5,-1.5 + parent: 1 + - uid: 61 + components: + - type: Transform + pos: 0.5,-6.5 + parent: 1 + - uid: 73 + components: + - type: Transform + pos: -2.5,-2.5 + parent: 1 + - uid: 81 + components: + - type: Transform + pos: 3.5,-5.5 + parent: 1 + - uid: 82 + components: + - type: Transform + pos: -2.5,-5.5 + parent: 1 + - uid: 88 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 1 + - uid: 90 + components: + - type: Transform + pos: -1.5,4.5 + parent: 1 + - uid: 91 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 + - uid: 92 + components: + - type: Transform + pos: 2.5,1.5 + parent: 1 + - uid: 95 + components: + - type: Transform + pos: -1.5,2.5 + parent: 1 + - uid: 96 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 97 + components: + - type: Transform + pos: 2.5,4.5 + parent: 1 + - uid: 98 + components: + - type: Transform + pos: -1.5,-1.5 + parent: 1 + - uid: 103 + components: + - type: Transform + pos: 3.5,-2.5 + parent: 1 + - uid: 106 + components: + - type: Transform + pos: 2.5,-1.5 + parent: 1 + - uid: 107 + components: + - type: Transform + pos: -1.5,5.5 + parent: 1 + - uid: 111 + components: + - type: Transform + pos: 2.5,5.5 + parent: 1 + - uid: 122 + components: + - type: Transform + pos: 2.5,0.5 + parent: 1 + - uid: 126 + components: + - type: Transform + pos: 1.5,-1.5 + parent: 1 + - uid: 130 + components: + - type: Transform + pos: -0.5,-3.5 + parent: 1 + - uid: 131 + components: + - type: Transform + pos: -1.5,0.5 + parent: 1 + - uid: 132 + components: + - type: Transform + pos: -0.5,2.5 + parent: 1 + - uid: 133 + components: + - type: Transform + pos: 2.5,-6.5 + parent: 1 + - uid: 134 + components: + - type: Transform + pos: 1.5,-3.5 + parent: 1 + - uid: 205 + components: + - type: Transform + anchored: False + pos: 4.5,3.5 + parent: 1 + - type: Physics + bodyType: Dynamic + - uid: 206 + components: + - type: Transform + anchored: False + pos: -3.5,3.5 + parent: 1 + - type: Physics + bodyType: Dynamic +- proto: WallReinforcedDiagonal + entities: + - uid: 72 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-6.5 + parent: 1 + - uid: 99 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-6.5 + parent: 1 +- proto: WarpPointShip + entities: + - uid: 159 + components: + - type: Transform + pos: 0.5,3.5 + parent: 1 +- proto: WindoorSecureMercenaryLocked + entities: + - uid: 148 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-5.5 + parent: 1 + - type: DeviceLinkSource + lastSignals: + DoorStatus: True + - type: Door + secondsUntilStateChange: -1327.9542 + state: Opening +- proto: WindowReinforcedDirectional + entities: + - uid: 187 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-4.5 + parent: 1 +- proto: Wrench + entities: + - uid: 190 + components: + - type: Transform + parent: 189 + - type: Physics + canCollide: False + - type: InsideEntityStorage +... diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml index ef3803c9b09..04fdb3cddbf 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml @@ -28,8 +28,6 @@ - type: StationJobs overflowJobs: [] availableJobs: + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] - ChiefEngineer: [ 0, 0 ] - AtmosphericTechnician: [ 0, 0 ] - StationEngineer: [ 0, 0 ] - SalvageSpecialist: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml index b7df839e79d..2010083f2dc 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml @@ -24,12 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - ServiceWorker: [ 0, 0 ] - ChiefEngineer: [ 0, 0 ] - Chaplain: [ 0, 0 ] - MedicalDoctor: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] Mercenary: [ 0, 0 ] - StationEngineer: [ 0, 0 ] - AtmosphericTechnician: [ 0, 0 ] - Bartender: [ 0, 0 ] - Chef: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/courserx.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/courserx.yml index d7adef0cc10..03904985a98 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/courserx.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/courserx.yml @@ -24,7 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Bartender: [ 0, 0 ] - StationEngineer: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] Mercenary: [ 0, 0 ] - Paramedic: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/dartx.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/dartx.yml index b4f7377f9d1..09f906f3e64 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/dartx.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/dartx.yml @@ -34,8 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Bartender: [ 0, 0 ] - StationEngineer: [ 0, 0 ] - Clown: [ 0, 0 ] - Paramedic: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml index dcf4236b394..51dea8fa8aa 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml @@ -24,6 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - StationEngineer: [ 0, 0 ] - SalvageSpecialist: [ 0, 0 ] - Borg: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml index f56aa7950f1..1fa0aacba50 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml @@ -24,8 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - CargoTechnician: [ 0, 0 ] - Chemist: [ 0, 0 ] - SalvageSpecialist: [ 0, 0 ] - ServiceWorker: [ 0, 0 ] - StationEngineer: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml index 7d240bcd955..6bf8cb0a378 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml @@ -24,12 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - AtmosphericTechnician: [ 0, 0 ] - StationEngineer: [ 0, 0 ] - Scientist: [ 0, 0 ] - ResearchDirector: [ 0, 0 ] - Chef: [ 0, 0 ] - Bartender: [ 0, 0 ] - SalvageSpecialist: [ 0, 0 ] - Janitor: [ 0, 0 ] - Musician: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/kestrel.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/kestrel.yml index 6f78ca82a83..18b8729d79b 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/kestrel.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/kestrel.yml @@ -34,4 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - SalvageSpecialist: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/mayflower.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/mayflower.yml index 681219e5faf..f094a3a978f 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/mayflower.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/mayflower.yml @@ -24,5 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - MedicalDoctor: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml index 1fde59e74e5..518c30f308b 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml @@ -34,5 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] - SalvageSpecialist: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/praeda.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/praeda.yml index 7a8cd2743b4..51f35d343ff 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/praeda.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/praeda.yml @@ -34,12 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Quartermaster: [ 0, 0 ] - SalvageSpecialist: [ 0, 0 ] - CargoTechnician: [ 0, 0 ] - ChiefEngineer: [ 0, 0 ] - StationEngineer: [ 0, 0 ] - Bartender: [ 0, 0 ] - Paramedic: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] Mercenary: [ 0, 0 ] - Janitor: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/rosebudmkii.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/rosebudmkii.yml index 888c8f8e128..ebdabca3378 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/rosebudmkii.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/rosebudmkii.yml @@ -24,8 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - SalvageSpecialist: [ 0, 0 ] - Paramedic: [ 0, 0 ] - ChiefEngineer: [ 0, 0 ] - MedicalDoctor: [ 0, 0 ] - Chemist: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml index 508b5708779..affd1c9183f 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml @@ -24,7 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Bartender: [ 0, 0 ] - Paramedic: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] Mercenary: [ 0, 0 ] - SalvageSpecialist: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml index a314a68b3f9..e3bf5e242e2 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml @@ -23,4 +23,7 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: {} + availableJobs: + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml index 9e19732bf12..016aa03364d 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml @@ -27,4 +27,7 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: {} + availableJobs: + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml index 5e909a753e6..951891fbdb4 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml @@ -33,4 +33,7 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: {} + availableJobs: + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml index ce59eee2e29..3d1386b0bd4 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml @@ -33,4 +33,7 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: {} + availableJobs: + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml index 681d35cb4d3..dd99d59e449 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml @@ -23,4 +23,7 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: {} + availableJobs: + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml index 3c3dbc53c9d..e65aa0cb59b 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml @@ -23,4 +23,7 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: {} + availableJobs: + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml index 7c2c399fa0e..baa8f88af1b 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml @@ -23,4 +23,7 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: {} + availableJobs: + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/barge.yml b/Resources/Prototypes/_NF/Shipyard/barge.yml index 6c74ed83440..f5b7de62820 100644 --- a/Resources/Prototypes/_NF/Shipyard/barge.yml +++ b/Resources/Prototypes/_NF/Shipyard/barge.yml @@ -34,8 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - CargoTechnician: [ 0, 0 ] - Bartender: [ 0, 0 ] - SalvageSpecialist: [ 0, 0 ] - Quartermaster: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/bazaar.yml b/Resources/Prototypes/_NF/Shipyard/bazaar.yml index 0d9aa9f3880..5134da1be7a 100644 --- a/Resources/Prototypes/_NF/Shipyard/bazaar.yml +++ b/Resources/Prototypes/_NF/Shipyard/bazaar.yml @@ -24,7 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Quartermaster: [ 0, 0 ] - CargoTechnician: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] Mercenary: [ 0, 0 ] - ServiceWorker: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/bocadillo.yml b/Resources/Prototypes/_NF/Shipyard/bocadillo.yml index 680842d4371..01df23f502a 100644 --- a/Resources/Prototypes/_NF/Shipyard/bocadillo.yml +++ b/Resources/Prototypes/_NF/Shipyard/bocadillo.yml @@ -34,5 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] - Chef: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/bookworm.yml b/Resources/Prototypes/_NF/Shipyard/bookworm.yml index 2104e843845..1b3726516a5 100644 --- a/Resources/Prototypes/_NF/Shipyard/bookworm.yml +++ b/Resources/Prototypes/_NF/Shipyard/bookworm.yml @@ -24,5 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Librarian: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/bulker.yml b/Resources/Prototypes/_NF/Shipyard/bulker.yml index 1731099f8f7..32d8640174c 100644 --- a/Resources/Prototypes/_NF/Shipyard/bulker.yml +++ b/Resources/Prototypes/_NF/Shipyard/bulker.yml @@ -34,6 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Chef: [ 0, 0 ] - SalvageSpecialist: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/caduceus.yml b/Resources/Prototypes/_NF/Shipyard/caduceus.yml index 7b40a22cd51..603946b9ec0 100644 --- a/Resources/Prototypes/_NF/Shipyard/caduceus.yml +++ b/Resources/Prototypes/_NF/Shipyard/caduceus.yml @@ -24,10 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Paramedic: [ 0, 0 ] - ChiefMedicalOfficer: [ 0, 0 ] - MedicalDoctor: [ 0, 0 ] - Chemist: [ 0, 0 ] - Borg: [ 0, 0 ] - StationEngineer: [ 0, 0 ] - MedicalIntern: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/ceres.yml b/Resources/Prototypes/_NF/Shipyard/ceres.yml index 4160107354f..305fcefd283 100644 --- a/Resources/Prototypes/_NF/Shipyard/ceres.yml +++ b/Resources/Prototypes/_NF/Shipyard/ceres.yml @@ -24,7 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Botanist: [ 0, 0 ] - Chef: [ 0, 0 ] - ServiceWorker: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/chisel.yml b/Resources/Prototypes/_NF/Shipyard/chisel.yml index 410b32bc048..7bca7bb0ade 100644 --- a/Resources/Prototypes/_NF/Shipyard/chisel.yml +++ b/Resources/Prototypes/_NF/Shipyard/chisel.yml @@ -34,5 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - SalvageSpecialist: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/cleithro.yml b/Resources/Prototypes/_NF/Shipyard/cleithro.yml index ca6b747fdf7..32d3c2bfdca 100644 --- a/Resources/Prototypes/_NF/Shipyard/cleithro.yml +++ b/Resources/Prototypes/_NF/Shipyard/cleithro.yml @@ -31,5 +31,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Psychologist: [ 0, 0 ] - ServiceWorker: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/comet.yml b/Resources/Prototypes/_NF/Shipyard/comet.yml index bb6f3e7bd22..b6f848b5630 100644 --- a/Resources/Prototypes/_NF/Shipyard/comet.yml +++ b/Resources/Prototypes/_NF/Shipyard/comet.yml @@ -34,7 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - StationEngineer: [ 0, 0 ] - ChiefEngineer: [ 0, 0 ] - SalvageSpecialist: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/condor.yml b/Resources/Prototypes/_NF/Shipyard/condor.yml index 9b2e25a3d77..caa1544ce15 100644 --- a/Resources/Prototypes/_NF/Shipyard/condor.yml +++ b/Resources/Prototypes/_NF/Shipyard/condor.yml @@ -24,9 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - StationEngineer: [ 0, 0 ] - Scientist: [ 0, 0 ] - ResearchDirector: [ 0, 0 ] - ChiefEngineer: [ 0, 0 ] - AtmosphericTechnician: [ 0, 0 ] - Borg: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/construct.yml b/Resources/Prototypes/_NF/Shipyard/construct.yml index dc8c8c7dae9..304f22422d3 100644 --- a/Resources/Prototypes/_NF/Shipyard/construct.yml +++ b/Resources/Prototypes/_NF/Shipyard/construct.yml @@ -24,4 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Passenger: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/crescent.yml b/Resources/Prototypes/_NF/Shipyard/crescent.yml index 5a6a75fac64..c7773774b00 100644 --- a/Resources/Prototypes/_NF/Shipyard/crescent.yml +++ b/Resources/Prototypes/_NF/Shipyard/crescent.yml @@ -34,19 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Quartermaster: [ 0, 0 ] - Lawyer: [ 0, 0 ] - Janitor: [ 0, 0 ] - Scientist: [ 0, 0 ] - ResearchDirector: [ 0, 0 ] - ChiefMedicalOfficer: [ 0, 0 ] - ChiefEngineer: [ 0, 0 ] - Chef: [ 0, 0 ] - Bartender: [ 0, 0 ] - MedicalDoctor: [ 0, 0 ] - Chemist: [ 0, 0 ] - Mercenary: [ 0, 0 ] - AtmosphericTechnician: [ 0, 0 ] - StationEngineer: [ 0, 0 ] - Musician: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/crown.yml b/Resources/Prototypes/_NF/Shipyard/crown.yml new file mode 100644 index 00000000000..9f52376d376 --- /dev/null +++ b/Resources/Prototypes/_NF/Shipyard/crown.yml @@ -0,0 +1,29 @@ +- type: vessel + id: Crown + name: SBI Ворон + description: "Малогабаритный шаттл для наёмников, рекомендуемый состав экипажа 2 человека" + price: 20000 + category: Small + group: Civilian + shuttlePath: /Maps/_NF/Shuttles/crown.yml + +- type: gameMap + id: Crown + mapName: 'SBI Crown' + mapPath: /Maps/_NF/Shuttles/crown.yml + minPlayers: 0 + stations: + Crown: + stationProto: StandardFrontierVessel + components: + - type: StationNameSetup + mapNameTemplate: 'Ворон {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationJobs + overflowJobs: [] + availableJobs: + Mercenary: [ 0, 0 ] + Pilot: [ 0, 0 ] + Contractor: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/eagle.yml b/Resources/Prototypes/_NF/Shipyard/eagle.yml index 8deaa3cce90..d917f405fcb 100644 --- a/Resources/Prototypes/_NF/Shipyard/eagle.yml +++ b/Resources/Prototypes/_NF/Shipyard/eagle.yml @@ -31,8 +31,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Chemist: [ 0, 0 ] - MedicalDoctor: [ 0, 0 ] - Paramedic: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] - StationEngineer: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/esquire.yml b/Resources/Prototypes/_NF/Shipyard/esquire.yml index 53b9e26d3e7..5734bd62cfa 100644 --- a/Resources/Prototypes/_NF/Shipyard/esquire.yml +++ b/Resources/Prototypes/_NF/Shipyard/esquire.yml @@ -34,6 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Lawyer: [ 0, 0 ] - Mercenary: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/garden.yml b/Resources/Prototypes/_NF/Shipyard/garden.yml index 4a3123b4837..a06279785b7 100644 --- a/Resources/Prototypes/_NF/Shipyard/garden.yml +++ b/Resources/Prototypes/_NF/Shipyard/garden.yml @@ -34,5 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Botanist: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/hauler.yml b/Resources/Prototypes/_NF/Shipyard/hauler.yml index 0d401b10b2f..e1e9d92837e 100644 --- a/Resources/Prototypes/_NF/Shipyard/hauler.yml +++ b/Resources/Prototypes/_NF/Shipyard/hauler.yml @@ -24,7 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - CargoTechnician: [ 0, 0 ] - Bartender: [ 0, 0 ] - SalvageSpecialist: [ 0, 0 ] - Quartermaster: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/helix.yml b/Resources/Prototypes/_NF/Shipyard/helix.yml index 48f405d8612..ce311ad0e32 100644 --- a/Resources/Prototypes/_NF/Shipyard/helix.yml +++ b/Resources/Prototypes/_NF/Shipyard/helix.yml @@ -34,7 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Paramedic: [ 0, 0 ] - ChiefMedicalOfficer: [ 0, 0 ] - MedicalDoctor: [ 0, 0 ] - Chemist: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/honker.yml b/Resources/Prototypes/_NF/Shipyard/honker.yml index ef462feff5a..b2e1241a3ad 100644 --- a/Resources/Prototypes/_NF/Shipyard/honker.yml +++ b/Resources/Prototypes/_NF/Shipyard/honker.yml @@ -24,4 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Clown: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/investigator.yml b/Resources/Prototypes/_NF/Shipyard/investigator.yml index a572a243846..19a6cb6f1b1 100644 --- a/Resources/Prototypes/_NF/Shipyard/investigator.yml +++ b/Resources/Prototypes/_NF/Shipyard/investigator.yml @@ -24,6 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Bartender: [ 0, 0 ] - SalvageSpecialist: [ 0, 0 ] - Scientist: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/knuckleverse.yml b/Resources/Prototypes/_NF/Shipyard/knuckleverse.yml index 2a78a07c774..762d27ee51e 100644 --- a/Resources/Prototypes/_NF/Shipyard/knuckleverse.yml +++ b/Resources/Prototypes/_NF/Shipyard/knuckleverse.yml @@ -24,8 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Janitor: [ 0, 0 ] - Bartender: [ 0, 0 ] - MedicalDoctor: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] - Boxer: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/loader.yml b/Resources/Prototypes/_NF/Shipyard/loader.yml index 0ac1380fc6a..879b28b6e8f 100644 --- a/Resources/Prototypes/_NF/Shipyard/loader.yml +++ b/Resources/Prototypes/_NF/Shipyard/loader.yml @@ -34,4 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - CargoTechnician: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/lyrae.yml b/Resources/Prototypes/_NF/Shipyard/lyrae.yml index b5f99e3e2e1..b2dd21083aa 100644 --- a/Resources/Prototypes/_NF/Shipyard/lyrae.yml +++ b/Resources/Prototypes/_NF/Shipyard/lyrae.yml @@ -24,6 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Scientist: [ 0, 0 ] - ResearchDirector: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/mccargo.yml b/Resources/Prototypes/_NF/Shipyard/mccargo.yml index 6d941a8136a..409a8165854 100644 --- a/Resources/Prototypes/_NF/Shipyard/mccargo.yml +++ b/Resources/Prototypes/_NF/Shipyard/mccargo.yml @@ -31,10 +31,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Quartermaster: [ 0, 0 ] - CargoTechnician: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] - Chef: [ 0, 0 ] - Botanist: [ 0, 0 ] - Janitor: [ 0, 0 ] - Borg: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/metastable.yml b/Resources/Prototypes/_NF/Shipyard/metastable.yml index e89265beace..8d3f6768375 100644 --- a/Resources/Prototypes/_NF/Shipyard/metastable.yml +++ b/Resources/Prototypes/_NF/Shipyard/metastable.yml @@ -24,11 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] - Scientist: [ 0, 0 ] - Chef: [ 0, 0 ] - MedicalDoctor: [ 0, 0 ] - Chemist: [ 0, 0 ] - StationEngineer: [ 0, 0 ] Mercenary: [ 0, 0 ] - Borg: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/mission.yml b/Resources/Prototypes/_NF/Shipyard/mission.yml index 7f23fa7baa2..0ab08164368 100644 --- a/Resources/Prototypes/_NF/Shipyard/mission.yml +++ b/Resources/Prototypes/_NF/Shipyard/mission.yml @@ -34,6 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Chaplain: [ 0, 0 ] - Janitor: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/phoenix.yml b/Resources/Prototypes/_NF/Shipyard/phoenix.yml index ddf8bdfe05c..929fa89f1a1 100644 --- a/Resources/Prototypes/_NF/Shipyard/phoenix.yml +++ b/Resources/Prototypes/_NF/Shipyard/phoenix.yml @@ -24,8 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - SalvageSpecialist: [ 0, 0 ] - Scientist: [ 0, 0 ] - ResearchDirector: [ 0, 0 ] - Borg: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/piecrust.yml b/Resources/Prototypes/_NF/Shipyard/piecrust.yml index 933329e5d50..d65acc7e638 100644 --- a/Resources/Prototypes/_NF/Shipyard/piecrust.yml +++ b/Resources/Prototypes/_NF/Shipyard/piecrust.yml @@ -34,5 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] - Chef: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/placebo.yml b/Resources/Prototypes/_NF/Shipyard/placebo.yml index a732200d0f5..7656aaead01 100644 --- a/Resources/Prototypes/_NF/Shipyard/placebo.yml +++ b/Resources/Prototypes/_NF/Shipyard/placebo.yml @@ -24,4 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Psychologist: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/prospector.yml b/Resources/Prototypes/_NF/Shipyard/prospector.yml index 48ca039cf11..69988916476 100644 --- a/Resources/Prototypes/_NF/Shipyard/prospector.yml +++ b/Resources/Prototypes/_NF/Shipyard/prospector.yml @@ -34,4 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - SalvageSpecialist: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/pts.yml b/Resources/Prototypes/_NF/Shipyard/pts.yml index d438cab1769..24df578e813 100644 --- a/Resources/Prototypes/_NF/Shipyard/pts.yml +++ b/Resources/Prototypes/_NF/Shipyard/pts.yml @@ -33,4 +33,7 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: {} + availableJobs: + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/pulse.yml b/Resources/Prototypes/_NF/Shipyard/pulse.yml index af7d6a66815..2b351d57a30 100644 --- a/Resources/Prototypes/_NF/Shipyard/pulse.yml +++ b/Resources/Prototypes/_NF/Shipyard/pulse.yml @@ -34,5 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Paramedic: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/rosebudmki.yml b/Resources/Prototypes/_NF/Shipyard/rosebudmki.yml index 8ac662df8a5..e2b082013ee 100644 --- a/Resources/Prototypes/_NF/Shipyard/rosebudmki.yml +++ b/Resources/Prototypes/_NF/Shipyard/rosebudmki.yml @@ -34,8 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] - SalvageSpecialist: [ 0, 0 ] - StationEngineer: [ 0, 0 ] - MedicalDoctor: [ 0, 0 ] - Chemist: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/searchlight.yml b/Resources/Prototypes/_NF/Shipyard/searchlight.yml index 17676e2ad00..0a363c6df4b 100644 --- a/Resources/Prototypes/_NF/Shipyard/searchlight.yml +++ b/Resources/Prototypes/_NF/Shipyard/searchlight.yml @@ -36,4 +36,4 @@ availableJobs: Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] - Mercenary: [ 0, 0 ] + Mercenary: [ 0, 0 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/skipper.yml b/Resources/Prototypes/_NF/Shipyard/skipper.yml index fd6c54a733e..2f11d2b88b7 100644 --- a/Resources/Prototypes/_NF/Shipyard/skipper.yml +++ b/Resources/Prototypes/_NF/Shipyard/skipper.yml @@ -34,5 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Botanist: [ 0, 0 ] - Chef: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/sparrow.yml b/Resources/Prototypes/_NF/Shipyard/sparrow.yml index 0a33cd16f70..bff33b11237 100644 --- a/Resources/Prototypes/_NF/Shipyard/sparrow.yml +++ b/Resources/Prototypes/_NF/Shipyard/sparrow.yml @@ -34,5 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - StationEngineer: [ 0, 0 ] - Scientist: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/spectre.yml b/Resources/Prototypes/_NF/Shipyard/spectre.yml index ae13d23b876..cd66f7a8117 100644 --- a/Resources/Prototypes/_NF/Shipyard/spectre.yml +++ b/Resources/Prototypes/_NF/Shipyard/spectre.yml @@ -34,7 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Bartender: [ 0, 0 ] - ResearchDirector: [ 0, 0 ] - Scientist: [ 0, 0 ] - StationEngineer: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/stellaris.yml b/Resources/Prototypes/_NF/Shipyard/stellaris.yml index d7497d99aba..dc6a2160f0f 100644 --- a/Resources/Prototypes/_NF/Shipyard/stellaris.yml +++ b/Resources/Prototypes/_NF/Shipyard/stellaris.yml @@ -24,7 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Clown: [ 0, 0 ] - Mime: [ 0, 0 ] - Musician: [ 0, 0 ] - Chef: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/stratos.yml b/Resources/Prototypes/_NF/Shipyard/stratos.yml index 98a16693960..715f4a93d1d 100644 --- a/Resources/Prototypes/_NF/Shipyard/stratos.yml +++ b/Resources/Prototypes/_NF/Shipyard/stratos.yml @@ -34,8 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Bartender: [ 0, 0 ] - SalvageSpecialist: [ 0, 0 ] - StationEngineer: [ 0, 0 ] - Scientist: [ 0, 0 ] - ResearchDirector: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/vagabond.yml b/Resources/Prototypes/_NF/Shipyard/vagabond.yml index 6a4281d1a99..b885c5ba3c3 100644 --- a/Resources/Prototypes/_NF/Shipyard/vagabond.yml +++ b/Resources/Prototypes/_NF/Shipyard/vagabond.yml @@ -35,7 +35,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - CargoTechnician: [ 0, 0 ] - StationEngineer: [ 0, 0 ] - SalvageSpecialist: [ 0, 0 ] - Quartermaster: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/waveshot.yml b/Resources/Prototypes/_NF/Shipyard/waveshot.yml index 029055266ac..12b27eae5b8 100644 --- a/Resources/Prototypes/_NF/Shipyard/waveshot.yml +++ b/Resources/Prototypes/_NF/Shipyard/waveshot.yml @@ -34,5 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] - Reporter: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/SpaceStation14.sln b/SpaceStation14.sln index e8f03df64a0..08e90a39a18 100644 --- a/SpaceStation14.sln +++ b/SpaceStation14.sln @@ -69,39 +69,39 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Shared.Scripting", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetSerializer", "RobustToolbox\NetSerializer\NetSerializer\NetSerializer.csproj", "{7B9472D3-79D4-48D1-9B22-BCDE518FE842}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.LoaderApi", "RobustToolbox\Robust.LoaderApi\Robust.LoaderApi\Robust.LoaderApi.csproj", "{1FAE651D-29D8-437A-9864-47CE0D180016}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.LoaderApi", "RobustToolbox\Robust.LoaderApi\Robust.LoaderApi\Robust.LoaderApi.csproj", "{1FAE651D-29D8-437A-9864-47CE0D180016}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Client.NameGenerator", "RobustToolbox\Robust.Client.NameGenerator\Robust.Client.NameGenerator.csproj", "{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Client.NameGenerator", "RobustToolbox\Robust.Client.NameGenerator\Robust.Client.NameGenerator.csproj", "{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Client.Injectors", "RobustToolbox\Robust.Client.Injectors\Robust.Client.Injectors.csproj", "{8922428F-17C3-47A7-BFE9-570DEB2464DA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Client.Injectors", "RobustToolbox\Robust.Client.Injectors\Robust.Client.Injectors.csproj", "{8922428F-17C3-47A7-BFE9-570DEB2464DA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlX.IL.Cecil", "RobustToolbox\XamlX\src\XamlX.IL.Cecil\XamlX.IL.Cecil.csproj", "{16F7DE32-0186-44B9-9345-0C20D1BF2422}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XamlX.IL.Cecil", "RobustToolbox\XamlX\src\XamlX.IL.Cecil\XamlX.IL.Cecil.csproj", "{16F7DE32-0186-44B9-9345-0C20D1BF2422}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XamlX", "XamlX", "{AFF53804-115F-4E67-B81F-26265EA27880}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlX", "RobustToolbox\XamlX\src\XamlX\XamlX.csproj", "{23F09C45-950E-4DB7-A465-E937450FF008}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XamlX", "RobustToolbox\XamlX\src\XamlX\XamlX.csproj", "{23F09C45-950E-4DB7-A465-E937450FF008}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlX.Runtime", "RobustToolbox\XamlX\src\XamlX.Runtime\XamlX.Runtime.csproj", "{440426C1-8DCA-43F6-967F-94439B8DAF47}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XamlX.Runtime", "RobustToolbox\XamlX\src\XamlX.Runtime\XamlX.Runtime.csproj", "{440426C1-8DCA-43F6-967F-94439B8DAF47}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Tools", "Content.Tools\Content.Tools.csproj", "{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Tools", "Content.Tools\Content.Tools.csproj", "{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Analyzers", "RobustToolbox\Robust.Analyzers\Robust.Analyzers.csproj", "{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Analyzers", "RobustToolbox\Robust.Analyzers\Robust.Analyzers.csproj", "{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.YAMLLinter", "Content.YAMLLinter\Content.YAMLLinter.csproj", "{A59E2FCC-93CF-4886-8EA7-94F021A7475D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.YAMLLinter", "Content.YAMLLinter\Content.YAMLLinter.csproj", "{A59E2FCC-93CF-4886-8EA7-94F021A7475D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Base", "RobustToolbox\Avalonia.Base\Avalonia.Base.csproj", "{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Base", "RobustToolbox\Avalonia.Base\Avalonia.Base.csproj", "{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Benchmarks", "RobustToolbox\Robust.Benchmarks\Robust.Benchmarks.csproj", "{8A21C7CA-2EB8-40E5-8043-33582C06D139}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Benchmarks", "RobustToolbox\Robust.Benchmarks\Robust.Benchmarks.csproj", "{8A21C7CA-2EB8-40E5-8043-33582C06D139}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pow3r", "Pow3r\Pow3r.csproj", "{1C048C9F-00A9-4796-BE4D-BB36B7769720}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pow3r", "Pow3r\Pow3r.csproj", "{1C048C9F-00A9-4796-BE4D-BB36B7769720}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Shared.Database", "Content.Shared.Database\Content.Shared.Database.csproj", "{8842381D-3426-4BA8-93DA-599AB14D88E9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Shared.Database", "Content.Shared.Database\Content.Shared.Database.csproj", "{8842381D-3426-4BA8-93DA-599AB14D88E9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.MapRenderer", "Content.MapRenderer\Content.MapRenderer.csproj", "{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.MapRenderer", "Content.MapRenderer\Content.MapRenderer.csproj", "{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Packaging", "RobustToolbox\Robust.Packaging\Robust.Packaging.csproj", "{952AAF2A-DF63-4A7D-8094-3453893EBA80}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Packaging", "RobustToolbox\Robust.Packaging\Robust.Packaging.csproj", "{952AAF2A-DF63-4A7D-8094-3453893EBA80}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Packaging", "Content.Packaging\Content.Packaging.csproj", "{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Packaging", "Content.Packaging\Content.Packaging.csproj", "{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Files", "Project Files", "{EC27A16C-9412-4AA6-AE68-CAAB28882802}" ProjectSection(SolutionItems) = preProject @@ -121,13 +121,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Files", "Project Fi EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Replay", "Content.Replay\Content.Replay.csproj", "{A493616C-338D-47B7-8072-A7F14D034D0B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Shared.CompNetworkGenerator", "RobustToolbox\Robust.Shared.CompNetworkGenerator\Robust.Shared.CompNetworkGenerator.csproj", "{07CA34A1-1D37-4771-A2E3-495A1044AE0B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Shared.CompNetworkGenerator", "RobustToolbox\Robust.Shared.CompNetworkGenerator\Robust.Shared.CompNetworkGenerator.csproj", "{07CA34A1-1D37-4771-A2E3-495A1044AE0B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Serialization.Generator", "RobustToolbox\Robust.Serialization.Generator\Robust.Serialization.Generator.csproj", "{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Serialization.Generator", "RobustToolbox\Robust.Serialization.Generator\Robust.Serialization.Generator.csproj", "{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.PatreonParser", "Content.PatreonParser\Content.PatreonParser.csproj", "{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.PatreonParser", "Content.PatreonParser\Content.PatreonParser.csproj", "{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Analyzers.Tests", "RobustToolbox\Robust.Analyzers.Tests\Robust.Analyzers.Tests.csproj", "{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Analyzers.Tests", "RobustToolbox\Robust.Analyzers.Tests\Robust.Analyzers.Tests.csproj", "{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Roslyn", "Roslyn", "{7844DA69-B0F0-49FB-A05E-ECA37372277A}" ProjectSection(SolutionItems) = preProject @@ -158,16 +158,16 @@ Global {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|Any CPU.Build.0 = Release|Any CPU {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Tools|Any CPU.ActiveCfg = Tools|Any CPU {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Tools|Any CPU.Build.0 = Tools|Any CPU - {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|Any CPU.ActiveCfg = Release|Any CPU + {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|Any CPU.Build.0 = Release|Any CPU {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|Any CPU.ActiveCfg = Release|Any CPU {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|Any CPU.Build.0 = Release|Any CPU {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Tools|Any CPU.ActiveCfg = Tools|Any CPU {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Tools|Any CPU.Build.0 = Tools|Any CPU - {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|Any CPU.ActiveCfg = Release|Any CPU + {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|Any CPU.Build.0 = Release|Any CPU {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -494,21 +494,21 @@ Global {41B450C0-A361-4CD7-8121-7072B8995CFC} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {7B9472D3-79D4-48D1-9B22-BCDE518FE842} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {1FAE651D-29D8-437A-9864-47CE0D180016} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} + {3CFEB7DB-12C6-46F3-89FC-1450F3016FFA} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} {8922428F-17C3-47A7-BFE9-570DEB2464DA} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {16F7DE32-0186-44B9-9345-0C20D1BF2422} = {AFF53804-115F-4E67-B81F-26265EA27880} {AFF53804-115F-4E67-B81F-26265EA27880} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {23F09C45-950E-4DB7-A465-E937450FF008} = {AFF53804-115F-4E67-B81F-26265EA27880} {440426C1-8DCA-43F6-967F-94439B8DAF47} = {AFF53804-115F-4E67-B81F-26265EA27880} + {88B0FC0F-7209-40E2-AF16-EB90AF727C5B} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} {A3C5B00A-D232-4A01-B82E-B0E58BFD5C12} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {8A21C7CA-2EB8-40E5-8043-33582C06D139} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {952AAF2A-DF63-4A7D-8094-3453893EBA80} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {A965CB3B-FD31-44AF-8872-85ABA436098D} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} - {7844DA69-B0F0-49FB-A05E-ECA37372277A} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} - {3CFEB7DB-12C6-46F3-89FC-1450F3016FFA} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} - {6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} {07CA34A1-1D37-4771-A2E3-495A1044AE0B} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} - {88B0FC0F-7209-40E2-AF16-EB90AF727C5B} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} + {6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} {83F510FE-9B50-4D96-AFAB-CC13998D6AFE} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} + {7844DA69-B0F0-49FB-A05E-ECA37372277A} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {C4886F9E-D0C7-454D-AFE6-8A939C9D84B7} = {29CC4B64-2E8C-4211-9CBE-6BE578B21BAC} {628D24EC-08D0-4707-9243-8A9892DE09CB} = {29CC4B64-2E8C-4211-9CBE-6BE578B21BAC} {A2AE8893-F230-4201-8275-191530017A0C} = {29CC4B64-2E8C-4211-9CBE-6BE578B21BAC}