From 7be42cc97ad56bcb261432c9ddaf093bac26c006 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Thu, 11 Jan 2024 03:54:57 -0700 Subject: [PATCH] revert core cargo shuttle for now (#23921) * Delete Resources/Maps/Shuttles/cargo_core.yml * Update core.yml * Update base.yml * Update nanotrasen.yml --- Resources/Maps/Shuttles/cargo_core.yml | 1091 ----------------- .../Prototypes/Entities/Stations/base.yml | 29 - .../Entities/Stations/nanotrasen.yml | 22 - Resources/Prototypes/Maps/core.yml | 2 +- 4 files changed, 1 insertion(+), 1143 deletions(-) delete mode 100644 Resources/Maps/Shuttles/cargo_core.yml diff --git a/Resources/Maps/Shuttles/cargo_core.yml b/Resources/Maps/Shuttles/cargo_core.yml deleted file mode 100644 index 26e06640de..0000000000 --- a/Resources/Maps/Shuttles/cargo_core.yml +++ /dev/null @@ -1,1091 +0,0 @@ -meta: - format: 6 - postmapinit: false -tilemap: - 0: Space - 89: FloorSteel - 100: FloorSteelMono - 104: FloorTechMaint - 120: Lattice - 121: Plating -entities: -- proto: "" - entities: - - uid: 1 - components: - - type: MetaData - name: map 21 - - type: Transform - - type: Map - - type: PhysicsMap - - type: GridTree - - type: MovedGrids - - type: Broadphase - - type: OccluderTree - - uid: 2 - components: - - type: MetaData - name: Cargo shuttle - - type: Transform - pos: -1.828125,2.078125 - parent: 1 - - type: MapGrid - chunks: - 0,0: - ind: 0,0 - tiles: eQAAAAAAZAAAAAAAZAAAAAABeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAACWQAAAAACeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - -1,0: - ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - 0,-1: - ind: 0,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAACWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAABWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAABWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAABWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - -1,-1: - ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAA - 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: - angle: -1.5707963267948966 rad - color: '#FFFFFFFF' - id: Arrows - decals: - 10: 0,-5 - 11: 0,-3 - - node: - color: '#FFFFFFFF' - id: Bot - decals: - 0: 2,0 - 1: -1,-3 - 2: -1,-5 - - node: - color: '#79150047' - id: CheckerNWSE - decals: - 3: 1,-7 - 4: 1,-5 - 5: 1,-4 - 6: 1,-3 - 7: 1,-1 - - node: - cleanable: True - color: '#FFFFFFFF' - id: DirtHeavy - decals: - 12: 0,-5 - 13: 1,-3 - 14: 2,1 - 15: 1,-7 - - node: - cleanable: True - color: '#FFFFFFFF' - id: DirtHeavyMonotile - decals: - 16: 0,-4 - 17: 0,-1 - 18: 1,-6 - 19: 1,-9 - 20: 2,-8 - 21: 1,0 - - node: - cleanable: True - color: '#FFFFFFFF' - id: DirtLight - decals: - 22: 1,-4 - 23: 1,-1 - 24: 1,1 - 25: 1,-8 - 26: -1,-3 - - node: - angle: 1.5707963267948966 rad - color: '#FFFFFFFF' - id: LoadingArea - decals: - 8: 1,-6 - 9: 1,-2 - - type: GridAtmosphere - version: 2 - data: - tiles: - 0,0: - 0: 4095 - 1,0: - 0: 273 - -1,0: - 0: 2184 - 0,-3: - 0: 65280 - 0,-2: - 0: 65535 - 0,-1: - 0: 65535 - 1,-3: - 0: 4352 - 1,-2: - 0: 4369 - 1,-1: - 0: 4369 - -1,-3: - 0: 34816 - -1,-2: - 0: 34952 - -1,-1: - 0: 34952 - uniqueMixes: - - volume: 2500 - temperature: 293.15 - moles: - - 21.824879 - - 82.10312 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - chunkSize: 4 - - type: GasTileOverlay - - type: RadiationGridResistance - - type: CargoShuttle -- proto: AirlockGlassShuttle - entities: - - uid: 131 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-4.5 - parent: 2 - - uid: 132 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-2.5 - parent: 2 -- proto: APCBasic - entities: - - uid: 95 - components: - - type: Transform - pos: 3.5,-7.5 - parent: 2 -- proto: AtmosDeviceFanTiny - entities: - - uid: 139 - components: - - type: Transform - pos: -0.5,-2.5 - parent: 2 - - uid: 140 - components: - - type: Transform - pos: -0.5,-1.5 - parent: 2 - - uid: 141 - components: - - type: Transform - pos: -0.5,-4.5 - parent: 2 - - uid: 142 - components: - - type: Transform - pos: -0.5,-5.5 - parent: 2 -- proto: BlastDoor - entities: - - uid: 135 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - pos: -0.5,-5.5 - parent: 2 - - type: DeviceLinkSink - links: - - 137 - - uid: 136 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - pos: -0.5,-1.5 - parent: 2 - - type: DeviceLinkSink - links: - - 138 -- proto: CableApcExtension - entities: - - uid: 104 - components: - - type: Transform - pos: 3.5,-7.5 - parent: 2 - - uid: 105 - components: - - type: Transform - pos: 2.5,-7.5 - parent: 2 - - uid: 106 - components: - - type: Transform - pos: 1.5,-7.5 - parent: 2 - - uid: 107 - components: - - type: Transform - pos: 2.5,0.5 - parent: 2 - - uid: 108 - components: - - type: Transform - pos: 1.5,0.5 - parent: 2 - - uid: 109 - components: - - type: Transform - pos: 1.5,-0.5 - parent: 2 - - uid: 110 - components: - - type: Transform - pos: 1.5,-1.5 - parent: 2 - - uid: 111 - components: - - type: Transform - pos: 1.5,-2.5 - parent: 2 - - uid: 112 - components: - - type: Transform - pos: 1.5,-3.5 - parent: 2 - - uid: 113 - components: - - type: Transform - pos: 1.5,-4.5 - parent: 2 - - uid: 114 - components: - - type: Transform - pos: 1.5,-5.5 - parent: 2 - - uid: 115 - components: - - type: Transform - pos: 1.5,-6.5 - parent: 2 - - uid: 116 - components: - - type: Transform - pos: 4.5,-7.5 - parent: 2 - - uid: 117 - components: - - type: Transform - pos: 4.5,-8.5 - parent: 2 - - uid: 118 - components: - - type: Transform - pos: 4.5,-9.5 - parent: 2 - - uid: 119 - components: - - type: Transform - pos: 0.5,-7.5 - parent: 2 - - uid: 120 - components: - - type: Transform - pos: -0.5,-7.5 - parent: 2 - - uid: 121 - components: - - type: Transform - pos: -0.5,-8.5 - parent: 2 - - uid: 122 - components: - - type: Transform - pos: -0.5,-9.5 - parent: 2 - - uid: 123 - components: - - type: Transform - pos: 3.5,0.5 - parent: 2 - - uid: 124 - components: - - type: Transform - pos: 4.5,0.5 - parent: 2 - - uid: 125 - components: - - type: Transform - pos: 4.5,1.5 - parent: 2 - - uid: 126 - components: - - type: Transform - pos: 4.5,2.5 - parent: 2 - - uid: 127 - components: - - type: Transform - pos: 0.5,0.5 - parent: 2 - - uid: 128 - components: - - type: Transform - pos: -0.5,0.5 - parent: 2 - - uid: 129 - components: - - type: Transform - pos: -0.5,1.5 - parent: 2 - - uid: 130 - components: - - type: Transform - pos: -0.5,2.5 - parent: 2 -- proto: CableHV - entities: - - uid: 99 - components: - - type: Transform - pos: 1.5,-8.5 - parent: 2 - - uid: 100 - components: - - type: Transform - pos: 2.5,-8.5 - parent: 2 - - uid: 101 - components: - - type: Transform - pos: 3.5,-8.5 - parent: 2 -- proto: CableMV - entities: - - uid: 102 - components: - - type: Transform - pos: 3.5,-7.5 - parent: 2 - - uid: 103 - components: - - type: Transform - pos: 3.5,-8.5 - parent: 2 -- proto: CableTerminal - entities: - - uid: 98 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-8.5 - parent: 2 -- proto: CargoPallet - entities: - - uid: 55 - components: - - type: Transform - pos: 3.5,-6.5 - parent: 2 - - uid: 56 - components: - - type: Transform - pos: 2.5,-5.5 - parent: 2 - - uid: 59 - components: - - type: Transform - pos: 2.5,-6.5 - parent: 2 - - uid: 60 - components: - - type: Transform - pos: 3.5,-5.5 - parent: 2 - - uid: 82 - components: - - type: Transform - pos: 3.5,-4.5 - parent: 2 - - uid: 83 - components: - - type: Transform - pos: 2.5,-4.5 - parent: 2 - - uid: 84 - components: - - type: Transform - pos: 2.5,-3.5 - parent: 2 - - uid: 85 - components: - - type: Transform - pos: 3.5,-3.5 - parent: 2 - - uid: 86 - components: - - type: Transform - pos: 3.5,-2.5 - parent: 2 - - uid: 87 - components: - - type: Transform - pos: 2.5,-2.5 - parent: 2 - - uid: 88 - components: - - type: Transform - pos: 2.5,-1.5 - parent: 2 - - uid: 89 - components: - - type: Transform - pos: 3.5,-1.5 - parent: 2 - - uid: 90 - components: - - type: Transform - pos: 3.5,-0.5 - parent: 2 - - uid: 91 - components: - - type: Transform - pos: 2.5,-0.5 - parent: 2 -- proto: Catwalk - entities: - - uid: 47 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,1.5 - parent: 2 - - uid: 48 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,2.5 - parent: 2 - - uid: 49 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,1.5 - parent: 2 - - uid: 50 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,2.5 - parent: 2 - - uid: 51 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-8.5 - parent: 2 - - uid: 52 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-9.5 - parent: 2 - - uid: 53 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,-9.5 - parent: 2 - - uid: 54 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,-8.5 - parent: 2 - - uid: 64 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-5.5 - parent: 2 - - uid: 79 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-5.5 - parent: 2 - - uid: 80 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-1.5 - parent: 2 - - uid: 81 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-1.5 - parent: 2 -- proto: ChairPilotSeat - entities: - - uid: 23 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,0.5 - parent: 2 -- proto: ComputerShuttleCargo - entities: - - uid: 21 - components: - - type: Transform - pos: 2.5,1.5 - parent: 2 -- proto: ConveyorBelt - entities: - - uid: 74 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,-5.5 - parent: 2 - - type: DeviceLinkSink - links: - - 92 - - uid: 75 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-5.5 - parent: 2 - - type: DeviceLinkSink - links: - - 92 - - uid: 76 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-1.5 - parent: 2 - - type: DeviceLinkSink - links: - - 92 - - uid: 77 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,-1.5 - parent: 2 - - type: DeviceLinkSink - links: - - 92 -- proto: GeneratorBasic15kW - entities: - - uid: 96 - components: - - type: Transform - pos: 1.5,-8.5 - parent: 2 -- proto: GravityGeneratorMini - entities: - - uid: 133 - components: - - type: Transform - pos: 2.5,-7.5 - parent: 2 -- proto: Grille - entities: - - uid: 17 - components: - - type: Transform - pos: 3.5,1.5 - parent: 2 - - uid: 18 - components: - - type: Transform - pos: 2.5,2.5 - parent: 2 - - uid: 19 - components: - - type: Transform - pos: 1.5,2.5 - parent: 2 - - uid: 20 - components: - - type: Transform - pos: 0.5,1.5 - parent: 2 - - uid: 65 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-5.5 - parent: 2 - - uid: 66 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-4.5 - parent: 2 - - uid: 67 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-3.5 - parent: 2 - - uid: 68 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-2.5 - parent: 2 - - uid: 69 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-1.5 - parent: 2 - - uid: 70 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-3.5 - parent: 2 -- proto: Gyroscope - entities: - - uid: 134 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-7.5 - parent: 2 -- proto: PlasticFlapsAirtightClear - entities: - - uid: 63 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-1.5 - parent: 2 - - uid: 78 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-5.5 - parent: 2 -- proto: PowerCellRecharger - entities: - - uid: 93 - components: - - type: Transform - pos: 1.5,1.5 - parent: 2 -- proto: Poweredlight - entities: - - uid: 72 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-3.5 - parent: 2 - - uid: 73 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,-3.5 - parent: 2 -- proto: ShuttleWindow - entities: - - uid: 3 - components: - - type: Transform - pos: 0.5,1.5 - parent: 2 - - uid: 4 - components: - - type: Transform - pos: 3.5,1.5 - parent: 2 - - uid: 5 - components: - - type: Transform - pos: 1.5,2.5 - parent: 2 - - uid: 6 - components: - - type: Transform - pos: 2.5,2.5 - parent: 2 - - uid: 26 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-1.5 - parent: 2 - - uid: 27 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-2.5 - parent: 2 - - uid: 28 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-3.5 - parent: 2 - - uid: 29 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-4.5 - parent: 2 - - uid: 30 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-5.5 - parent: 2 - - uid: 71 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-3.5 - parent: 2 -- proto: SignalButton - entities: - - uid: 137 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-6.5 - parent: 2 - - type: DeviceLinkSource - linkedPorts: - 135: - - Pressed: Toggle - - uid: 138 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-0.5 - parent: 2 - - type: DeviceLinkSource - linkedPorts: - 136: - - Pressed: Toggle -- proto: SMESBasic - entities: - - uid: 97 - components: - - type: Transform - pos: 2.5,-8.5 - parent: 2 -- proto: SubstationWallBasic - entities: - - uid: 94 - components: - - type: Transform - pos: 3.5,-8.5 - parent: 2 -- proto: TableReinforced - entities: - - uid: 22 - components: - - type: Transform - pos: 1.5,1.5 - parent: 2 -- proto: Thruster - entities: - - uid: 13 - components: - - type: Transform - pos: 4.5,2.5 - parent: 2 - - uid: 14 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,1.5 - parent: 2 - - uid: 15 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,1.5 - parent: 2 - - uid: 16 - components: - - type: Transform - pos: -0.5,2.5 - parent: 2 - - uid: 39 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-8.5 - parent: 2 - - uid: 40 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-8.5 - parent: 2 - - uid: 45 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,-9.5 - parent: 2 - - uid: 46 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-9.5 - parent: 2 -- proto: TwoWayLever - entities: - - uid: 92 - components: - - type: Transform - pos: 0.5,-3.5 - parent: 2 - - type: DeviceLinkSource - linkedPorts: - 74: - - Left: Forward - - Right: Reverse - - Middle: Off - 77: - - Left: Forward - - Right: Reverse - - Middle: Off - 76: - - Left: Forward - - Right: Reverse - - Middle: Off - 75: - - Left: Forward - - Right: Reverse - - Middle: Off -- proto: WallShuttle - entities: - - uid: 7 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - pos: 3.5,2.5 - parent: 2 - - uid: 8 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - pos: 0.5,2.5 - parent: 2 - - uid: 9 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - pos: 0.5,0.5 - parent: 2 - - uid: 10 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - pos: -0.5,0.5 - parent: 2 - - uid: 11 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - pos: 4.5,0.5 - parent: 2 - - uid: 12 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - pos: 3.5,0.5 - parent: 2 - - uid: 24 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-0.5 - parent: 2 - - uid: 25 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,-0.5 - parent: 2 - - uid: 31 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-6.5 - parent: 2 - - uid: 32 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-7.5 - parent: 2 - - uid: 33 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,-7.5 - parent: 2 - - uid: 34 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,-7.5 - parent: 2 - - uid: 35 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,-7.5 - parent: 2 - - uid: 36 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,-6.5 - parent: 2 - - uid: 37 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,-8.5 - parent: 2 - - uid: 38 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,-8.5 - parent: 2 - - uid: 41 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - rot: 1.5707963267948966 rad - pos: 3.5,-9.5 - parent: 2 - - uid: 42 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,-9.5 - parent: 2 - - uid: 43 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-9.5 - parent: 2 - - uid: 44 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,-9.5 - parent: 2 -- proto: WindoorSecureCargoLocked - entities: - - uid: 58 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-7.5 - parent: 2 - - uid: 62 - components: - - type: Transform - pos: 1.5,0.5 - parent: 2 -- proto: WindowReinforcedDirectional - entities: - - uid: 57 - components: - - type: Transform - pos: 2.5,0.5 - parent: 2 - - uid: 61 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-7.5 - parent: 2 -... diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml index 8c78775ba5..503fd7082d 100644 --- a/Resources/Prototypes/Entities/Stations/base.yml +++ b/Resources/Prototypes/Entities/Stations/base.yml @@ -38,7 +38,6 @@ components: - type: GatewayGenerator - - type: entity id: BaseStationShuttles abstract: true @@ -65,34 +64,6 @@ - /Maps/Ruins/whiteship_ancient.yml - /Maps/Ruins/whiteship_bluespacejumper.yml - - -- type: entity - id: BaseStationShuttlesCore - abstract: true - components: - - type: GridSpawn - groups: - cargo: - paths: - - /Maps/Shuttles/cargo_core.yml - mining: - paths: - - /Maps/Shuttles/mining.yml - ruins: - hide: true - nameGrid: true - minCount: 2 - maxCount: 2 - stationGrid: false - paths: - - /Maps/Ruins/derelict.yml - - /Maps/Ruins/djstation.yml - - /Maps/Ruins/old_ai_sat.yml - - /Maps/Ruins/relaystation.yml - - /Maps/Ruins/whiteship_ancient.yml - - /Maps/Ruins/whiteship_bluespacejumper.yml - - type: entity id: BaseStationCentcomm abstract: true diff --git a/Resources/Prototypes/Entities/Stations/nanotrasen.yml b/Resources/Prototypes/Entities/Stations/nanotrasen.yml index c0f179cc69..e9b04d7d04 100644 --- a/Resources/Prototypes/Entities/Stations/nanotrasen.yml +++ b/Resources/Prototypes/Entities/Stations/nanotrasen.yml @@ -28,28 +28,6 @@ components: - type: Transform -- type: entity - id: CoreNanotrasenStation - parent: - - BaseStation - - BaseStationCargo - - BaseStationJobsSpawning - - BaseStationRecords - - BaseStationArrivals - - BaseStationGateway - - BaseStationShuttlesCore - - BaseStationCentcomm - - BaseStationEvacuation - - BaseStationAlertLevels - - BaseStationMagnet - - BaseStationExpeditions - - BaseStationSiliconLawCrewsimov - - BaseStationAllEventsEligible - - BaseStationNanotrasen - noSpawn: true - components: - - type: Transform - - type: entity id: NanotrasenCentralCommand parent: diff --git a/Resources/Prototypes/Maps/core.yml b/Resources/Prototypes/Maps/core.yml index 7406997ab7..e8c433be0c 100644 --- a/Resources/Prototypes/Maps/core.yml +++ b/Resources/Prototypes/Maps/core.yml @@ -6,7 +6,7 @@ maxPlayers: 60 stations: Core: - stationProto: CoreNanotrasenStation + stationProto: StandardNanotrasenStation components: - type: StationNameSetup mapNameTemplate: '{0} Core {1}' -- 2.51.2