diff --git a/Resources/Maps/_NF/Shuttles/apothecary.yml b/Resources/Maps/_NF/Shuttles/apothecary.yml index 31779efd92e..08dc21a5b01 100644 --- a/Resources/Maps/_NF/Shuttles/apothecary.yml +++ b/Resources/Maps/_NF/Shuttles/apothecary.yml @@ -791,8 +791,6 @@ entities: rot: -1.5707963267948966 rad pos: -1.5,-0.5 parent: 1 - - type: Apc - hasAccess: True - proto: AtmosDeviceFanDirectional entities: - uid: 63 @@ -1473,11 +1471,11 @@ entities: parent: 1 - proto: ComputerTabletopStationRecords entities: - - uid: 228 + - uid: 191 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,8.5 + rot: 3.141592653589793 rad + pos: -0.5,1.5 parent: 1 - proto: ComputerWallmountWithdrawBankATM entities: @@ -1487,17 +1485,6 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-0.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: ItemSlots - proto: CrateChemistryD entities: - uid: 163 @@ -2303,16 +2290,6 @@ entities: - type: Transform pos: -2.5,7.5 parent: 1 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerWallColorMedicalDoctorFilled entities: - uid: 245 @@ -2321,16 +2298,6 @@ entities: rot: 3.141592653589793 rad pos: -2.5,2.5 parent: 1 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerWallEVAColorParamedicFilled entities: - uid: 141 @@ -2364,7 +2331,7 @@ entities: - uid: 251 components: - type: Transform - pos: -2.3657346,9.161771 + pos: -2.1803885,9.500854 parent: 1 - proto: MachineCentrifuge entities: @@ -2387,20 +2354,6 @@ entities: - type: Transform pos: 3.5,3.5 parent: 1 - - type: ContainerContainer - containers: - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - microwave_entity_container: !type:Container - showEnts: False - occludes: True - ents: [] - proto: MedicalBed entities: - uid: 178 @@ -2420,20 +2373,13 @@ entities: - type: Transform pos: 2.5,2.5 parent: 1 - - type: ContainerContainer - containers: - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - blueprint: !type:Container - showEnts: False - occludes: True - ents: [] +- proto: NFHolopadShip + entities: + - uid: 228 + components: + - type: Transform + pos: -2.5,8.5 + parent: 1 - proto: NFPosterContrabandFsbApothecary entities: - uid: 289 @@ -2494,14 +2440,6 @@ entities: parent: 1 - type: Physics bodyType: Static -- proto: PaperBin10 - entities: - - uid: 191 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.7045135,9.029007 - parent: 1 - proto: PaperBin20 entities: - uid: 218 @@ -3086,11 +3024,6 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,9.5 parent: 1 - - uid: 302 - components: - - type: Transform - pos: -2.5,8.5 - parent: 1 - uid: 320 components: - type: Transform @@ -3144,10 +3077,10 @@ entities: parent: 1 - proto: ToyFigurineLawyer entities: - - uid: 318 + - uid: 302 components: - type: Transform - pos: -2.324068,9.276354 + pos: -2.0553885,9.797729 parent: 1 - proto: VendingMachineMedical entities: @@ -3506,7 +3439,7 @@ entities: rot: 1.5707963267948966 rad pos: -6.5,-4.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 304 components: diff --git a/Resources/Maps/_NF/Shuttles/bazaar.yml b/Resources/Maps/_NF/Shuttles/bazaar.yml index a5c7f044603..7345d29a3f0 100644 --- a/Resources/Maps/_NF/Shuttles/bazaar.yml +++ b/Resources/Maps/_NF/Shuttles/bazaar.yml @@ -1367,7 +1367,6 @@ entities: parent: 1 - type: Physics canCollide: False - bodyType: Static - type: Fixtures fixtures: {} - proto: BenchSofaCorpLeft @@ -1377,8 +1376,6 @@ entities: - type: Transform pos: 9.5,9.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaCorpMiddle entities: - uid: 597 @@ -1386,8 +1383,6 @@ entities: - type: Transform pos: 8.5,9.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaCorpRight entities: - uid: 596 @@ -1396,8 +1391,6 @@ entities: rot: 1.5707963267948966 rad pos: 7.5,8.5 parent: 1 - - type: Physics - bodyType: Static - proto: BlastDoor entities: - uid: 82 @@ -2872,37 +2865,11 @@ entities: - type: Transform pos: 4.5,-3.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - uid: 387 components: - type: Transform pos: -3.5,-3.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: ConveyorBelt entities: - uid: 348 @@ -5115,6 +5082,13 @@ entities: - type: Transform pos: 3.280076,1.401608 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 531 + components: + - type: Transform + pos: 1.5,10.5 + parent: 1 - proto: NFSignDock entities: - uid: 604 @@ -5189,23 +5163,15 @@ entities: - type: Transform pos: -10.5,9.5 parent: 1 - - type: FuelGenerator - on: False - type: MaterialStorageMagnetPickup magnetEnabled: True - - type: Physics - bodyType: Static - uid: 961 components: - type: Transform pos: -10.5,7.5 parent: 1 - - type: FuelGenerator - on: False - type: MaterialStorageMagnetPickup magnetEnabled: True - - type: Physics - bodyType: Static - proto: PosterLegitCarpMount entities: - uid: 522 @@ -7064,7 +7030,7 @@ entities: - type: Transform pos: -6.5,10.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 475 components: diff --git a/Resources/Maps/_NF/Shuttles/beaker.yml b/Resources/Maps/_NF/Shuttles/beaker.yml index ad04506bc1d..9b0a5797637 100644 --- a/Resources/Maps/_NF/Shuttles/beaker.yml +++ b/Resources/Maps/_NF/Shuttles/beaker.yml @@ -459,8 +459,6 @@ entities: - type: Transform pos: 3.5,-2.5 parent: 1 - - type: Apc - hasAccess: True - uid: 350 components: - type: Transform @@ -1312,8 +1310,8 @@ entities: pos: -4.5,0.5 parent: 1 - type: GasMixer - inletOneConcentration: 0.79 inletTwoConcentration: 0.21 + inletOneConcentration: 0.79 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasPassiveVent @@ -1904,6 +1902,13 @@ entities: - type: Transform pos: -5.5501204,-3.5460114 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 253 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 371 @@ -1939,10 +1944,6 @@ entities: - type: Transform pos: 2.5,-10.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PosterLegitSafetyMothEpi entities: - uid: 219 @@ -1965,7 +1966,7 @@ entities: - type: Transform pos: -6.5,-3.5 parent: 1 -- proto: PoweredlightColoredFrostyBlue +- proto: PoweredlightCyan entities: - uid: 210 components: @@ -2961,7 +2962,7 @@ entities: - type: Transform pos: 4.5,-1.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 378 components: diff --git a/Resources/Maps/_NF/Shuttles/bocadillo.yml b/Resources/Maps/_NF/Shuttles/bocadillo.yml index 654bd71dc50..5393ed68720 100644 --- a/Resources/Maps/_NF/Shuttles/bocadillo.yml +++ b/Resources/Maps/_NF/Shuttles/bocadillo.yml @@ -17,11 +17,11 @@ entities: components: - type: MetaData name: Bocadillo - - type: BecomesStation - id: Bocadillo - type: Transform pos: -0.4375,-1.703125 parent: invalid + - type: BecomesStation + id: Bocadillo - type: MapGrid chunks: 0,0: @@ -620,19 +620,6 @@ entities: rot: 3.141592653589793 rad pos: 2.5,1.5 parent: 2 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: DefibrillatorCabinetFilled entities: - uid: 132 @@ -1233,6 +1220,13 @@ entities: rot: -1.5707963267948966 rad pos: -6.5,4.5 parent: 2 +- proto: NFHolopadShip + entities: + - uid: 86 + components: + - type: Transform + pos: -7.5,6.5 + parent: 2 - proto: NitrogenCanister entities: - uid: 141 @@ -1260,10 +1254,6 @@ entities: - type: Transform pos: -8.5,3.5 parent: 2 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: Poweredlight entities: - uid: 38 @@ -1309,20 +1299,6 @@ entities: - type: Transform pos: 0.5,6.5 parent: 2 - - type: ContainerContainer - containers: - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - blueprint: !type:Container - showEnts: False - occludes: True - ents: [] - proto: SheetSteel entities: - uid: 201 @@ -1561,13 +1537,6 @@ entities: rot: 3.141592653589793 rad pos: -2.5,0.5 parent: 2 -- proto: VendingMachineChefDrobe - entities: - - uid: 146 - components: - - type: Transform - pos: -7.5,6.5 - parent: 2 - proto: VendingMachineChefvend entities: - uid: 100 @@ -1802,7 +1771,7 @@ entities: - type: Transform pos: -6.5,3.5 parent: 2 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 139 components: diff --git a/Resources/Maps/_NF/Shuttles/bodkin.yml b/Resources/Maps/_NF/Shuttles/bodkin.yml index 4f0e9f72557..92cd7858ce0 100644 --- a/Resources/Maps/_NF/Shuttles/bodkin.yml +++ b/Resources/Maps/_NF/Shuttles/bodkin.yml @@ -976,8 +976,6 @@ entities: rot: -1.5707963267948966 rad pos: -3.5,-2.5 parent: 2 - - type: Physics - bodyType: Static - proto: BenchSofaCorpRight entities: - uid: 206 @@ -986,8 +984,6 @@ entities: rot: -1.5707963267948966 rad pos: -3.5,-1.5 parent: 2 - - type: Physics - bodyType: Static - proto: BlastDoor entities: - uid: 10 @@ -1497,19 +1493,6 @@ entities: - type: Transform pos: -3.5,-4.5 parent: 2 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: ConveyorBelt entities: - uid: 65 @@ -2470,6 +2453,13 @@ entities: rot: -1.5707963267948966 rad pos: 1.6934373,4.4512644 parent: 2 +- proto: NFHolopadShip + entities: + - uid: 437 + components: + - type: Transform + pos: -0.5,5.5 + parent: 2 - proto: NFSignDock entities: - uid: 410 @@ -2552,10 +2542,6 @@ entities: - type: Transform pos: 4.5,-3.5 parent: 2 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PosterLegitCarpMount entities: - uid: 426 @@ -2586,13 +2572,6 @@ entities: - type: Transform pos: -1.5,-0.5 parent: 2 -- proto: PottedPlantRandom - entities: - - uid: 437 - components: - - type: Transform - pos: -0.5,5.5 - parent: 2 - proto: Poweredlight entities: - uid: 137 @@ -3474,7 +3453,7 @@ entities: rot: 3.141592653589793 rad pos: -2.5,-10.5 parent: 2 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 402 components: diff --git a/Resources/Maps/_NF/Shuttles/bookworm.yml b/Resources/Maps/_NF/Shuttles/bookworm.yml index ebf39f77c36..e2322e8144c 100644 --- a/Resources/Maps/_NF/Shuttles/bookworm.yml +++ b/Resources/Maps/_NF/Shuttles/bookworm.yml @@ -22,11 +22,11 @@ entities: components: - type: MetaData name: Bookworm - - type: BecomesStation - id: Bookworm - type: Transform pos: -0.53125,-0.55733174 parent: invalid + - type: BecomesStation + id: Bookworm - type: MapGrid chunks: 0,0: @@ -1470,19 +1470,6 @@ entities: - type: Transform pos: -4.5,-4.5 parent: 2 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: CrateServiceGuidebooks entities: - uid: 73 @@ -1585,13 +1572,6 @@ entities: - type: Transform pos: -5.5,2.5 parent: 2 -- proto: filingCabinetDrawerRandom - entities: - - uid: 296 - components: - - type: Transform - pos: -5.5,4.5 - parent: 2 - proto: Firelock entities: - uid: 23 @@ -2535,6 +2515,13 @@ entities: - type: Transform pos: 6.2763557,-3.4680002 parent: 2 +- proto: NFHolopadShip + entities: + - uid: 296 + components: + - type: Transform + pos: -5.5,4.5 + parent: 2 - proto: NitrogenCanister entities: - uid: 80 @@ -2658,10 +2645,6 @@ entities: - type: Transform pos: -3.5,-2.5 parent: 2 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PosterContrabandWehWatches entities: - uid: 524 @@ -3823,7 +3806,7 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,-5.5 parent: 2 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 411 components: diff --git a/Resources/Maps/_NF/Shuttles/bulker.yml b/Resources/Maps/_NF/Shuttles/bulker.yml index 3030b2d0ef1..5d6e6545434 100644 --- a/Resources/Maps/_NF/Shuttles/bulker.yml +++ b/Resources/Maps/_NF/Shuttles/bulker.yml @@ -1599,10 +1599,11 @@ entities: parent: 1 - proto: ComputerTabletopStationRecords entities: - - uid: 361 + - uid: 62 components: - type: Transform - pos: 1.5,3.5 + rot: 3.141592653589793 rad + pos: 0.5,-1.5 parent: 1 - proto: ConveyorBelt entities: @@ -2918,6 +2919,13 @@ entities: rot: -1.5707963267948966 rad pos: 12.5,0.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 361 + components: + - type: Transform + pos: 1.5,3.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 477 @@ -3142,7 +3150,7 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,-2.5 parent: 1 -- proto: PoweredlightColoredBlack +- proto: PoweredlightBlack entities: - uid: 351 components: @@ -3156,19 +3164,6 @@ entities: rot: -1.5707963267948966 rad pos: 11.5,-3.5 parent: 1 -- proto: PoweredlightColoredRed - entities: - - uid: 442 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,0.5 - parent: 1 - - uid: 657 - components: - - type: Transform - pos: 0.5,-6.5 - parent: 1 - proto: PoweredlightGreen entities: - uid: 418 @@ -3185,6 +3180,17 @@ entities: rot: -1.5707963267948966 rad pos: -8.5,3.5 parent: 1 + - uid: 442 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,0.5 + parent: 1 + - uid: 657 + components: + - type: Transform + pos: 0.5,-6.5 + parent: 1 - proto: PoweredSmallLight entities: - uid: 194 @@ -3427,16 +3433,6 @@ entities: - type: Transform pos: -0.41324377,-1.3236005 parent: 1 - - uid: 434 - components: - - type: Transform - pos: 0.05550623,-1.4329755 - parent: 1 - - uid: 435 - components: - - type: Transform - pos: 0.6180062,-1.3079755 - parent: 1 - uid: 438 components: - type: Transform @@ -3534,11 +3530,6 @@ entities: parent: 1 - proto: TableReinforced entities: - - uid: 62 - components: - - type: Transform - pos: 1.5,3.5 - parent: 1 - uid: 292 components: - type: Transform diff --git a/Resources/Maps/_NF/Shuttles/camper.yml b/Resources/Maps/_NF/Shuttles/camper.yml index 3bb338fbae7..9bb13aa1556 100644 --- a/Resources/Maps/_NF/Shuttles/camper.yml +++ b/Resources/Maps/_NF/Shuttles/camper.yml @@ -18,10 +18,10 @@ entities: components: - type: MetaData name: Camper - - type: BecomesStation - id: Camper - type: Transform parent: invalid + - type: BecomesStation + id: Camper - type: MapGrid chunks: 0,0: @@ -968,6 +968,13 @@ entities: - 0 - 0 - 0 +- proto: NFHolopadShip + entities: + - uid: 192 + components: + - type: Transform + pos: -1.5,4.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 106 diff --git a/Resources/Maps/_NF/Shuttles/ceres.yml b/Resources/Maps/_NF/Shuttles/ceres.yml index e55bb843d9e..75478331c32 100644 --- a/Resources/Maps/_NF/Shuttles/ceres.yml +++ b/Resources/Maps/_NF/Shuttles/ceres.yml @@ -1190,8 +1190,6 @@ entities: rot: -1.5707963267948966 rad pos: -4.5,-22.5 parent: 2 - - type: Physics - bodyType: Static - proto: BenchSofaRight entities: - uid: 286 @@ -1200,8 +1198,6 @@ entities: rot: -1.5707963267948966 rad pos: -4.5,-21.5 parent: 2 - - type: Physics - bodyType: Static - proto: BoozeDispenser entities: - uid: 229 @@ -2120,11 +2116,11 @@ entities: parent: 2 - proto: ComputerStationRecords entities: - - uid: 170 + - uid: 804 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 6.5,-8.5 + rot: -1.5707963267948966 rad + pos: 7.5,-13.5 parent: 2 - proto: ComputerWallmountWithdrawBankATM entities: @@ -2133,19 +2129,6 @@ entities: - type: Transform pos: 1.5,-15.5 parent: 2 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: DefibrillatorCabinetFilled entities: - uid: 147 @@ -3903,6 +3886,13 @@ entities: - type: Transform pos: -7.7678905,-9.159548 parent: 2 +- proto: NFHolopadShip + entities: + - uid: 170 + components: + - type: Transform + pos: 6.5,-8.5 + parent: 2 - proto: NitrogenCanister entities: - uid: 666 @@ -3967,9 +3957,6 @@ entities: parent: 2 - type: FuelGenerator targetPower: 24000 - on: False - - type: Physics - bodyType: Static - proto: PottedPlantRandom entities: - uid: 103 @@ -4215,20 +4202,6 @@ entities: - type: Transform pos: 7.5,-12.5 parent: 2 - - type: ContainerContainer - containers: - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - blueprint: !type:Container - showEnts: False - occludes: True - ents: [] - proto: SheetUranium entities: - uid: 205 @@ -5762,7 +5735,7 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,-23.5 parent: 2 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 584 components: diff --git a/Resources/Maps/_NF/Shuttles/chisel.yml b/Resources/Maps/_NF/Shuttles/chisel.yml index e59efd0523f..2428a00f9cb 100644 --- a/Resources/Maps/_NF/Shuttles/chisel.yml +++ b/Resources/Maps/_NF/Shuttles/chisel.yml @@ -18,11 +18,11 @@ entities: components: - type: MetaData name: Chisel - - type: BecomesStation - id: Chisel - type: Transform pos: -0.5,-0.5000076 parent: invalid + - type: BecomesStation + id: Chisel - type: MapGrid chunks: 0,0: @@ -1145,19 +1145,6 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,-4.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: ConveyorBelt entities: - uid: 97 @@ -1872,6 +1859,13 @@ entities: - type: Transform pos: 6.5,2.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 350 + components: + - type: Transform + pos: -3.5,3.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 240 @@ -1932,19 +1926,11 @@ entities: - type: Transform pos: 4.5,-1.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - uid: 254 components: - type: Transform pos: 5.5,-1.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PowerCellRecharger entities: - uid: 38 @@ -1977,7 +1963,7 @@ entities: - type: Transform pos: -2.5,0.5 parent: 1 -- proto: PoweredlightColoredBlack +- proto: PoweredlightBlack entities: - uid: 169 components: @@ -2686,7 +2672,7 @@ entities: rot: 3.141592653589793 rad pos: -2.5,1.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 40 components: diff --git a/Resources/Maps/_NF/Shuttles/comet.yml b/Resources/Maps/_NF/Shuttles/comet.yml index 34398becbec..baf5c3d5a54 100644 --- a/Resources/Maps/_NF/Shuttles/comet.yml +++ b/Resources/Maps/_NF/Shuttles/comet.yml @@ -2687,6 +2687,13 @@ entities: - type: Transform pos: 1.7263477,7.4463973 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 438 + components: + - type: Transform + pos: -1.5,2.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 379 @@ -3932,7 +3939,7 @@ entities: - type: Transform pos: 1.5,-2.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 543 components: diff --git a/Resources/Maps/_NF/Shuttles/crescent.yml b/Resources/Maps/_NF/Shuttles/crescent.yml index 566b958bdf5..0c53e2c9bd7 100644 --- a/Resources/Maps/_NF/Shuttles/crescent.yml +++ b/Resources/Maps/_NF/Shuttles/crescent.yml @@ -658,7 +658,7 @@ entities: 4,3: 2: 17 0: 61440 - 5: 68 + 3: 68 -1,-1: 0: 65024 -4,0: @@ -681,7 +681,7 @@ entities: 0: 52431 2: 4096 -4,-1: - 3: 8192 + 4: 8192 0: 32768 -3,0: 0: 20667 @@ -691,11 +691,11 @@ entities: 0: 1615 -3,3: 0: 256 - 4: 61166 + 5: 61166 -3,-1: 0: 8192 -3,4: - 4: 14 + 5: 14 0: 26112 -2,0: 0: 62139 @@ -728,13 +728,13 @@ entities: 0: 15 2: 16896 6,0: - 3: 4096 + 4: 4096 6,2: 0: 26230 6,3: 0: 63239 6,1: - 3: 32 + 4: 32 0: 8192 6,4: 0: 65319 @@ -743,16 +743,16 @@ entities: 7,3: 0: 12544 2: 2 - 3: 52416 + 4: 52416 7,4: 0: 4353 - 3: 204 + 4: 204 -8,3: - 3: 26208 + 4: 26208 0: 32768 2: 8 -8,4: - 3: 102 + 4: 102 -7,3: 0: 61900 -7,2: @@ -819,28 +819,28 @@ entities: 0: 4403 -7,9: 0: 204 - 3: 32768 + 4: 32768 -6,9: 0: 51 - 3: 28672 + 4: 28672 -6,10: - 3: 18039 + 4: 18039 -6,11: - 3: 68 + 4: 68 5,8: 0: 32768 5,9: 0: 136 - 3: 49152 + 4: 49152 5,10: - 3: 19660 + 4: 19660 5,11: - 3: 68 + 4: 68 6,9: 0: 51 - 3: 12288 + 4: 12288 6,10: - 3: 17 + 4: 17 -4,5: 0: 3276 -3,5: @@ -861,9 +861,9 @@ entities: 0: 26191 -1,7: 0: 6 - 3: 28160 + 4: 28160 -1,8: - 3: 2 + 4: 2 0,5: 0: 16371 0,6: @@ -945,12 +945,12 @@ entities: - 0 - 0 - volume: 2500 - immutable: True + temperature: 293.15 moles: - 0 - 0 - 0 - - 0 + - 2500 - 0 - 0 - 0 @@ -960,30 +960,30 @@ entities: - 0 - 0 - volume: 2500 - temperature: 340 + immutable: True moles: - - 21.824879 - - 82.10312 - 0 - 0 - 0 - - 82.10312 - 0 - 0 - 0 - 0 - 0 - 0 - - volume: 2500 - temperature: 293.15 - moles: - 0 - 0 - 0 - - 2500 + - volume: 2500 + temperature: 340 + moles: + - 21.824879 + - 82.10312 - 0 - 0 - 0 + - 82.10312 + - 0 - 0 - 0 - 0 @@ -9808,7 +9808,7 @@ entities: rot: -1.5707963267948966 rad pos: -10.5,16.5 parent: 1 -- proto: FloraTree05 +- proto: FloraTree entities: - uid: 3488 components: @@ -16779,6 +16779,13 @@ entities: - type: Transform pos: 4.2787952,0.7933556 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 202 + components: + - type: Transform + pos: 3.5,29.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 2259 @@ -17414,7 +17421,7 @@ entities: rot: -1.5707963267948966 rad pos: 14.5,20.5 parent: 1 -- proto: PoweredlightColoredBlack +- proto: PoweredlightBlack entities: - uid: 1151 components: @@ -17427,13 +17434,6 @@ entities: - type: Transform pos: 10.5,16.5 parent: 1 -- proto: PoweredlightColoredRed - entities: - - uid: 2370 - components: - - type: Transform - pos: -5.5,16.5 - parent: 1 - proto: PoweredlightExterior entities: - uid: 2371 @@ -17442,6 +17442,13 @@ entities: rot: 3.141592653589793 rad pos: -5.5,12.5 parent: 1 +- proto: PoweredlightRed + entities: + - uid: 2370 + components: + - type: Transform + pos: -5.5,16.5 + parent: 1 - proto: PoweredSmallLight entities: - uid: 2372 @@ -18133,13 +18140,6 @@ entities: - type: Transform pos: 5.469994,13.032564 parent: 1 -- proto: ScienceTechFab - entities: - - uid: 1232 - components: - - type: Transform - pos: 24.5,22.5 - parent: 1 - proto: SeedExtractor entities: - uid: 2515 @@ -19779,11 +19779,6 @@ entities: - type: Transform pos: 3.5,16.5 parent: 1 - - uid: 2734 - components: - - type: Transform - pos: 3.5,29.5 - parent: 1 - uid: 2735 components: - type: Transform @@ -20091,6 +20086,13 @@ entities: - type: Transform pos: 10.6321535,14.659507 parent: 1 +- proto: UnfinishedMachineFrame + entities: + - uid: 1232 + components: + - type: Transform + pos: 24.5,22.5 + parent: 1 - proto: UniformShortsRed entities: - uid: 1380 diff --git a/Resources/Maps/_NF/Shuttles/eagle.yml b/Resources/Maps/_NF/Shuttles/eagle.yml index cd2d5577f1e..cb505baf523 100644 --- a/Resources/Maps/_NF/Shuttles/eagle.yml +++ b/Resources/Maps/_NF/Shuttles/eagle.yml @@ -13,7 +13,7 @@ tilemap: 114: FloorWhiteMono 121: Lattice 122: Plating - 3: PlatingBurnt + 3: PlatingDamaged entities: - proto: "" entities: @@ -2088,13 +2088,6 @@ entities: - type: Transform pos: 2.5,9.5 parent: 1 -- proto: filingCabinetRandom - entities: - - uid: 678 - components: - - type: Transform - pos: 2.5,7.5 - parent: 1 - proto: FireAlarm entities: - uid: 576 @@ -3553,6 +3546,13 @@ entities: rot: 3.141592653589793 rad pos: 13.5,-5.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 678 + components: + - type: Transform + pos: 2.5,7.5 + parent: 1 - proto: NFSignDock entities: - uid: 632 diff --git a/Resources/Maps/_NF/Shuttles/garden.yml b/Resources/Maps/_NF/Shuttles/garden.yml index 090ddde1090..56098b13d3b 100644 --- a/Resources/Maps/_NF/Shuttles/garden.yml +++ b/Resources/Maps/_NF/Shuttles/garden.yml @@ -795,7 +795,7 @@ entities: - uid: 259 components: - type: Transform - pos: 0.5,6.5 + pos: -0.5,4.5 parent: 1 - proto: FirelockGlass entities: @@ -1533,6 +1533,13 @@ entities: rot: 3.141592653589793 rad pos: 3.5,4.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 189 + components: + - type: Transform + pos: 0.5,6.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 282 @@ -1560,10 +1567,6 @@ entities: - type: Transform pos: 3.5,5.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PosterLegitBotanyFood entities: - uid: 257 @@ -1794,11 +1797,6 @@ entities: rot: 3.141592653589793 rad pos: 4.5,-2.5 parent: 1 - - uid: 189 - components: - - type: Transform - pos: 0.5,6.5 - parent: 1 - proto: TableGlass entities: - uid: 182 @@ -2115,7 +2113,7 @@ entities: rot: -1.5707963267948966 rad pos: -1.5,2.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 263 components: diff --git a/Resources/Maps/_NF/Shuttles/hammer.yml b/Resources/Maps/_NF/Shuttles/hammer.yml index 84156083707..5367e8fabca 100644 --- a/Resources/Maps/_NF/Shuttles/hammer.yml +++ b/Resources/Maps/_NF/Shuttles/hammer.yml @@ -1318,7 +1318,7 @@ entities: - type: Transform pos: -3.5,0.5 parent: 2 -- proto: CrateMaterials +- proto: CrateMaterialsBasicFilled entities: - uid: 272 components: @@ -2127,6 +2127,13 @@ entities: - type: Transform pos: 7.374843,0.8089867 parent: 2 +- proto: NFHolopadShip + entities: + - uid: 263 + components: + - type: Transform + pos: 7.5,5.5 + parent: 2 - proto: NitrogenCanister entities: - uid: 93 @@ -2225,13 +2232,6 @@ entities: rot: 3.141592653589793 rad pos: -5.5,1.5 parent: 2 -- proto: PottedPlantRandom - entities: - - uid: 263 - components: - - type: Transform - pos: 7.5,5.5 - parent: 2 - proto: PowerCellRecharger entities: - uid: 318 @@ -3027,7 +3027,7 @@ entities: - type: Transform pos: -3.5,-4.5 parent: 2 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 421 components: diff --git a/Resources/Maps/_NF/Shuttles/harbormaster.yml b/Resources/Maps/_NF/Shuttles/harbormaster.yml index e730cad5f22..3b28de57cb0 100644 --- a/Resources/Maps/_NF/Shuttles/harbormaster.yml +++ b/Resources/Maps/_NF/Shuttles/harbormaster.yml @@ -678,10 +678,10 @@ entities: parent: 1 - proto: BoxFolderBlue entities: - - uid: 7 + - uid: 254 components: - type: Transform - pos: -5.657484,3.1305754 + pos: -5.8715925,3.5784767 parent: 1 - proto: ButtonFrameCaution entities: @@ -1009,14 +1009,6 @@ entities: rot: 3.141592653589793 rad pos: -5.5,0.5 parent: 1 -- proto: ComputerTabletopRadar - entities: - - uid: 273 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,2.5 - parent: 1 - proto: ComputerTabletopShuttle entities: - uid: 272 @@ -1435,6 +1427,13 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,-3.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 7 + components: + - type: Transform + pos: -5.5,2.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 118 @@ -1462,19 +1461,11 @@ entities: - type: Transform pos: -3.5,-3.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - uid: 163 components: - type: Transform pos: -2.5,-3.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PoweredlightLED entities: - uid: 203 @@ -1724,12 +1715,6 @@ entities: parent: 1 - proto: TableReinforced entities: - - uid: 254 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,2.5 - parent: 1 - uid: 255 components: - type: Transform @@ -2085,7 +2070,7 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-1.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 249 components: diff --git a/Resources/Maps/_NF/Shuttles/hauler.yml b/Resources/Maps/_NF/Shuttles/hauler.yml index c446cf4e149..1948366a167 100644 --- a/Resources/Maps/_NF/Shuttles/hauler.yml +++ b/Resources/Maps/_NF/Shuttles/hauler.yml @@ -711,7 +711,7 @@ entities: pos: -5.5,14.5 parent: 1 - type: Door - secondsUntilStateChange: -319.50586 + secondsUntilStateChange: -489.1448 state: Opening - type: DeviceLinkSource lastSignals: @@ -932,8 +932,6 @@ entities: - type: Transform pos: 4.5,26.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaCorpRight entities: - uid: 509 @@ -941,8 +939,6 @@ entities: - type: Transform pos: 3.5,26.5 parent: 1 - - type: Physics - bodyType: Static - proto: BoozeDispenser entities: - uid: 527 @@ -4032,6 +4028,13 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,0.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 725 + components: + - type: Transform + pos: 0.5,28.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 214 @@ -4140,10 +4143,6 @@ entities: - type: Transform pos: 3.5,-1.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PosterLegitAnatomyPoster entities: - uid: 522 @@ -4346,7 +4345,29 @@ entities: rot: 3.141592653589793 rad pos: 7.5,9.5 parent: 1 -- proto: PoweredlightColoredRed +- proto: PoweredLightPostSmallRed + entities: + - uid: 144 + components: + - type: Transform + pos: 6.5,29.5 + parent: 1 + - uid: 474 + components: + - type: Transform + pos: -5.5,29.5 + parent: 1 + - uid: 689 + components: + - type: Transform + pos: -2.5,33.5 + parent: 1 + - uid: 696 + components: + - type: Transform + pos: 3.5,33.5 + parent: 1 +- proto: PoweredlightRed entities: - uid: 203 components: @@ -4404,28 +4425,6 @@ entities: - type: Transform pos: 4.5,-3.5 parent: 1 -- proto: PoweredLightPostSmallRed - entities: - - uid: 144 - components: - - type: Transform - pos: 6.5,29.5 - parent: 1 - - uid: 474 - components: - - type: Transform - pos: -5.5,29.5 - parent: 1 - - uid: 689 - components: - - type: Transform - pos: -2.5,33.5 - parent: 1 - - uid: 696 - components: - - type: Transform - pos: 3.5,33.5 - parent: 1 - proto: Rack entities: - uid: 698 @@ -6361,7 +6360,7 @@ entities: rot: 1.5707963267948966 rad pos: 3.5,6.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 191 components: diff --git a/Resources/Maps/_NF/Shuttles/honker.yml b/Resources/Maps/_NF/Shuttles/honker.yml index 49639fb3491..6bab7dbcfdf 100644 --- a/Resources/Maps/_NF/Shuttles/honker.yml +++ b/Resources/Maps/_NF/Shuttles/honker.yml @@ -15,11 +15,11 @@ entities: components: - type: MetaData name: Honker - - type: BecomesStation - id: Honker - type: Transform pos: -0.6250305,0.875 parent: invalid + - type: BecomesStation + id: Honker - type: MapGrid chunks: 0,0: @@ -1116,6 +1116,13 @@ entities: rot: 3.141592653589793 rad pos: 5.5,10.5 parent: 2 +- proto: NFHolopadShip + entities: + - uid: 183 + components: + - type: Transform + pos: 2.5,10.5 + parent: 2 - proto: NitrogenCanister entities: - uid: 143 @@ -1174,10 +1181,6 @@ entities: - type: Transform pos: 5.5,11.5 parent: 2 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PosterContrabandClown entities: - uid: 197 @@ -1679,7 +1682,7 @@ entities: - type: Transform pos: -0.5,4.5 parent: 2 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 209 components: diff --git a/Resources/Maps/_NF/Shuttles/investigator.yml b/Resources/Maps/_NF/Shuttles/investigator.yml index 6c1a60f694c..2014e5edcbe 100644 --- a/Resources/Maps/_NF/Shuttles/investigator.yml +++ b/Resources/Maps/_NF/Shuttles/investigator.yml @@ -10,7 +10,7 @@ tilemap: 2: FloorGlass 78: FloorReinforced 90: FloorSteel - 91: FloorSteelBurnt + 91: FloorSteelDamaged 97: FloorSteelDirty 101: FloorSteelMono 1: FloorTechMaint @@ -24,11 +24,11 @@ entities: components: - type: MetaData name: Investigator - - type: BecomesStation - id: Investigator - type: Transform pos: -2.6107569,3.2554395 parent: invalid + - type: BecomesStation + id: Investigator - type: MapGrid chunks: 0,0: @@ -1232,8 +1232,6 @@ entities: rot: 3.141592653589793 rad pos: -2.5,-2.5 parent: 2 - - type: Physics - bodyType: Static - proto: BenchSofaRight entities: - uid: 296 @@ -1242,8 +1240,6 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-2.5 parent: 2 - - type: Physics - bodyType: Static - proto: BlastDoor entities: - uid: 47 @@ -2714,19 +2710,6 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,0.5 parent: 2 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: ConveyorBelt entities: - uid: 3 @@ -3785,6 +3768,8 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,0.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: LockerPilot entities: - uid: 537 @@ -3813,6 +3798,13 @@ entities: - type: Transform pos: 10.5,-2.5 parent: 2 +- proto: NFHolopadShip + entities: + - uid: 458 + components: + - type: Transform + pos: -2.5,-6.5 + parent: 2 - proto: NFSignDock entities: - uid: 481 @@ -3881,19 +3873,11 @@ entities: - type: Transform pos: -2.5,2.5 parent: 2 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - uid: 519 components: - type: Transform pos: -1.5,2.5 parent: 2 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PottedPlantRandom entities: - uid: 281 @@ -5281,7 +5265,7 @@ entities: - type: Transform pos: -5.5,0.5 parent: 2 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 328 components: diff --git a/Resources/Maps/_NF/Shuttles/kestrel.yml b/Resources/Maps/_NF/Shuttles/kestrel.yml index 112b56774b3..cbf41f37a2f 100644 --- a/Resources/Maps/_NF/Shuttles/kestrel.yml +++ b/Resources/Maps/_NF/Shuttles/kestrel.yml @@ -24,11 +24,11 @@ entities: components: - type: MetaData name: Kestrel - - type: BecomesStation - id: Kestrel - type: Transform pos: -1.078125,-0.46875 parent: invalid + - type: BecomesStation + id: Kestrel - type: MapGrid chunks: 0,0: @@ -2818,10 +2818,10 @@ entities: parent: 3 - proto: LockerQuarterMasterFilledHardsuit entities: - - uid: 261 + - uid: 483 components: - type: Transform - pos: 1.5,-0.5 + pos: 0.5,-3.5 parent: 3 - proto: LockerSalvageSpecialistFilled entities: @@ -2888,6 +2888,13 @@ entities: - type: Transform pos: -2.5,-8.5 parent: 3 +- proto: NFHolopadShip + entities: + - uid: 261 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 3 - proto: NitrogenCanister entities: - uid: 345 @@ -2946,10 +2953,6 @@ entities: - type: Transform pos: -1.5,-7.5 parent: 3 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PosterContrabandVoteWeh entities: - uid: 297 @@ -3017,14 +3020,6 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,-10.5 parent: 3 -- proto: PoweredlightColoredRed - entities: - - uid: 11 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,0.5 - parent: 3 - proto: PoweredlightGreen entities: - uid: 530 @@ -3035,6 +3030,12 @@ entities: parent: 3 - proto: PoweredlightRed entities: + - uid: 11 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,0.5 + parent: 3 - uid: 12 components: - type: Transform @@ -4073,7 +4074,7 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,-10.5 parent: 3 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 276 components: diff --git a/Resources/Maps/_NF/Shuttles/kilderkin.yml b/Resources/Maps/_NF/Shuttles/kilderkin.yml index 257ac1814bb..3807fbb7267 100644 --- a/Resources/Maps/_NF/Shuttles/kilderkin.yml +++ b/Resources/Maps/_NF/Shuttles/kilderkin.yml @@ -3167,6 +3167,13 @@ entities: rot: 3.141592653589793 rad pos: 3.5,3.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 622 + components: + - type: Transform + pos: 5.5,5.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 290 @@ -3420,7 +3427,7 @@ entities: - type: Transform pos: -1.5,5.5 parent: 1 -- proto: ShadowTree01 +- proto: ShadowTree entities: - uid: 189 components: diff --git a/Resources/Maps/_NF/Shuttles/lantern.yml b/Resources/Maps/_NF/Shuttles/lantern.yml index 91a146d57be..1339fd1aa7b 100644 --- a/Resources/Maps/_NF/Shuttles/lantern.yml +++ b/Resources/Maps/_NF/Shuttles/lantern.yml @@ -976,48 +976,36 @@ entities: rot: 3.141592653589793 rad pos: 2.5,-5.5 parent: 1 - - type: Physics - bodyType: Static - uid: 490 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,-3.5 parent: 1 - - type: Physics - bodyType: Static - uid: 495 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,-7.5 parent: 1 - - type: Physics - bodyType: Static - uid: 504 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,-3.5 parent: 1 - - type: Physics - bodyType: Static - uid: 505 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,-5.5 parent: 1 - - type: Physics - bodyType: Static - uid: 506 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,-7.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchPewMiddle entities: - uid: 496 @@ -1026,16 +1014,12 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-5.5 parent: 1 - - type: Physics - bodyType: Static - uid: 497 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,-7.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchPewRight entities: - uid: 498 @@ -1044,48 +1028,36 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-5.5 parent: 1 - - type: Physics - bodyType: Static - uid: 499 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-7.5 parent: 1 - - type: Physics - bodyType: Static - uid: 500 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-3.5 parent: 1 - - type: Physics - bodyType: Static - uid: 501 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-7.5 parent: 1 - - type: Physics - bodyType: Static - uid: 502 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-5.5 parent: 1 - - type: Physics - bodyType: Static - uid: 503 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-3.5 parent: 1 - - type: Physics - bodyType: Static - proto: Bible entities: - uid: 100 @@ -3078,19 +3050,6 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-16.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: ConveyorBelt entities: - uid: 186 @@ -4198,6 +4157,13 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,-16.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 694 + components: + - type: Transform + pos: 0.5,4.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 616 @@ -4241,10 +4207,6 @@ entities: - type: Transform pos: -1.5,-16.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PottedPlantRandom entities: - uid: 719 @@ -5873,7 +5835,7 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,-16.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 418 components: diff --git a/Resources/Maps/_NF/Shuttles/legman.yml b/Resources/Maps/_NF/Shuttles/legman.yml index 2a3e0e84f05..ac2f08dde99 100644 --- a/Resources/Maps/_NF/Shuttles/legman.yml +++ b/Resources/Maps/_NF/Shuttles/legman.yml @@ -564,19 +564,6 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,-2.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: DefibrillatorCabinetFilled entities: - uid: 75 @@ -879,6 +866,13 @@ entities: - type: Transform pos: 2.911514,1.3323524 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 145 + components: + - type: Transform + pos: 3.5,-1.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 51 @@ -1026,17 +1020,6 @@ entities: - type: Transform pos: 0.5,-1.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static -- proto: PottedPlantRandom - entities: - - uid: 162 - components: - - type: Transform - pos: 3.5,-1.5 - parent: 1 - proto: PoweredlightLED entities: - uid: 81 @@ -1333,7 +1316,7 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,-0.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 143 components: diff --git a/Resources/Maps/_NF/Shuttles/liquidator.yml b/Resources/Maps/_NF/Shuttles/liquidator.yml index b2a84834063..fca8c614a30 100644 --- a/Resources/Maps/_NF/Shuttles/liquidator.yml +++ b/Resources/Maps/_NF/Shuttles/liquidator.yml @@ -1286,6 +1286,13 @@ entities: rot: 3.141592653589793 rad pos: -2.5,1.5 parent: 1 +- proto: ChemicalBarrelSpaceCleaner + entities: + - uid: 97 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 - proto: ClosetRadiationSuitFilled entities: - uid: 188 @@ -1336,19 +1343,6 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,-6.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: ConveyorBelt entities: - uid: 139 @@ -1357,13 +1351,6 @@ entities: rot: 3.141592653589793 rad pos: 5.5,-2.5 parent: 1 -- proto: CrateSpaceCleaner - entities: - - uid: 97 - components: - - type: Transform - pos: 2.5,2.5 - parent: 1 - proto: DefibrillatorCabinetFilled entities: - uid: 26 @@ -2290,6 +2277,13 @@ entities: - type: Transform pos: 5.5,-1.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 287 + components: + - type: Transform + pos: -2.5,0.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 202 @@ -2332,12 +2326,8 @@ entities: - type: Transform pos: 2.5,-5.5 parent: 1 - - type: FuelGenerator - on: False - type: MaterialStorageMagnetPickup magnetEnabled: True - - type: Physics - bodyType: Static - proto: PosterLegitCleanliness entities: - uid: 296 @@ -3130,7 +3120,7 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-4.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 228 components: diff --git a/Resources/Maps/_NF/Shuttles/loader.yml b/Resources/Maps/_NF/Shuttles/loader.yml index 8c9be500304..dc06a31f0c3 100644 --- a/Resources/Maps/_NF/Shuttles/loader.yml +++ b/Resources/Maps/_NF/Shuttles/loader.yml @@ -15,11 +15,11 @@ entities: components: - type: MetaData name: Loader - - type: BecomesStation - id: Loader - type: Transform pos: -0.48958334,-0.53125 parent: invalid + - type: BecomesStation + id: Loader - type: MapGrid chunks: 0,0: @@ -1409,10 +1409,10 @@ entities: parent: 1 - proto: LockerQuarterMasterFilled entities: - - uid: 132 + - uid: 256 components: - type: Transform - pos: -0.5,5.5 + pos: 0.5,0.5 parent: 1 - proto: LockerWallMaterialsFuelPlasmaFilled entities: @@ -1422,6 +1422,13 @@ entities: rot: 3.141592653589793 rad pos: -2.5,-4.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 132 + components: + - type: Transform + pos: -0.5,5.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 222 diff --git a/Resources/Maps/_NF/Shuttles/lyrae.yml b/Resources/Maps/_NF/Shuttles/lyrae.yml index 4de1788a6b1..650e0123add 100644 --- a/Resources/Maps/_NF/Shuttles/lyrae.yml +++ b/Resources/Maps/_NF/Shuttles/lyrae.yml @@ -2205,19 +2205,6 @@ entities: - type: Transform pos: -1.5,1.5 parent: 2 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: CrateArtifactContainer entities: - uid: 511 @@ -2225,7 +2212,7 @@ entities: - type: Transform pos: 7.5,-2.5 parent: 2 -- proto: CrateMaterials +- proto: CrateMaterialsBasicFilled entities: - uid: 512 components: @@ -3575,10 +3562,10 @@ entities: parent: 2 - proto: LuxuryPen entities: - - uid: 78 + - uid: 565 components: - type: Transform - pos: -3.4731827,6.151365 + pos: 3.3493137,4.5289598 parent: 2 - proto: MachineArtifactAnalyzer entities: @@ -3618,6 +3605,13 @@ entities: - type: Transform pos: 5.362302,2.1461782 parent: 2 +- proto: NFHolopadShip + entities: + - uid: 78 + components: + - type: Transform + pos: -3.5,6.5 + parent: 2 - proto: NitrogenCanister entities: - uid: 648 @@ -3640,11 +3634,10 @@ entities: bodyType: Static - proto: PaperBin5 entities: - - uid: 188 + - uid: 421 components: - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,6.5 + pos: 3.5,4.5 parent: 2 - proto: PosterContrabandHackingGuide entities: @@ -4267,10 +4260,10 @@ entities: parent: 2 - proto: TableReinforcedGlass entities: - - uid: 421 + - uid: 188 components: - type: Transform - pos: -3.5,6.5 + pos: 3.5,4.5 parent: 2 - uid: 433 components: @@ -5107,7 +5100,7 @@ entities: - type: Transform pos: -10.5,12.5 parent: 2 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 479 components: diff --git a/Resources/Maps/_NF/Shuttles/mccargo.yml b/Resources/Maps/_NF/Shuttles/mccargo.yml index ceb61f267d4..451ab3aea26 100644 --- a/Resources/Maps/_NF/Shuttles/mccargo.yml +++ b/Resources/Maps/_NF/Shuttles/mccargo.yml @@ -17,11 +17,11 @@ entities: components: - type: MetaData name: McCargo - - type: BecomesStation - id: McCargo - type: Transform pos: -0.5,-0.6875 parent: invalid + - type: BecomesStation + id: McCargo - type: MapGrid chunks: 0,0: @@ -5141,6 +5141,13 @@ entities: - type: Transform pos: 6.500013,-1.9953516 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 774 + components: + - type: Transform + pos: -1.5,16.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 819 @@ -5401,7 +5408,7 @@ entities: rot: 1.5707963267948966 rad pos: -8.5,11.5 parent: 1 -- proto: PoweredlightColoredBlack +- proto: PoweredlightBlack entities: - uid: 227 components: diff --git a/Resources/Maps/_NF/Shuttles/mcdelivery.yml b/Resources/Maps/_NF/Shuttles/mcdelivery.yml index 7d791e5fcf2..f6780cff9c7 100644 --- a/Resources/Maps/_NF/Shuttles/mcdelivery.yml +++ b/Resources/Maps/_NF/Shuttles/mcdelivery.yml @@ -14,11 +14,11 @@ entities: components: - type: MetaData name: McDelivery - - type: BecomesStation - id: McDelivery - type: Transform pos: -0.48958334,-0.5208333 parent: invalid + - type: BecomesStation + id: McDelivery - type: MapGrid chunks: 0,0: @@ -284,14 +284,6 @@ entities: - type: Transform pos: 0.5,3.5 parent: 1 -- proto: ComputerTabletopStationRecords - entities: - - uid: 41 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,2.5 - parent: 1 - proto: ComputerWallmountWithdrawBankATM entities: - uid: 68 @@ -300,19 +292,6 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-3.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: CrateFreezerMcCargo entities: - uid: 72 @@ -538,6 +517,13 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,0.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 41 + components: + - type: Transform + pos: -0.5,2.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 45 @@ -587,10 +573,6 @@ entities: - type: Transform pos: -0.5,1.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PowerCellRecharger entities: - uid: 43 @@ -756,12 +738,6 @@ entities: - type: Transform pos: 0.5,-3.5 parent: 1 - - uid: 66 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,2.5 - parent: 1 - proto: Thruster entities: - uid: 3 @@ -833,7 +809,7 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,2.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 90 components: diff --git a/Resources/Maps/_NF/Shuttles/phoenix.yml b/Resources/Maps/_NF/Shuttles/phoenix.yml index 8065ef2d018..e89dbe98a91 100644 --- a/Resources/Maps/_NF/Shuttles/phoenix.yml +++ b/Resources/Maps/_NF/Shuttles/phoenix.yml @@ -4478,18 +4478,24 @@ entities: rot: 1.5707963267948966 rad pos: 9.5,11.5 parent: 1 + - type: Fixtures + fixtures: {} - uid: 388 components: - type: Transform rot: 1.5707963267948966 rad pos: -12.5,10.5 parent: 1 + - type: Fixtures + fixtures: {} - uid: 677 components: - type: Transform rot: 3.141592653589793 rad pos: -4.5,-1.5 parent: 1 + - type: Fixtures + fixtures: {} - proto: KitchenReagentGrinder entities: - uid: 643 @@ -4599,6 +4605,13 @@ entities: - type: Transform pos: 1.633827,4.46507 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 267 + components: + - type: Transform + pos: 12.5,11.5 + parent: 1 - proto: NFSignDock entities: - uid: 665 @@ -4648,13 +4661,6 @@ entities: - type: Transform pos: 9.5,10.5 parent: 1 -- proto: PaperBin5 - entities: - - uid: 642 - components: - - type: Transform - pos: 12.5,11.5 - parent: 1 - proto: PinpointerUniversal entities: - uid: 312 @@ -4669,19 +4675,11 @@ entities: - type: Transform pos: 5.5,2.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - uid: 153 components: - type: Transform pos: 4.5,2.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PortableScrubber entities: - uid: 623 @@ -4955,13 +4953,6 @@ entities: - type: Transform pos: 5.5,4.5 parent: 1 -- proto: StorageCanister - entities: - - uid: 648 - components: - - type: Transform - pos: 2.5,7.5 - parent: 1 - proto: Saw entities: - uid: 659 @@ -5502,6 +5493,11 @@ entities: parent: 1 - proto: StorageCanister entities: + - uid: 648 + components: + - type: Transform + pos: 2.5,7.5 + parent: 1 - uid: 702 components: - type: Transform @@ -5605,11 +5601,6 @@ entities: - type: Transform pos: 12.5,12.5 parent: 1 - - uid: 267 - components: - - type: Transform - pos: 12.5,11.5 - parent: 1 - uid: 268 components: - type: Transform @@ -6379,7 +6370,7 @@ entities: rot: -1.5707963267948966 rad pos: -9.5,8.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 679 components: diff --git a/Resources/Maps/_NF/Shuttles/piecrust.yml b/Resources/Maps/_NF/Shuttles/piecrust.yml index 30b55192195..6640c912816 100644 --- a/Resources/Maps/_NF/Shuttles/piecrust.yml +++ b/Resources/Maps/_NF/Shuttles/piecrust.yml @@ -291,30 +291,30 @@ entities: 0: 32768 0,-1: 0: 30464 - 3: 6 + 1: 6 -1,1: 0: 46 - 1: 26112 + 2: 26112 -1,2: - 2: 129 - 3: 96 + 3: 129 + 1: 96 0,0: 0: 63359 0,1: 0: 65287 0,2: 0: 7 - 2: 128 + 3: 128 1,0: 0: 30583 1,1: 0: 30503 1,2: - 3: 48 - 2: 8 + 1: 48 + 3: 8 1,-1: 0: 30576 - 2: 8 + 3: 8 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -332,10 +332,8 @@ entities: - 0 - 0 - volume: 2500 - temperature: 235 + immutable: True moles: - - 21.824879 - - 82.10312 - 0 - 0 - 0 @@ -346,11 +344,13 @@ entities: - 0 - 0 - 0 - - volume: 2500 - temperature: 293.15 - moles: - 0 - 0 + - volume: 2500 + temperature: 235 + moles: + - 21.824879 + - 82.10312 - 0 - 0 - 0 @@ -362,7 +362,7 @@ entities: - 0 - 0 - volume: 2500 - immutable: True + temperature: 293.15 moles: - 0 - 0 @@ -1865,6 +1865,13 @@ entities: - type: Transform pos: 1.0368968,1.5472217 parent: 8756 +- proto: NFHolopadShip + entities: + - uid: 359 + components: + - type: Transform + pos: 2.5,7.5 + parent: 8756 - proto: NitrogenCanister entities: - uid: 116 diff --git a/Resources/Maps/_NF/Shuttles/placebo.yml b/Resources/Maps/_NF/Shuttles/placebo.yml index bcb4b89c921..9b8c14d982a 100644 --- a/Resources/Maps/_NF/Shuttles/placebo.yml +++ b/Resources/Maps/_NF/Shuttles/placebo.yml @@ -212,7 +212,7 @@ entities: pos: -1.5,6.5 parent: 1 - type: Door - secondsUntilStateChange: -1460.9032 + secondsUntilStateChange: -1496.2726 state: Opening - proto: AirlockEngineering entities: @@ -229,7 +229,7 @@ entities: pos: -0.5,1.5 parent: 1 - type: Door - secondsUntilStateChange: -1770.7686 + secondsUntilStateChange: -1806.138 state: Opening - uid: 12 components: @@ -774,7 +774,7 @@ entities: pos: -2.5,4.5 parent: 1 - type: Door - secondsUntilStateChange: -756.28406 + secondsUntilStateChange: -791.65344 state: Closing - type: DeviceNetwork deviceLists: @@ -1419,6 +1419,13 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,1.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 274 + components: + - type: Transform + pos: 1.5,6.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 246 @@ -1468,10 +1475,6 @@ entities: - type: Transform pos: 3.5,1.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PowerCellRecharger entities: - uid: 137 @@ -2042,7 +2045,7 @@ entities: - type: Transform pos: -1.5,8.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 264 components: diff --git a/Resources/Maps/_NF/Shuttles/prospector.yml b/Resources/Maps/_NF/Shuttles/prospector.yml index f728b079784..0c14ea42819 100644 --- a/Resources/Maps/_NF/Shuttles/prospector.yml +++ b/Resources/Maps/_NF/Shuttles/prospector.yml @@ -1153,18 +1153,24 @@ entities: rot: 3.141592653589793 rad pos: 0.5,0.5 parent: 201 + - type: Fixtures + fixtures: {} - uid: 129 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,-3.5 parent: 201 + - type: Fixtures + fixtures: {} - uid: 130 components: - type: Transform rot: -1.5707963267948966 rad pos: -6.5,1.5 parent: 201 + - type: Fixtures + fixtures: {} - proto: LockerQuarterMasterFilled entities: - uid: 8 @@ -1194,6 +1200,13 @@ entities: - type: Transform pos: 1.6783751,-4.3457556 parent: 201 +- proto: NFHolopadShip + entities: + - uid: 164 + components: + - type: Transform + pos: 0.5,1.5 + parent: 201 - proto: NFSignDock entities: - uid: 151 @@ -1257,11 +1270,7 @@ entities: - type: Transform pos: 0.5,-6.5 parent: 201 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static -- proto: PottedPlantRandomPlastic +- proto: PottedPlantRandom entities: - uid: 167 components: @@ -1723,7 +1732,7 @@ entities: rot: 3.141592653589793 rad pos: -4.5,0.5 parent: 201 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 199 components: diff --git a/Resources/Maps/_NF/Shuttles/pts.yml b/Resources/Maps/_NF/Shuttles/pts.yml index 9b07da07086..0266386e3a7 100644 --- a/Resources/Maps/_NF/Shuttles/pts.yml +++ b/Resources/Maps/_NF/Shuttles/pts.yml @@ -591,19 +591,6 @@ entities: rot: 3.141592653589793 rad pos: -2.5,-1.5 parent: 2 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: CrateFreezer entities: - uid: 61 @@ -1117,6 +1104,13 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-4.5 parent: 2 +- proto: NFHolopadShip + entities: + - uid: 188 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 2 - proto: NitrogenCanister entities: - uid: 80 @@ -1156,10 +1150,6 @@ entities: - type: Transform pos: -0.5,-4.5 parent: 2 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PottedPlantRandom entities: - uid: 195 @@ -1537,7 +1527,7 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-5.5 parent: 2 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 164 components: diff --git a/Resources/Maps/_NF/Shuttles/searchlight.yml b/Resources/Maps/_NF/Shuttles/searchlight.yml index 2a979fbf9bb..43107b0f131 100644 --- a/Resources/Maps/_NF/Shuttles/searchlight.yml +++ b/Resources/Maps/_NF/Shuttles/searchlight.yml @@ -350,25 +350,25 @@ entities: 0: 275 0,-1: 0: 13079 - 2: 2048 + 1: 2048 -1,0: 0: 8 0,1: - 1: 16 + 2: 16 1,0: - 2: 13107 + 1: 13107 1,-1: - 2: 14080 + 1: 14080 0: 3 1,1: - 2: 4371 + 1: 4371 -1,-3: 0: 60552 - 2: 2 + 1: 2 -1,-2: 0: 52974 -1,-1: - 2: 1 + 1: 1 0: 34828 -1,-4: 0: 32768 @@ -376,13 +376,13 @@ entities: 0: 4096 0,-3: 0: 29459 - 2: 8 + 1: 8 3: 34816 0,-2: 0: 32755 1,-3: 3: 4096 - 2: 16384 + 1: 16384 1,-2: 0: 13104 uniqueMixes: @@ -402,7 +402,7 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.15 + immutable: True moles: - 0 - 0 @@ -417,7 +417,7 @@ entities: - 0 - 0 - volume: 2500 - immutable: True + temperature: 293.15 moles: - 0 - 0 @@ -1138,19 +1138,6 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,-11.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: DefibrillatorCabinetFilled entities: - uid: 221 @@ -1696,7 +1683,7 @@ entities: - uid: 134 components: - type: Transform - pos: 1.5,-1.5 + pos: -1.5,-7.5 parent: 1 - proto: HandheldHealthAnalyzer entities: @@ -1707,10 +1694,10 @@ entities: parent: 1 - proto: LockerEngineerFilled entities: - - uid: 106 + - uid: 214 components: - type: Transform - pos: -1.5,-7.5 + pos: 1.5,-9.5 parent: 1 - proto: LockerWallMaterialsFuelPlasmaFilled entities: @@ -1754,6 +1741,13 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-9.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 106 + components: + - type: Transform + pos: 1.5,-1.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 102 @@ -1795,17 +1789,6 @@ entities: - type: Transform pos: -2.5,-7.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static -- proto: PottedPlantRandom - entities: - - uid: 214 - components: - - type: Transform - pos: 1.5,-9.5 - parent: 1 - proto: PowerCellRecharger entities: - uid: 131 @@ -2483,7 +2466,7 @@ entities: rot: 3.141592653589793 rad pos: -3.5,-6.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 133 components: diff --git a/Resources/Maps/_NF/Shuttles/skipper.yml b/Resources/Maps/_NF/Shuttles/skipper.yml index 2945c51c5ee..4033bc8bbc0 100644 --- a/Resources/Maps/_NF/Shuttles/skipper.yml +++ b/Resources/Maps/_NF/Shuttles/skipper.yml @@ -1273,17 +1273,6 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,-1.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: ItemSlots - proto: CrateNPCCow entities: - uid: 267 @@ -2142,6 +2131,13 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,6.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 428 + components: + - type: Transform + pos: -4.5,3.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 400 @@ -2194,7 +2190,6 @@ entities: parent: 1 - type: FuelGenerator targetPower: 10000 - on: False - uid: 149 components: - type: Transform @@ -2202,7 +2197,6 @@ entities: parent: 1 - type: FuelGenerator targetPower: 10000 - on: False - proto: Poweredlight entities: - uid: 244 @@ -2343,20 +2337,6 @@ entities: - type: Transform pos: -6.5,2.5 parent: 1 - - type: ContainerContainer - containers: - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - blueprint: !type:Container - showEnts: False - occludes: True - ents: [] - proto: ShelfKitchen entities: - uid: 37 @@ -3146,7 +3126,7 @@ entities: rot: 3.141592653589793 rad pos: -3.5,4.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 363 components: diff --git a/Resources/Maps/_NF/Shuttles/sparrow.yml b/Resources/Maps/_NF/Shuttles/sparrow.yml index d93cc0fa35a..375feadffba 100644 --- a/Resources/Maps/_NF/Shuttles/sparrow.yml +++ b/Resources/Maps/_NF/Shuttles/sparrow.yml @@ -756,6 +756,11 @@ entities: - type: Transform pos: 4.5,1.5 parent: 174 + - uid: 336 + components: + - type: Transform + pos: -4.5,-2.5 + parent: 174 - proto: CableHV entities: - uid: 92 @@ -1062,6 +1067,14 @@ entities: - type: Transform pos: 3.6195195,1.6693814 parent: 174 +- proto: GasMiningDrill + entities: + - uid: 338 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-0.5 + parent: 174 - proto: GasMixerOnFlipped entities: - uid: 20 @@ -1705,8 +1718,7 @@ entities: - uid: 182 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,7.5 + pos: -3.5,-3.5 parent: 174 - proto: IntercomScience entities: @@ -1715,12 +1727,16 @@ entities: - type: Transform pos: 1.5,8.5 parent: 174 + - type: Fixtures + fixtures: {} - uid: 285 components: - type: Transform rot: 3.141592653589793 rad pos: -4.5,-2.5 parent: 174 + - type: Fixtures + fixtures: {} - proto: LockerResearchDirectorFilled entities: - uid: 253 @@ -1758,6 +1774,13 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,2.5 parent: 174 +- proto: NFHolopadShip + entities: + - uid: 167 + components: + - type: Transform + pos: 1.5,7.5 + parent: 174 - proto: NitrogenCanister entities: - uid: 269 @@ -1793,19 +1816,11 @@ entities: - type: Transform pos: 5.5,-1.5 parent: 174 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - uid: 293 components: - type: Transform pos: 4.5,-1.5 parent: 174 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PowerCellRecharger entities: - uid: 244 @@ -2462,7 +2477,7 @@ entities: - type: Transform pos: 6.5,2.5 parent: 174 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 319 components: diff --git a/Resources/Maps/_NF/Shuttles/spectre.yml b/Resources/Maps/_NF/Shuttles/spectre.yml index bb485f8a521..a2ea8931bdf 100644 --- a/Resources/Maps/_NF/Shuttles/spectre.yml +++ b/Resources/Maps/_NF/Shuttles/spectre.yml @@ -5983,6 +5983,13 @@ entities: rot: -1.5707963267948966 rad pos: -4.5,-3.5 parent: 3 +- proto: NFHolopadShip + entities: + - uid: 910 + components: + - type: Transform + pos: -0.5,25.5 + parent: 3 - proto: NitrogenCanister entities: - uid: 492 @@ -6258,7 +6265,7 @@ entities: - type: Transform pos: 11.5,0.5 parent: 3 -- proto: PoweredlightColoredRed +- proto: PoweredlightRed entities: - uid: 151 components: @@ -6641,13 +6648,6 @@ entities: - type: Transform pos: -6.5,9.5 parent: 3 -- proto: ScienceTechFab - entities: - - uid: 646 - components: - - type: Transform - pos: 5.5,-3.5 - parent: 3 - proto: SignalButton entities: - uid: 762 @@ -7261,6 +7261,13 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-9.5 parent: 3 +- proto: UnfinishedMachineFrame + entities: + - uid: 646 + components: + - type: Transform + pos: 5.5,-3.5 + parent: 3 - proto: VendingMachineBooze entities: - uid: 552 diff --git a/Resources/Maps/_NF/Shuttles/spirit.yml b/Resources/Maps/_NF/Shuttles/spirit.yml index 112b0d4601e..fa3c365a72a 100644 --- a/Resources/Maps/_NF/Shuttles/spirit.yml +++ b/Resources/Maps/_NF/Shuttles/spirit.yml @@ -493,17 +493,6 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-3.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: ItemSlots - proto: DefibrillatorCabinetFilled entities: - uid: 87 @@ -813,20 +802,13 @@ entities: - type: Transform pos: 2.5,1.5 parent: 1 - - type: ContainerContainer - containers: - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - blueprint: !type:Container - showEnts: False - occludes: True - ents: [] +- proto: NFHolopadShip + entities: + - uid: 144 + components: + - type: Transform + pos: 1.5,0.5 + parent: 1 - proto: NFPosterContrabandFsbSpirit entities: - uid: 89 @@ -1217,7 +1199,7 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,-4.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 106 components: diff --git a/Resources/Maps/_NF/Shuttles/stasis.yml b/Resources/Maps/_NF/Shuttles/stasis.yml index bcfb97388ce..9915de4ecc5 100644 --- a/Resources/Maps/_NF/Shuttles/stasis.yml +++ b/Resources/Maps/_NF/Shuttles/stasis.yml @@ -828,7 +828,8 @@ entities: 6,-1: 0: 4096 5,1: - 1: 29559 + 1: 29495 + 2: 64 5,2: 1: 1906 0: 32768 @@ -863,6 +864,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14996 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -1991,6 +2007,24 @@ entities: parent: 1 - type: Physics bodyType: Static + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 445 components: - type: Transform @@ -3534,10 +3568,10 @@ entities: parent: 1 - proto: LockerChiefMedicalOfficerFilledHardsuit entities: - - uid: 351 + - uid: 578 components: - type: Transform - pos: 20.5,7.5 + pos: 18.5,-0.5 parent: 1 - proto: LockerMedicineFilled entities: @@ -3656,6 +3690,13 @@ entities: - type: Transform pos: 20.5,-3.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 351 + components: + - type: Transform + pos: 20.5,7.5 + parent: 1 - proto: NFPosterContrabandEmsCoords entities: - uid: 287 @@ -5192,7 +5233,7 @@ entities: rot: 3.141592653589793 rad pos: 23.5,-9.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 82 components: diff --git a/Resources/Maps/_NF/Shuttles/stellaris.yml b/Resources/Maps/_NF/Shuttles/stellaris.yml index 63e934dedd2..283120c3801 100644 --- a/Resources/Maps/_NF/Shuttles/stellaris.yml +++ b/Resources/Maps/_NF/Shuttles/stellaris.yml @@ -654,7 +654,6 @@ entities: parent: 1 - type: Physics canCollide: False - bodyType: Static - type: Fixtures fixtures: {} - proto: BenchSofaCorpLeft @@ -665,8 +664,6 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,7.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaCorpRight entities: - uid: 249 @@ -674,8 +671,6 @@ entities: - type: Transform pos: 1.5,8.5 parent: 1 - - type: Physics - bodyType: Static - proto: BikeHorn entities: - uid: 442 @@ -1568,56 +1563,17 @@ entities: - type: Transform pos: 7.5,-0.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - uid: 239 components: - type: Transform pos: -6.5,-0.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - uid: 241 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,-4.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: CrateFreezer entities: - uid: 209 @@ -2944,6 +2900,13 @@ entities: rot: 1.5707963267948966 rad pos: 0.3989902,0.9814253 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 217 + components: + - type: Transform + pos: 0.5,11.5 + parent: 1 - proto: OilJarCorn entities: - uid: 219 @@ -2973,19 +2936,11 @@ entities: - type: Transform pos: -3.5,-7.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - uid: 447 components: - type: Transform pos: -3.5,-8.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PottedPlantRandom entities: - uid: 626 @@ -3470,10 +3425,10 @@ entities: parent: 1 - proto: SpacemenFigureSpawner entities: - - uid: 409 + - uid: 218 components: - type: Transform - pos: 0.5,11.5 + pos: 2.5,12.5 parent: 1 - proto: SpawnPointLatejoin entities: @@ -3609,11 +3564,6 @@ entities: - type: Transform pos: 0.5,12.5 parent: 1 - - uid: 380 - components: - - type: Transform - pos: 0.5,11.5 - parent: 1 - uid: 385 components: - type: Transform @@ -4372,7 +4322,7 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,13.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 410 components: diff --git a/Resources/Maps/_NF/Shuttles/tyne.yml b/Resources/Maps/_NF/Shuttles/tyne.yml index 78688103579..0072892f2f1 100644 --- a/Resources/Maps/_NF/Shuttles/tyne.yml +++ b/Resources/Maps/_NF/Shuttles/tyne.yml @@ -19,11 +19,11 @@ entities: components: - type: MetaData name: grid - - type: BecomesStation - id: Tyne - type: Transform pos: -0.5,-0.5 parent: invalid + - type: BecomesStation + id: Tyne - type: MapGrid chunks: 0,0: @@ -1436,6 +1436,13 @@ entities: - type: Transform pos: -0.3407581,-2.3656425 parent: 2 +- proto: NFHolopadShip + entities: + - uid: 201 + components: + - type: Transform + pos: -0.5,4.5 + parent: 2 - proto: NFPosterContrabandEmsCoords entities: - uid: 8 diff --git a/Resources/Maps/_NF/Shuttles/vagabond.yml b/Resources/Maps/_NF/Shuttles/vagabond.yml index 657e1ae2bf0..7c005f531a2 100644 --- a/Resources/Maps/_NF/Shuttles/vagabond.yml +++ b/Resources/Maps/_NF/Shuttles/vagabond.yml @@ -925,8 +925,6 @@ entities: rot: 3.141592653589793 rad pos: -1.5,6.5 parent: 1 - - type: Apc - hasAccess: True - uid: 164 components: - type: MetaData @@ -1280,7 +1278,6 @@ entities: parent: 1 - type: Physics canCollide: False - bodyType: Static - type: Fixtures fixtures: {} - proto: BenchSofaLeft @@ -1291,8 +1288,6 @@ entities: rot: 1.5707963267948966 rad pos: -11.5,1.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaMiddle entities: - uid: 227 @@ -1301,8 +1296,6 @@ entities: rot: 1.5707963267948966 rad pos: -11.5,0.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaRight entities: - uid: 656 @@ -1311,8 +1304,6 @@ entities: rot: 3.141592653589793 rad pos: -10.5,-0.5 parent: 1 - - type: Physics - bodyType: Static - proto: BlastDoor entities: - uid: 176 @@ -4339,6 +4330,13 @@ entities: - type: Transform pos: -10.5,0.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 823 + components: + - type: Transform + pos: -4.5,17.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 795 @@ -4446,19 +4444,11 @@ entities: - type: Transform pos: 0.5,10.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - uid: 571 components: - type: Transform pos: 1.5,10.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PosterContrabandHighEffectEngineering entities: - uid: 695 @@ -4511,7 +4501,7 @@ entities: rot: 3.141592653589793 rad pos: -9.5,-0.5 parent: 1 -- proto: PoweredlightColoredFrostyBlue +- proto: PoweredlightCyan entities: - uid: 678 components: @@ -4519,7 +4509,21 @@ entities: rot: 3.141592653589793 rad pos: -5.5,17.5 parent: 1 -- proto: PoweredlightColoredRed +- proto: PoweredlightLED + entities: + - uid: 677 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,18.5 + parent: 1 + - uid: 684 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,6.5 + parent: 1 +- proto: PoweredlightRed entities: - uid: 680 components: @@ -4556,20 +4560,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-9.5 parent: 1 -- proto: PoweredlightLED - entities: - - uid: 677 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,18.5 - parent: 1 - - uid: 684 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,6.5 - parent: 1 - proto: PoweredlightSodium entities: - uid: 676 @@ -6041,7 +6031,7 @@ entities: - type: Transform pos: -4.5,16.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 713 components: