From a53c1071999bc7277deb57f28a944acee79dc3bc Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Fri, 19 Jul 2024 02:18:05 +0300 Subject: [PATCH] Shuttle clean up follow up (#1684) * entities removal * revert changes * remove RandonSpawner and RandomSpawner100 * removed job spawners (except nfsd and pirates) * replased filled gun safes with empty ones * removed food items * removed kitchen machines * removed medkits, replaced filled medlockers with empty, replaced medbeds with beds * no chemistry * no kitchen machines for nfsd * removed smile the slime from wasp * fixed ambition erroring out --- .../Maps/_NF/Shuttles/BlackMarket/falcon.yml | 14 - .../_NF/Shuttles/BlackMarket/schooner.yml | 7 - .../Maps/_NF/Shuttles/Expedition/ambition.yml | 143 +--- .../Maps/_NF/Shuttles/Expedition/anchor.yml | 143 +--- .../Maps/_NF/Shuttles/Expedition/brigand.yml | 2 +- .../Maps/_NF/Shuttles/Expedition/courserx.yml | 80 +- .../Maps/_NF/Shuttles/Expedition/dartx.yml | 110 +-- .../_NF/Shuttles/Expedition/decadedove.yml | 2 +- .../_NF/Shuttles/Expedition/dragonfly.yml | 194 +---- .../_NF/Shuttles/Expedition/gasbender.yml | 12 - .../Maps/_NF/Shuttles/Expedition/praeda.yml | 119 +-- .../_NF/Shuttles/Expedition/rosebudmkii.yml | 85 +-- .../Maps/_NF/Shuttles/Expedition/sprinter.yml | 162 +--- Resources/Maps/_NF/Shuttles/Nfsd/empress.yml | 14 +- Resources/Maps/_NF/Shuttles/Nfsd/marauder.yml | 14 - .../Maps/_NF/Shuttles/Nfsd/opportunity.yml | 30 - Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml | 7 - Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml | 38 - Resources/Maps/_NF/Shuttles/Nfsd/whiskey.yml | 43 -- Resources/Maps/_NF/Shuttles/Scrap/bison.yml | 715 +----------------- .../Maps/_NF/Shuttles/Scrap/canister.yml | 7 - .../Maps/_NF/Shuttles/Scrap/disciple.yml | 31 - Resources/Maps/_NF/Shuttles/Scrap/nugget.yml | 78 -- Resources/Maps/_NF/Shuttles/Scrap/orange.yml | 36 - Resources/Maps/_NF/Shuttles/Scrap/point.yml | 25 - Resources/Maps/_NF/Shuttles/Scrap/tide.yml | 32 - .../_NF/Shuttles/Syndicate/infiltrator.yml | 29 - Resources/Maps/_NF/Shuttles/barge.yml | 35 - Resources/Maps/_NF/Shuttles/bocadillo.yml | 14 - Resources/Maps/_NF/Shuttles/caduceus.yml | 53 -- Resources/Maps/_NF/Shuttles/camper.yml | 7 - Resources/Maps/_NF/Shuttles/chisel.yml | 22 - Resources/Maps/_NF/Shuttles/cleithro.yml | 55 -- Resources/Maps/_NF/Shuttles/comet.yml | 28 - Resources/Maps/_NF/Shuttles/condor.yml | 35 - Resources/Maps/_NF/Shuttles/crescent.yml | 147 +--- Resources/Maps/_NF/Shuttles/esquire.yml | 83 -- Resources/Maps/_NF/Shuttles/garden.yml | 21 - Resources/Maps/_NF/Shuttles/hauler.yml | 97 +-- Resources/Maps/_NF/Shuttles/honker.yml | 7 - Resources/Maps/_NF/Shuttles/investigator.yml | 40 - Resources/Maps/_NF/Shuttles/knuckleverse.yml | 79 +- Resources/Maps/_NF/Shuttles/lantern.yml | 29 - Resources/Maps/_NF/Shuttles/mccargo.yml | 70 -- Resources/Maps/_NF/Shuttles/metastable.yml | 85 +-- Resources/Maps/_NF/Shuttles/mission.yml | 28 - Resources/Maps/_NF/Shuttles/phoenix.yml | 77 -- Resources/Maps/_NF/Shuttles/piecrust.yml | 14 - Resources/Maps/_NF/Shuttles/placebo.yml | 7 - Resources/Maps/_NF/Shuttles/prospector.yml | 7 - Resources/Maps/_NF/Shuttles/pts.yml | 14 - Resources/Maps/_NF/Shuttles/pulse.yml | 14 - Resources/Maps/_NF/Shuttles/rosebudmki.yml | 76 +- Resources/Maps/_NF/Shuttles/skipper.yml | 14 - Resources/Maps/_NF/Shuttles/sparrow.yml | 14 - Resources/Maps/_NF/Shuttles/spectre.yml | 138 ---- Resources/Maps/_NF/Shuttles/stellaris.yml | 35 - Resources/Maps/_NF/Shuttles/stratos.yml | 49 -- Resources/Maps/_NF/Shuttles/vagabond.yml | 52 +- Resources/Maps/_NF/Shuttles/waveshot.yml | 21 - 60 files changed, 59 insertions(+), 3580 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml index 2c8dc1ade76..9c1ef38deb5 100644 --- a/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml +++ b/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml @@ -1817,13 +1817,6 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,-13.5 parent: 3 -- proto: DonkpocketBoxSpawner - entities: - - uid: 226 - components: - - type: Transform - pos: 6.5,-7.5 - parent: 3 - proto: DresserFilled entities: - uid: 234 @@ -1954,13 +1947,6 @@ entities: - type: Transform pos: 5.5,-13.5 parent: 3 -- proto: FoodBurgerCarp - entities: - - uid: 189 - components: - - type: Transform - pos: 3.4787748,-7.3710117 - parent: 3 - proto: GasPassiveVent entities: - uid: 448 diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml index e8c142d918a..441b5408fad 100644 --- a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml +++ b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml @@ -2618,13 +2618,6 @@ entities: - type: Transform pos: -1.5,-5.5 parent: 1 -- proto: RandomSpawner - entities: - - uid: 336 - components: - - type: Transform - pos: 3.5,-0.5 - parent: 1 - proto: RemoteSignaller entities: - uid: 505 diff --git a/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml b/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml index 65251c301bc..a684ea6b773 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml @@ -27,7 +27,7 @@ entities: name: grid - type: Transform pos: -0.48525238,-0.53687286 - parent: 76 + parent: invalid - type: MapGrid chunks: 0,0: @@ -1403,19 +1403,6 @@ entities: chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance - - uid: 76 - components: - - type: MetaData - name: map 22 - - type: Transform - - type: Map - mapPaused: True - - type: PhysicsMap - - type: GridTree - - type: MovedGrids - - type: Broadphase - - type: OccluderTree - - type: LoadedMap - proto: AirAlarm entities: - uid: 26 @@ -7142,8 +7129,8 @@ entities: immutable: False temperature: 293.14923 moles: - - 1.7459903 - - 6.568249 + - 1.8856695 + - 7.0937095 - 0 - 0 - 0 @@ -8536,29 +8523,6 @@ entities: - type: Transform pos: -5.7878275,-6.035136 parent: 1 -- proto: FoodBoxDonkpocketStonk - entities: - - uid: 2104 - components: - - type: Transform - pos: 4.5,-9.5 - parent: 1 -- proto: FoodBurgerMcguffin - entities: - - uid: 1393 - components: - - type: Transform - parent: 1392 - - type: Physics - canCollide: False -- proto: FoodMealFries - entities: - - uid: 1401 - components: - - type: Transform - parent: 1392 - - type: Physics - canCollide: False - proto: FoodTinBeansTrash entities: - uid: 2402 @@ -12315,45 +12279,16 @@ entities: - type: Transform pos: -7.5,-20.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 898 components: - type: Transform pos: -7.5,-21.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 899 components: - type: Transform pos: 8.5,-20.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 -- proto: HappyHonk - entities: - - uid: 1392 - components: - - type: Transform - pos: 5.2539597,-11.388922 - parent: 1 - - type: Storage - storedItems: - 1393: - position: 0,0 - _rotation: South - 1401: - position: 1,0 - _rotation: East - - type: ContainerContainer - containers: - storagebase: !type:Container - showEnts: False - occludes: True - ents: - - 1393 - - 1401 - proto: HolofanProjector entities: - uid: 2445 @@ -12373,13 +12308,6 @@ entities: - type: Transform pos: 6.3805237,5.4662657 parent: 1 -- proto: KitchenMicrowave - entities: - - uid: 2089 - components: - - type: Transform - pos: 3.5,-9.5 - parent: 1 - proto: LightReplacer entities: - uid: 2235 @@ -14541,13 +14469,6 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,24.5 parent: 1 -- proto: SpoonPlastic - entities: - - uid: 2470 - components: - - type: Transform - pos: 4.0995703,-9.465618 - parent: 1 - proto: StairDark entities: - uid: 949 @@ -14957,229 +14878,171 @@ entities: - type: Transform pos: -6.5,-17.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 340 components: - type: Transform pos: -5.5,-17.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 341 components: - type: Transform pos: 6.5,-17.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 342 components: - type: Transform pos: 7.5,-17.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 343 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,-23.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 344 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,-23.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 345 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,-24.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 346 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-24.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 348 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-24.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 349 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,-24.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 350 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,-22.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 351 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,-21.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 352 components: - type: Transform rot: -1.5707963267948966 rad pos: 3.5,-21.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 353 components: - type: Transform rot: -1.5707963267948966 rad pos: 3.5,-22.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 354 components: - type: Transform rot: 3.141592653589793 rad pos: -5.5,-23.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 355 components: - type: Transform rot: 3.141592653589793 rad pos: -6.5,-23.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 356 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,-13.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 357 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,-12.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 358 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,-10.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 359 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,-9.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 360 components: - type: Transform rot: 3.141592653589793 rad pos: -10.5,-7.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 361 components: - type: Transform rot: 3.141592653589793 rad pos: -9.5,-7.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 362 components: - type: Transform rot: 3.141592653589793 rad pos: 10.5,-7.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 363 components: - type: Transform rot: 3.141592653589793 rad pos: 11.5,-7.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 364 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,-9.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 365 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,-10.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 366 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,-12.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 367 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,-13.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 2467 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,-24.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - proto: TintedWindow entities: - uid: 2279 diff --git a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml index 1633bf44778..4c3473a861a 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml @@ -1367,7 +1367,7 @@ entities: - type: Transform pos: -4.5,-22.5 parent: 1 -- proto: BedsheetMedical +- proto: BedsheetSpawner entities: - uid: 68 components: @@ -4250,7 +4250,7 @@ entities: rot: 3.141592653589793 rad pos: -18.5,-20.5 parent: 1 -- proto: chem_master +- proto: MachineFrame entities: - uid: 620 components: @@ -7291,7 +7291,7 @@ entities: rot: 1.5707963267948966 rad pos: 5.5,-12.5 parent: 1 -- proto: GunSafeShuttleT3Spawner +- proto: GunSafeShuttleCaptain entities: - uid: 639 components: @@ -7396,20 +7396,6 @@ entities: rot: -1.5707963267948966 rad pos: 18.5,-15.5 parent: 1 -- proto: KitchenMicrowave - entities: - - uid: 1088 - components: - - type: Transform - pos: 2.5,-5.5 - parent: 1 -- proto: KitchenReagentGrinder - entities: - - uid: 1089 - components: - - type: Transform - pos: 2.5,-6.5 - parent: 1 - proto: LampGold entities: - uid: 1090 @@ -7549,7 +7535,7 @@ entities: - 0 - 0 - 0 -- proto: LockerWallMedicalDoctorFilled +- proto: LockerWallMedical entities: - uid: 1096 components: @@ -7557,7 +7543,7 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,-16.5 parent: 1 -- proto: MedicalBed +- proto: Bed entities: - uid: 1097 components: @@ -7569,48 +7555,6 @@ entities: - type: Transform pos: 17.5,-17.5 parent: 1 -- proto: MedkitBruteFilled - entities: - - uid: 1100 - components: - - type: Transform - pos: 15.407753,-21.300247 - parent: 1 -- proto: MedkitBurnFilled - entities: - - uid: 1101 - components: - - type: Transform - pos: 15.610878,-21.518997 - parent: 1 -- proto: MedkitFilled - entities: - - uid: 1102 - components: - - type: Transform - pos: 16.407753,-21.300247 - parent: 1 -- proto: MedkitOxygenFilled - entities: - - uid: 1103 - components: - - type: Transform - pos: 16.110878,-21.534622 - parent: 1 -- proto: MedkitRadiationFilled - entities: - - uid: 1104 - components: - - type: Transform - pos: 15.903946,-21.28169 - parent: 1 -- proto: MedkitToxinFilled - entities: - - uid: 1105 - components: - - type: Transform - pos: 16.610878,-21.550247 - parent: 1 - proto: Mirror entities: - uid: 1106 @@ -8180,18 +8124,6 @@ entities: - type: Transform pos: -3.5,-13.5 parent: 1 -- proto: RandomFoodSingle - entities: - - uid: 1184 - components: - - type: Transform - pos: 0.5,-17.5 - parent: 1 - - uid: 1185 - components: - - type: Transform - pos: 2.5,-12.5 - parent: 1 - proto: RandomInstruments entities: - uid: 1186 @@ -8688,41 +8620,6 @@ entities: - type: Transform pos: -5.5,-5.5 parent: 1 -- proto: SpawnPointAtmos - entities: - - uid: 1727 - components: - - type: Transform - pos: 7.5,-25.5 - parent: 1 -- proto: SpawnPointBartender - entities: - - uid: 1724 - components: - - type: Transform - pos: -3.5,-18.5 - parent: 1 -- proto: SpawnPointChaplain - entities: - - uid: 1271 - components: - - type: Transform - pos: 2.5,-22.5 - parent: 1 -- proto: SpawnPointChef - entities: - - uid: 1725 - components: - - type: Transform - pos: 2.5,-18.5 - parent: 1 -- proto: SpawnPointChiefEngineer - entities: - - uid: 1272 - components: - - type: Transform - pos: -3.5,-22.5 - parent: 1 - proto: SpawnPointLatejoin entities: - uid: 1273 @@ -8740,34 +8637,6 @@ entities: - type: Transform pos: 3.5,-27.5 parent: 1 -- proto: SpawnPointMedicalDoctor - entities: - - uid: 1276 - components: - - type: Transform - pos: 2.5,-26.5 - parent: 1 -- proto: SpawnPointMercenary - entities: - - uid: 1277 - components: - - type: Transform - pos: -4.5,-1.5 - parent: 1 -- proto: SpawnPointServiceWorker - entities: - - uid: 1278 - components: - - type: Transform - pos: -4.5,-6.5 - parent: 1 -- proto: SpawnPointStationEngineer - entities: - - uid: 1726 - components: - - type: Transform - pos: -6.5,-23.5 - parent: 1 - proto: SteelBench entities: - uid: 632 @@ -9485,7 +9354,7 @@ entities: - type: Transform pos: 18.5,-12.5 parent: 1 -- proto: VendingMachineWallMedical +- proto: LockerWallMedical entities: - uid: 1390 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml b/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml index b8cb97d9eb2..13c2cd14e2e 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml @@ -3572,7 +3572,7 @@ entities: - type: Transform pos: 3.5,7.5 parent: 1 -- proto: GunSafeShuttleT2Spawner +- proto: GunSafeShuttleCaptain entities: - uid: 238 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/courserx.yml b/Resources/Maps/_NF/Shuttles/Expedition/courserx.yml index 7d159f39286..33583079c12 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/courserx.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/courserx.yml @@ -866,7 +866,7 @@ entities: - type: Transform pos: 4.5,-10.5 parent: 1 -- proto: BedsheetMedical +- proto: BedsheetSpawner entities: - uid: 45 components: @@ -3618,7 +3618,7 @@ entities: rot: -1.5707963267948966 rad pos: -6.5,-4.5 parent: 1 -- proto: GunSafeShuttleT2Spawner +- proto: GunSafeShuttleCaptain entities: - uid: 330 components: @@ -3715,7 +3715,7 @@ entities: - 0 - 0 - 0 -- proto: LockerMedicalFilled +- proto: LockerMedical entities: - uid: 466 components: @@ -3804,41 +3804,13 @@ entities: - type: Transform pos: 1.5,-17.5 parent: 1 -- proto: MedicalBed +- proto: Bed entities: - uid: 469 components: - type: Transform pos: 1.5,-6.5 parent: 1 -- proto: MedkitAdvancedFilled - entities: - - uid: 470 - components: - - type: Transform - pos: 0.6290281,-4.389641 - parent: 1 -- proto: MedkitOxygenFilled - entities: - - uid: 471 - components: - - type: Transform - pos: 0.36398113,-4.595904 - parent: 1 -- proto: MedkitRadiationFilled - entities: - - uid: 472 - components: - - type: Transform - pos: -0.08593774,-4.5585074 - parent: 1 -- proto: MedkitToxinFilled - entities: - - uid: 473 - components: - - type: Transform - pos: 0.08593726,-4.3553824 - parent: 1 - proto: NitrogenCanister entities: - uid: 337 @@ -4090,27 +4062,6 @@ entities: - type: Transform pos: -4.5,7.5 parent: 1 -- proto: RandomFoodBakedSingle - entities: - - uid: 515 - components: - - type: Transform - pos: 3.5,4.5 - parent: 1 -- proto: RandomFoodMeal - entities: - - uid: 516 - components: - - type: Transform - pos: -3.5,-4.5 - parent: 1 -- proto: RandomFoodSingle - entities: - - uid: 517 - components: - - type: Transform - pos: -5.5,-1.5 - parent: 1 - proto: RandomInstruments entities: - uid: 518 @@ -4425,13 +4376,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-2.5 parent: 1 -- proto: SpawnPointBartender - entities: - - uid: 576 - components: - - type: Transform - pos: -0.5,-1.5 - parent: 1 - proto: SpawnPointLatejoin entities: - uid: 579 @@ -4439,20 +4383,6 @@ entities: - type: Transform pos: -0.5,1.5 parent: 1 -- proto: SpawnPointMercenary - entities: - - uid: 582 - components: - - type: Transform - pos: -0.5,5.5 - parent: 1 -- proto: SpawnPointParamedic - entities: - - uid: 583 - components: - - type: Transform - pos: -0.5,-5.5 - parent: 1 - proto: StoolBar entities: - uid: 584 @@ -4797,7 +4727,7 @@ entities: - type: Transform pos: 3.5,-12.5 parent: 1 -- proto: VendingMachineMedical +- proto: MachineFrame entities: - uid: 637 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/dartx.yml b/Resources/Maps/_NF/Shuttles/Expedition/dartx.yml index c48c2817df3..600f7f56ad0 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/dartx.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/dartx.yml @@ -1334,7 +1334,7 @@ entities: - type: Transform pos: -1.5,2.5 parent: 1 -- proto: BedsheetMedical +- proto: BedsheetSpawner entities: - uid: 764 components: @@ -2492,7 +2492,7 @@ entities: - type: Transform pos: 0.5,-16.5 parent: 1 -- proto: chem_master +- proto: MachineFrame entities: - uid: 261 components: @@ -3117,27 +3117,6 @@ entities: parent: 1 - type: Fixtures fixtures: {} -- proto: FoodBoxDonkpocketHonk - entities: - - uid: 633 - components: - - type: Transform - pos: -3.7600162,-15.218529 - parent: 1 -- proto: FoodCakeBirthday - entities: - - uid: 838 - components: - - type: Transform - pos: -2.512187,-12.508124 - parent: 1 -- proto: FoodPieBananaCream - entities: - - uid: 923 - components: - - type: Transform - pos: -2.630557,-9.925222 - parent: 1 - proto: GasAnalyzer entities: - uid: 761 @@ -4803,7 +4782,7 @@ entities: - type: Transform pos: 0.5,-18.5 parent: 1 -- proto: GunSafeShuttleT1Spawner +- proto: GunSafeShuttleCaptain entities: - uid: 170 components: @@ -4886,20 +4865,6 @@ entities: - type: Transform pos: 3.5,5.5 parent: 1 -- proto: KitchenMicrowave - entities: - - uid: 632 - components: - - type: Transform - pos: -4.5,-15.5 - parent: 1 -- proto: KitchenReagentGrinder - entities: - - uid: 238 - components: - - type: Transform - pos: -3.5,-3.5 - parent: 1 - proto: KnifePlastic entities: - uid: 837 @@ -5130,34 +5095,13 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: MedicalBed +- proto: Bed entities: - uid: 71 components: - type: Transform pos: -4.5,2.5 parent: 1 -- proto: MedkitAdvancedFilled - entities: - - uid: 634 - components: - - type: Transform - pos: -3.27885,2.696093 - parent: 1 -- proto: MedkitRadiationFilled - entities: - - uid: 773 - components: - - type: Transform - pos: -3.5835376,2.3914056 - parent: 1 -- proto: MedkitToxinFilled - entities: - - uid: 635 - components: - - type: Transform - pos: -3.3726,2.1570306 - parent: 1 - proto: Mirror entities: - uid: 233 @@ -5709,27 +5653,6 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,-4.5 parent: 1 -- proto: SpawnPointBartender - entities: - - uid: 802 - components: - - type: Transform - pos: -3.5,-11.5 - parent: 1 -- proto: SpawnPointCaptain - entities: - - uid: 803 - components: - - type: Transform - pos: -0.5,6.5 - parent: 1 -- proto: SpawnPointClown - entities: - - uid: 806 - components: - - type: Transform - pos: -0.5,-5.5 - parent: 1 - proto: SpawnPointLatejoin entities: - uid: 137 @@ -5738,27 +5661,6 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,2.5 parent: 1 -- proto: SpawnPointMercenary - entities: - - uid: 952 - components: - - type: Transform - pos: 2.5,-13.5 - parent: 1 -- proto: SpawnPointParamedic - entities: - - uid: 823 - components: - - type: Transform - pos: -4.5,1.5 - parent: 1 -- proto: SpawnPointStationEngineer - entities: - - uid: 807 - components: - - type: Transform - pos: -5.5,-18.5 - parent: 1 - proto: StoolBar entities: - uid: 849 @@ -6190,7 +6092,7 @@ entities: - type: Transform pos: -4.5,-10.5 parent: 1 -- proto: VendingMachineChemicals +- proto: MachineFrame entities: - uid: 638 components: @@ -6237,7 +6139,7 @@ entities: - type: Transform pos: 0.5,-5.5 parent: 1 -- proto: VendingMachineWallMedical +- proto: LockerWallMedical entities: - uid: 138 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/decadedove.yml b/Resources/Maps/_NF/Shuttles/Expedition/decadedove.yml index 86d089ff5c7..7eed7134d4e 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/decadedove.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/decadedove.yml @@ -4747,7 +4747,7 @@ entities: - type: Transform pos: -4.5,4.5 parent: 1 -- proto: LockerWallMedicalDoctorFilled +- proto: LockerWallMedical entities: - uid: 686 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/dragonfly.yml b/Resources/Maps/_NF/Shuttles/Expedition/dragonfly.yml index c7b98be2214..9253f7e33f2 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/dragonfly.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/dragonfly.yml @@ -2289,7 +2289,7 @@ entities: rot: 3.141592653589793 rad pos: 8.5,8.5 parent: 1 -- proto: chem_master +- proto: MachineFrame entities: - uid: 143 components: @@ -2512,27 +2512,6 @@ entities: - type: DeviceLinkSink links: - 787 -- proto: CrateChemistryD - entities: - - uid: 480 - components: - - type: Transform - pos: -7.5,-9.5 - parent: 1 -- proto: CrateChemistryP - entities: - - uid: 481 - components: - - type: Transform - pos: -7.5,-10.5 - parent: 1 -- proto: CrateChemistryS - entities: - - uid: 448 - components: - - type: Transform - pos: -7.5,-8.5 - parent: 1 - proto: CrateEmptySpawner entities: - uid: 669 @@ -2596,13 +2575,6 @@ entities: - type: Transform pos: 2.1275525,-6.444022 parent: 1 -- proto: DonkpocketBoxSpawner - entities: - - uid: 829 - components: - - type: Transform - pos: 3.5,2.5 - parent: 1 - proto: DrinkDoctorsDelightGlass entities: - uid: 531 @@ -2868,13 +2840,6 @@ entities: - type: Transform pos: 2.5,-12.5 parent: 1 -- proto: FoodBoxPizzaFilled - entities: - - uid: 857 - components: - - type: Transform - pos: -0.43316364,-0.30815744 - parent: 1 - proto: GasCanisterBrokenBase entities: - uid: 841 @@ -3883,7 +3848,7 @@ entities: rot: 3.141592653589793 rad pos: -10.5,-10.5 parent: 1 -- proto: GunSafeShuttleT1Spawner +- proto: GunSafeShuttleCaptain entities: - uid: 244 components: @@ -3967,20 +3932,6 @@ entities: - type: Transform pos: -9.347732,-10.388437 parent: 1 -- proto: KitchenMicrowave - entities: - - uid: 828 - components: - - type: Transform - pos: 3.5,1.5 - parent: 1 -- proto: KitchenReagentGrinder - entities: - - uid: 484 - components: - - type: Transform - pos: -9.5,-11.5 - parent: 1 - proto: KnifePlastic entities: - uid: 860 @@ -4628,110 +4579,6 @@ entities: - type: Transform pos: -0.5,3.5 parent: 1 -- proto: RandomSpawner - entities: - - uid: 716 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-10.5 - parent: 1 - - uid: 718 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-9.5 - parent: 1 - - uid: 719 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-7.5 - parent: 1 - - uid: 720 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -7.5,8.5 - parent: 1 - - uid: 721 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -7.5,5.5 - parent: 1 - - uid: 722 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,7.5 - parent: 1 - - uid: 723 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,8.5 - parent: 1 - - uid: 724 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,7.5 - parent: 1 - - uid: 862 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,2.5 - parent: 1 - - uid: 863 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,3.5 - parent: 1 - - uid: 876 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,1.5 - parent: 1 - - uid: 877 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,0.5 - parent: 1 - - uid: 878 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-2.5 - parent: 1 - - uid: 879 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-5.5 - parent: 1 - - uid: 880 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-11.5 - parent: 1 - - uid: 881 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,-9.5 - parent: 1 - - uid: 882 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -6.5,-7.5 - parent: 1 - proto: RemoteSignaller entities: - uid: 790 @@ -5323,20 +5170,6 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,3.5 parent: 1 -- proto: SpawnPointCargoTechnician - entities: - - uid: 662 - components: - - type: Transform - pos: 0.5,-6.5 - parent: 1 -- proto: SpawnPointChemist - entities: - - uid: 352 - components: - - type: Transform - pos: -8.5,-7.5 - parent: 1 - proto: SpawnPointLatejoin entities: - uid: 663 @@ -5344,27 +5177,6 @@ entities: - type: Transform pos: 0.5,0.5 parent: 1 -- proto: SpawnPointSalvageSpecialist - entities: - - uid: 703 - components: - - type: Transform - pos: 0.5,7.5 - parent: 1 -- proto: SpawnPointServiceWorker - entities: - - uid: 702 - components: - - type: Transform - pos: 0.5,0.5 - parent: 1 -- proto: SpawnPointStationEngineer - entities: - - uid: 664 - components: - - type: Transform - pos: 9.5,-7.5 - parent: 1 - proto: StoolBar entities: - uid: 466 @@ -5808,7 +5620,7 @@ entities: - type: Transform pos: -6.5,6.5 parent: 1 -- proto: VendingMachineChemicals +- proto: MachineFrame entities: - uid: 236 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml b/Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml index 761eb298033..76102a7605a 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml @@ -5872,18 +5872,6 @@ entities: - type: Transform pos: -0.5,-4.5 parent: 1 -- proto: RandomFoodMeal - entities: - - uid: 848 - components: - - type: Transform - pos: 2.5,9.5 - parent: 1 - - uid: 849 - components: - - type: Transform - pos: 0.5,9.5 - parent: 1 - proto: RandomPainting entities: - uid: 555 diff --git a/Resources/Maps/_NF/Shuttles/Expedition/praeda.yml b/Resources/Maps/_NF/Shuttles/Expedition/praeda.yml index 1fdfdd4a91a..20292800fb8 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/praeda.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/praeda.yml @@ -2274,7 +2274,7 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: BedsheetMedical +- proto: BedsheetSpawner entities: - uid: 175 components: @@ -6456,7 +6456,7 @@ entities: rot: 3.141592653589793 rad pos: -0.5,-22.5 parent: 1 -- proto: chem_master +- proto: MachineFrame entities: - uid: 1018 components: @@ -8662,29 +8662,6 @@ entities: parent: 1 - type: Fixtures fixtures: {} -- proto: FoodBoxDonkpocketHonk - entities: - - uid: 1349 - components: - - type: Transform - pos: 1.5919714,-14.375789 - parent: 1 -- proto: FoodBurgerBacon - entities: - - uid: 1350 - components: - - type: MetaData - name: Steve's Burger Fort (1/2) - - type: Transform - pos: 2.2029314,-21.799337 - parent: 1 - - uid: 1351 - components: - - type: MetaData - name: Steve's Burger Fort (2/2) - - type: Transform - pos: 2.713731,-21.771542 - parent: 1 - proto: GasMixer entities: - uid: 1352 @@ -11517,20 +11494,6 @@ entities: - type: Transform pos: 2.6105907,-21.391254 parent: 1 -- proto: KitchenMicrowave - entities: - - uid: 220 - components: - - type: Transform - pos: 1.5,-12.5 - parent: 1 -- proto: KitchenReagentGrinder - entities: - - uid: 1726 - components: - - type: Transform - pos: 7.5,-13.5 - parent: 1 - proto: LampGold entities: - uid: 211 @@ -11760,7 +11723,7 @@ entities: - 0 - 0 - 0 -- proto: LockerWallMedicalDoctorFilled +- proto: LockerWallMedical entities: - uid: 222 components: @@ -11768,7 +11731,7 @@ entities: rot: 1.5707963267948966 rad pos: -6.5,-14.5 parent: 1 -- proto: LockerWallMedicalFilled +- proto: LockerWallMedical entities: - uid: 1741 components: @@ -11832,7 +11795,7 @@ entities: - type: Transform pos: -9.5,-32.5 parent: 1 -- proto: MedicalBed +- proto: Bed entities: - uid: 1747 components: @@ -11844,13 +11807,6 @@ entities: - type: Transform pos: -5.5,-16.5 parent: 1 -- proto: MedkitFilled - entities: - - uid: 1749 - components: - - type: Transform - pos: -6.6608167,-13.206823 - parent: 1 - proto: MopBucketFull entities: - uid: 1750 @@ -13723,34 +13679,6 @@ entities: - type: Transform pos: 1.5183704,-17.432232 parent: 1 -- proto: SpawnPointBartender - entities: - - uid: 2029 - components: - - type: Transform - pos: -3.5,-28.5 - parent: 1 -- proto: SpawnPointCargoTechnician - entities: - - uid: 2030 - components: - - type: Transform - pos: 6.5,-9.5 - parent: 1 -- proto: SpawnPointChiefEngineer - entities: - - uid: 2031 - components: - - type: Transform - pos: -0.5,-27.5 - parent: 1 -- proto: SpawnPointJanitor - entities: - - uid: 508 - components: - - type: Transform - pos: -8.5,-31.5 - parent: 1 - proto: SpawnPointLatejoin entities: - uid: 2033 @@ -13768,39 +13696,6 @@ entities: - type: Transform pos: -3.5,-30.5 parent: 1 -- proto: SpawnPointMercenary - entities: - - uid: 216 - components: - - type: Transform - pos: -3.5,-27.5 - parent: 1 -- proto: SpawnPointQuartermaster - entities: - - uid: 2037 - components: - - type: Transform - pos: 2.5,1.5 - parent: 1 -- proto: SpawnPointSalvageSpecialist - entities: - - uid: 2039 - components: - - type: Transform - pos: -3.5,-27.5 - parent: 1 -- proto: SpawnPointStationEngineer - entities: - - uid: 2041 - components: - - type: Transform - pos: -3.5,-31.5 - parent: 1 - - uid: 2042 - components: - - type: Transform - pos: -3.5,-30.5 - parent: 1 - proto: StoolBar entities: - uid: 2044 @@ -14755,7 +14650,7 @@ entities: - type: Transform pos: -1.5,-2.5 parent: 1 -- proto: VendingMachineChemicals +- proto: MachineFrame entities: - uid: 2147 components: @@ -14778,7 +14673,7 @@ entities: - type: Transform pos: 4.5,-34.5 parent: 1 -- proto: VendingMachineMedical +- proto: MachineFrame entities: - uid: 2151 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/rosebudmkii.yml b/Resources/Maps/_NF/Shuttles/Expedition/rosebudmkii.yml index a727d29e234..a8ed5f2dc1a 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/rosebudmkii.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/rosebudmkii.yml @@ -2272,7 +2272,7 @@ entities: rot: -1.5707963267948966 rad pos: -10.5,2.5 parent: 1 -- proto: BedsheetMedical +- proto: BedsheetSpawner entities: - uid: 190 components: @@ -4767,7 +4767,7 @@ entities: rot: 1.5707963267948966 rad pos: 6.483588,2.141698 parent: 1 -- proto: chem_master +- proto: MachineFrame entities: - uid: 26 components: @@ -5419,13 +5419,6 @@ entities: - type: DeviceLinkSink links: - 154 -- proto: CrateChemistrySupplies - entities: - - uid: 436 - components: - - type: Transform - pos: -8.5,7.5 - parent: 1 - proto: DefibrillatorCabinetFilled entities: - uid: 793 @@ -6055,23 +6048,6 @@ entities: parent: 1 - type: Fixtures fixtures: {} -- proto: FoodBakedCookie - entities: - - uid: 161 - components: - - type: Transform - pos: 6.3913617,2.0044975 - parent: 1 - - uid: 609 - components: - - type: Transform - pos: 6.6257367,1.934185 - parent: 1 - - uid: 808 - components: - - type: Transform - pos: 6.4499555,1.88731 - parent: 1 - proto: FoodPlate entities: - uid: 608 @@ -7477,7 +7453,7 @@ entities: - 0 - 0 - 0 -- proto: LockerMedicalFilled +- proto: LockerMedical entities: - uid: 239 components: @@ -7541,7 +7517,7 @@ entities: - type: Transform pos: 12.5,-13.5 parent: 1 -- proto: MedicalBed +- proto: Bed entities: - uid: 206 components: @@ -7553,20 +7529,6 @@ entities: - type: Transform pos: -5.5,0.5 parent: 1 -- proto: MedkitFilled - entities: - - uid: 435 - components: - - type: Transform - pos: -8.446656,3.6739035 - parent: 1 -- proto: MedkitToxinFilled - entities: - - uid: 976 - components: - - type: Transform - pos: -8.642134,3.4433465 - parent: 1 - proto: Morgue entities: - uid: 541 @@ -9813,20 +9775,6 @@ entities: - type: Transform pos: 4.5,-1.5 parent: 1 -- proto: SpawnPointChemist - entities: - - uid: 586 - components: - - type: Transform - pos: -6.5,9.5 - parent: 1 -- proto: SpawnPointChiefEngineer - entities: - - uid: 629 - components: - - type: Transform - pos: 12.5,7.5 - parent: 1 - proto: SpawnPointLatejoin entities: - uid: 1731 @@ -9834,27 +9782,6 @@ entities: - type: Transform pos: 2.5,3.5 parent: 1 -- proto: SpawnPointMedicalDoctor - entities: - - uid: 1216 - components: - - type: Transform - pos: -6.5,2.5 - parent: 1 -- proto: SpawnPointParamedic - entities: - - uid: 478 - components: - - type: Transform - pos: -7.5,2.5 - parent: 1 -- proto: SpawnPointSalvageSpecialist - entities: - - uid: 645 - components: - - type: Transform - pos: 12.5,3.5 - parent: 1 - proto: SubstationBasic entities: - uid: 160 @@ -10458,7 +10385,7 @@ entities: - type: Transform pos: -5.5,7.5 parent: 1 -- proto: VendingMachineChemicals +- proto: MachineFrame entities: - uid: 1716 components: @@ -10493,7 +10420,7 @@ entities: - type: Transform pos: 13.5,8.5 parent: 1 -- proto: VendingMachineWallMedical +- proto: LockerWallMedical entities: - uid: 461 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml b/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml index 9745d4c0fc0..d48962bc840 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml @@ -3841,7 +3841,7 @@ entities: pos: 5.5,-9.5 parent: 1 type: Transform -- proto: GunSafeShuttleT1Spawner +- proto: GunSafeShuttleCaptain entities: - uid: 70 components: @@ -3931,13 +3931,6 @@ entities: - pos: -2.6460953,2.7065454 parent: 1 type: Transform -- proto: KitchenMicrowave - entities: - - uid: 593 - components: - - pos: 4.5,0.5 - parent: 1 - type: Transform - proto: LockerBoozeFilled entities: - uid: 594 @@ -3991,7 +3984,7 @@ entities: - pos: -3.5,-6.5 parent: 1 type: Transform -- proto: LockerWallMedicalFilled +- proto: LockerWallMedical entities: - uid: 597 components: @@ -4016,7 +4009,7 @@ entities: - 0 - 0 type: EntityStorage -- proto: MedicalBed +- proto: Bed entities: - uid: 598 components: @@ -4250,125 +4243,6 @@ entities: - pos: -3.5,2.5 parent: 1 type: Transform -- proto: RandomSpawner - entities: - - uid: 256 - components: - - pos: 0.5,-11.5 - parent: 1 - type: Transform - - uid: 451 - components: - - pos: -1.5,9.5 - parent: 1 - type: Transform - - uid: 477 - components: - - rot: 1.5707963267948966 rad - pos: -6.5,-4.5 - parent: 1 - type: Transform - - uid: 478 - components: - - rot: 1.5707963267948966 rad - pos: 6.5,-4.5 - parent: 1 - type: Transform - - uid: 641 - components: - - pos: -4.5,-1.5 - parent: 1 - type: Transform - - uid: 642 - components: - - pos: 4.5,-7.5 - parent: 1 - type: Transform - - uid: 643 - components: - - pos: 3.5,-6.5 - parent: 1 - type: Transform - - uid: 644 - components: - - pos: 0.5,-1.5 - parent: 1 - type: Transform - - uid: 645 - components: - - pos: -9.5,-5.5 - parent: 1 - type: Transform - - uid: 646 - components: - - pos: 9.5,-5.5 - parent: 1 - type: Transform - - uid: 647 - components: - - pos: 9.5,-2.5 - parent: 1 - type: Transform - - uid: 648 - components: - - pos: -11.5,-5.5 - parent: 1 - type: Transform - - uid: 649 - components: - - pos: -4.5,-7.5 - parent: 1 - type: Transform - - uid: 650 - components: - - pos: -2.5,-8.5 - parent: 1 - type: Transform - - uid: 652 - components: - - pos: 11.5,-2.5 - parent: 1 - type: Transform - - uid: 653 - components: - - pos: 0.5,0.5 - parent: 1 - type: Transform - - uid: 654 - components: - - pos: 0.5,4.5 - parent: 1 - type: Transform - - uid: 655 - components: - - pos: -11.5,-2.5 - parent: 1 - type: Transform - - uid: 657 - components: - - pos: 1.5,-3.5 - parent: 1 - type: Transform - - uid: 659 - components: - - pos: -1.5,-10.5 - parent: 1 - type: Transform - - uid: 661 - components: - - pos: 0.5,-8.5 - parent: 1 - type: Transform - - uid: 662 - components: - - pos: 0.5,10.5 - parent: 1 - type: Transform - - uid: 663 - components: - - pos: -0.5,11.5 - parent: 1 - type: Transform - proto: ReinforcedWindow entities: - uid: 666 @@ -4657,13 +4531,6 @@ entities: - pos: 2.6583714,-10.571913 parent: 1 type: Transform -- proto: SpawnPointBartender - entities: - - uid: 716 - components: - - pos: 3.5,0.5 - parent: 1 - type: Transform - proto: SpawnPointLatejoin entities: - uid: 717 @@ -4676,27 +4543,6 @@ entities: - pos: -1.5,-11.5 parent: 1 type: Transform -- proto: SpawnPointMercenary - entities: - - uid: 398 - components: - - pos: 2.5,6.5 - parent: 1 - type: Transform -- proto: SpawnPointParamedic - entities: - - uid: 720 - components: - - pos: 3.5,-7.5 - parent: 1 - type: Transform -- proto: SpawnPointSalvageSpecialist - entities: - - uid: 415 - components: - - pos: -2.5,-7.5 - parent: 1 - type: Transform - proto: Stairs entities: - uid: 473 @@ -5084,7 +4930,7 @@ entities: - pos: -7.5,-2.5 parent: 1 type: Transform -- proto: VendingMachineWallMedical +- proto: LockerWallMedical entities: - uid: 767 components: diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml index 486e4dd4672..1624a68be8c 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml @@ -11442,25 +11442,13 @@ entities: - type: Transform pos: -2.7208433,-4.620925 parent: 1 -- proto: KitchenDeepFryer +- proto: MachineFrame entities: - uid: 1161 components: - type: Transform pos: 15.5,8.5 parent: 1 -- proto: KitchenMicrowave - entities: - - uid: 925 - components: - - type: Transform - pos: -14.5,8.5 - parent: 1 - - uid: 1162 - components: - - type: Transform - pos: 14.5,8.5 - parent: 1 - proto: KitchenReagentGrinder entities: - uid: 598 diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/marauder.yml b/Resources/Maps/_NF/Shuttles/Nfsd/marauder.yml index 3175a733c2c..03241c587c4 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/marauder.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/marauder.yml @@ -7520,20 +7520,6 @@ entities: rot: 1.5707963267948966 rad pos: 5.5,-5.5 parent: 1 -- proto: KitchenMicrowave - entities: - - uid: 1237 - components: - - type: Transform - pos: 3.5,-2.5 - parent: 1 -- proto: KitchenReagentGrinder - entities: - - uid: 1238 - components: - - type: Transform - pos: 4.5,-2.5 - parent: 1 - proto: LampGold entities: - uid: 2 diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/opportunity.yml b/Resources/Maps/_NF/Shuttles/Nfsd/opportunity.yml index 6d49052832e..a35b7687439 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/opportunity.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/opportunity.yml @@ -2891,17 +2891,6 @@ entities: - type: Transform pos: 0.5,-3.5 parent: 2 -- proto: FoodBoxDonkpocket - entities: - - uid: 635 - components: - - type: MetaData - flags: InContainer - - type: Transform - parent: 634 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: GasPassiveVent entities: - uid: 653 @@ -4365,25 +4354,6 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,10.5 parent: 2 -- proto: KitchenMicrowave - entities: - - uid: 320 - components: - - type: Transform - pos: 3.5,8.5 - parent: 2 - - uid: 633 - components: - - type: Transform - pos: 1.5,-4.5 - parent: 2 -- proto: KitchenReagentGrinder - entities: - - uid: 321 - components: - - type: Transform - pos: 4.5,8.5 - parent: 2 - proto: KnifePlastic entities: - uid: 940 diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml b/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml index 0323969371a..e992cd34392 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml @@ -2700,13 +2700,6 @@ entities: rot: -1.5707963267948966 rad pos: -8.5,1.5 parent: 1 -- proto: KitchenMicrowave - entities: - - uid: 344 - components: - - type: Transform - pos: 2.5,-0.5 - parent: 1 - proto: LockerNfsdBailiff entities: - uid: 345 diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml b/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml index 355577bb8bd..5ea8430e01b 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml @@ -5049,13 +5049,6 @@ entities: - type: Transform pos: 4.5,7.5 parent: 1 -- proto: DonkpocketBoxSpawner - entities: - - uid: 732 - components: - - type: Transform - pos: 5.5,-15.5 - parent: 1 - proto: DresserFilled entities: - uid: 116 @@ -8349,30 +8342,6 @@ entities: - type: Transform pos: 5.1434035,11.657407 parent: 1 -- proto: KitchenMicrowave - entities: - - uid: 1186 - components: - - type: Transform - pos: 4.5,11.5 - parent: 1 - - uid: 1187 - components: - - type: Transform - pos: 4.5,-14.5 - parent: 1 -- proto: KitchenReagentGrinder - entities: - - uid: 1188 - components: - - type: Transform - pos: 5.5,11.5 - parent: 1 - - uid: 1189 - components: - - type: Transform - pos: -5.5,-4.5 - parent: 1 - proto: Lamp entities: - uid: 1190 @@ -9927,13 +9896,6 @@ entities: - type: Transform pos: 0.5,15.5 parent: 1 -- proto: SpawnMobSmile - entities: - - uid: 1429 - components: - - type: Transform - pos: 4.5,7.5 - parent: 1 - proto: SpawnPointLatejoin entities: - uid: 1793 diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/whiskey.yml b/Resources/Maps/_NF/Shuttles/Nfsd/whiskey.yml index e157fa9d7d7..87b1e92dcf2 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/whiskey.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/whiskey.yml @@ -1644,42 +1644,6 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,12.5 parent: 1 -- proto: FoodBoxDonut - entities: - - uid: 199 - components: - - type: Transform - pos: 0.5319689,1.4083452 - parent: 1 -- proto: FoodGumball - entities: - - uid: 200 - components: - - type: Transform - pos: -0.7008517,7.4746523 - parent: 1 - - uid: 201 - components: - - type: Transform - pos: -0.33974057,7.4468746 - parent: 1 -- proto: FoodLollipop - entities: - - uid: 202 - components: - - type: Transform - pos: -0.72862947,7.669097 - parent: 1 - - uid: 203 - components: - - type: Transform - pos: -0.50640726,7.669097 - parent: 1 - - uid: 204 - components: - - type: Transform - pos: -0.31196284,7.6413193 - parent: 1 - proto: GasAnalyzer entities: - uid: 205 @@ -2601,13 +2565,6 @@ entities: - type: Transform pos: 1.5,-6.5 parent: 1 -- proto: KitchenReagentGrinder - entities: - - uid: 325 - components: - - type: Transform - pos: -1.5,9.5 - parent: 1 - proto: LargeBeaker entities: - uid: 326 diff --git a/Resources/Maps/_NF/Shuttles/Scrap/bison.yml b/Resources/Maps/_NF/Shuttles/Scrap/bison.yml index 839699c0d9f..22e9c4b0082 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/bison.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/bison.yml @@ -2209,7 +2209,7 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,-25.5 parent: 1 -- proto: BedsheetMedical +- proto: BedsheetSpawner entities: - uid: 744 components: @@ -7948,13 +7948,6 @@ entities: ents: [] bank-ATM-cashSlot: !type:ContainerSlot {} - type: ItemSlots -- proto: CrateChemistrySupplies - entities: - - uid: 2699 - components: - - type: Transform - pos: 1.5,-6.5 - parent: 1 - proto: CrateEmergencyO2Kit entities: - uid: 2636 @@ -9371,423 +9364,6 @@ entities: - type: Transform pos: -1.5351219,-19.403667 parent: 1 -- proto: FoodBakedMuffin - entities: - - uid: 2185 - components: - - type: Transform - pos: -6.288831,-18.906513 - parent: 1 -- proto: FoodBreadGarlicSlice - entities: - - uid: 2160 - components: - - type: Transform - pos: -4.6953106,-4.282234 - parent: 1 -- proto: FoodBurgerBig - entities: - - uid: 2165 - components: - - type: Transform - pos: -3.6736631,-1.0484629 - parent: 1 -- proto: FoodBurgerCheese - entities: - - uid: 598 - components: - - type: Transform - pos: 6.726831,-21.285185 - parent: 1 -- proto: FoodBurgerSuper - entities: - - uid: 904 - components: - - type: Transform - pos: 4.0329285,-22.415806 - parent: 1 -- proto: FoodCheese - entities: - - uid: 2378 - components: - - type: Transform - pos: 7.659148,-16.509655 - parent: 1 - - uid: 2379 - components: - - type: Transform - pos: 7.659148,-16.509655 - parent: 1 - - uid: 2380 - components: - - type: Transform - pos: 7.659148,-16.509655 - parent: 1 - - uid: 2381 - components: - - type: Transform - pos: 7.659148,-16.509655 - parent: 1 - - uid: 2382 - components: - - type: Transform - pos: 7.659148,-16.509655 - parent: 1 - - uid: 2383 - components: - - type: Transform - pos: 7.659148,-16.509655 - parent: 1 - - uid: 2384 - components: - - type: Transform - pos: 7.659148,-16.509655 - parent: 1 - - uid: 2385 - components: - - type: Transform - pos: 7.659148,-16.509655 - parent: 1 -- proto: FoodEgg - entities: - - uid: 2297 - components: - - type: Transform - pos: 8.659148,-17.134655 - parent: 1 - - uid: 2298 - components: - - type: Transform - pos: 8.659148,-17.134655 - parent: 1 - - uid: 2299 - components: - - type: Transform - pos: 8.659148,-17.134655 - parent: 1 - - uid: 2300 - components: - - type: Transform - pos: 8.659148,-17.134655 - parent: 1 - - uid: 2301 - components: - - type: Transform - pos: 8.659148,-17.134655 - parent: 1 - - uid: 2302 - components: - - type: Transform - pos: 8.659148,-17.134655 - parent: 1 - - uid: 2303 - components: - - type: Transform - pos: 8.659148,-17.134655 - parent: 1 - - uid: 2304 - components: - - type: Transform - pos: 8.659148,-17.134655 - parent: 1 - - uid: 2305 - components: - - type: Transform - pos: 8.659148,-17.134655 - parent: 1 - - uid: 2306 - components: - - type: Transform - pos: 8.659148,-17.134655 - parent: 1 - - uid: 2307 - components: - - type: Transform - pos: 8.659148,-17.134655 - parent: 1 - - uid: 2308 - components: - - type: Transform - pos: 8.315398,-17.24403 - parent: 1 - - uid: 2309 - components: - - type: Transform - pos: 8.315398,-17.24403 - parent: 1 - - uid: 2310 - components: - - type: Transform - pos: 8.315398,-17.24403 - parent: 1 - - uid: 2311 - components: - - type: Transform - pos: 8.315398,-17.24403 - parent: 1 - - uid: 2312 - components: - - type: Transform - pos: 8.315398,-17.24403 - parent: 1 - - uid: 2313 - components: - - type: Transform - pos: 8.315398,-17.24403 - parent: 1 - - uid: 2314 - components: - - type: Transform - pos: 8.315398,-17.24403 - parent: 1 - - uid: 2315 - components: - - type: Transform - pos: 8.534148,-17.290905 - parent: 1 - - uid: 2316 - components: - - type: Transform - pos: 8.534148,-17.290905 - parent: 1 - - uid: 2317 - components: - - type: Transform - pos: 8.534148,-17.290905 - parent: 1 - - uid: 2318 - components: - - type: Transform - pos: 8.534148,-17.290905 - parent: 1 - - uid: 2319 - components: - - type: Transform - pos: 8.534148,-17.290905 - parent: 1 - - uid: 2320 - components: - - type: Transform - pos: 8.534148,-17.290905 - parent: 1 - - uid: 2321 - components: - - type: Transform - pos: 8.534148,-17.290905 - parent: 1 - - uid: 2322 - components: - - type: Transform - pos: 8.534148,-17.290905 - parent: 1 - - uid: 2323 - components: - - type: Transform - pos: 8.534148,-17.290905 - parent: 1 - - uid: 2324 - components: - - type: Transform - pos: 8.534148,-17.290905 - parent: 1 - - uid: 2325 - components: - - type: Transform - pos: 8.534148,-17.290905 - parent: 1 -- proto: FoodKebabSkewer - entities: - - uid: 2174 - components: - - type: Transform - pos: 8.720428,-20.80643 - parent: 1 - - uid: 2175 - components: - - type: Transform - pos: 8.579803,-20.71268 - parent: 1 -- proto: FoodMealFries - entities: - - uid: 2173 - components: - - type: Transform - pos: 4.3141785,-22.353306 - parent: 1 - - uid: 2180 - components: - - type: Transform - pos: 6.773706,-20.941435 - parent: 1 - - uid: 2181 - components: - - type: Transform - pos: 6.273706,-21.23831 - parent: 1 - - uid: 2182 - components: - - type: Transform - pos: 6.273706,-20.941435 - parent: 1 -- proto: FoodMealFriesCheesy - entities: - - uid: 2169 - components: - - type: Transform - pos: -3.3299131,-1.0082154 - parent: 1 - - uid: 2170 - components: - - type: Transform - pos: 3.4235535,-22.478306 - parent: 1 -- proto: FoodMealRibs - entities: - - uid: 2164 - components: - - type: Transform - pos: -3.4705381,-1.2515879 - parent: 1 -- proto: FoodMeat - entities: - - uid: 2339 - components: - - type: Transform - pos: 7.768523,-17.11903 - parent: 1 - - uid: 2340 - components: - - type: Transform - pos: 7.768523,-17.11903 - parent: 1 - - uid: 2341 - components: - - type: Transform - pos: 7.768523,-17.11903 - parent: 1 - - uid: 2342 - components: - - type: Transform - pos: 7.768523,-17.11903 - parent: 1 - - uid: 2343 - components: - - type: Transform - pos: 7.768523,-17.11903 - parent: 1 - - uid: 2344 - components: - - type: Transform - pos: 7.768523,-17.11903 - parent: 1 - - uid: 2345 - components: - - type: Transform - pos: 7.768523,-17.11903 - parent: 1 - - uid: 2346 - components: - - type: Transform - pos: 7.768523,-17.11903 - parent: 1 - - uid: 2347 - components: - - type: Transform - pos: 7.768523,-17.11903 - parent: 1 - - uid: 2348 - components: - - type: Transform - pos: 7.768523,-17.11903 - parent: 1 - - uid: 2349 - components: - - type: Transform - pos: 7.768523,-17.11903 - parent: 1 - - uid: 2350 - components: - - type: Transform - pos: 7.768523,-17.11903 - parent: 1 - - uid: 2351 - components: - - type: Transform - pos: 7.768523,-17.11903 - parent: 1 - - uid: 2352 - components: - - type: Transform - pos: 7.768523,-17.11903 - parent: 1 - - uid: 2353 - components: - - type: Transform - pos: 7.768523,-17.11903 - parent: 1 - - uid: 2354 - components: - - type: Transform - pos: 7.768523,-17.11903 - parent: 1 - - uid: 2355 - components: - - type: Transform - pos: 7.768523,-17.11903 - parent: 1 - - uid: 2356 - components: - - type: Transform - pos: 7.768523,-17.11903 - parent: 1 - - uid: 2357 - components: - - type: Transform - pos: 7.768523,-17.11903 - parent: 1 - - uid: 2358 - components: - - type: Transform - pos: 7.768523,-17.11903 - parent: 1 -- proto: FoodMeatChickenFried - entities: - - uid: 2161 - components: - - type: Transform - pos: -4.2890606,-4.125984 - parent: 1 - - uid: 2172 - components: - - type: Transform - pos: 4.5016785,-22.572056 - parent: 1 -- proto: FoodPieMeat - entities: - - uid: 2159 - components: - - type: Transform - pos: -4.6640606,-4.063484 - parent: 1 -- proto: FoodPizzaMeat - entities: - - uid: 2158 - components: - - type: Transform - pos: -4.5078106,-4.313484 - parent: 1 -- proto: FoodPlate - entities: - - uid: 2162 - components: - - type: Transform - pos: -4.5703106,-4.172859 - parent: 1 - - uid: 2167 - components: - - type: Transform - pos: -3.4705381,-1.1957154 - parent: 1 - proto: FoodPlatePlastic entities: - uid: 2171 @@ -9817,256 +9393,6 @@ entities: - type: Transform pos: -3.6580381,-1.0082154 parent: 1 -- proto: FoodSnackChocolate - entities: - - uid: 2087 - components: - - type: Transform - pos: -5.8013124,-14.3419285 - parent: 1 -- proto: FoodSnackChowMein - entities: - - uid: 1980 - components: - - type: Transform - pos: 3.5069973,-18.346783 - parent: 1 -- proto: FoodSnackDanDanNoodles - entities: - - uid: 690 - components: - - type: Transform - pos: 4.407483,-18.206772 - parent: 1 - - uid: 2013 - components: - - type: Transform - pos: 4.735608,-18.456772 - parent: 1 -- proto: FoodSnackMREBrownieOpen - entities: - - uid: 2973 - components: - - type: Transform - pos: -5.790093,-25.563456 - parent: 1 - - uid: 2977 - components: - - type: Transform - pos: -5.7874713,-28.574776 - parent: 1 -- proto: FoodSnackNutribrick - entities: - - uid: 2088 - components: - - type: Transform - pos: -8.833028,-23.304966 - parent: 1 - - uid: 2703 - components: - - type: Transform - pos: 5.578805,-6.029376 - parent: 1 -- proto: FoodSnackNutribrickOpen - entities: - - uid: 2701 - components: - - type: Transform - pos: 4.391305,-6.732501 - parent: 1 - - uid: 2702 - components: - - type: Transform - pos: 4.391305,-6.357501 - parent: 1 -- proto: FoodSnackRaisins - entities: - - uid: 2704 - components: - - type: Transform - pos: 3.6162286,-8.302732 - parent: 1 -- proto: FoodTinMRETrash - entities: - - uid: 2193 - components: - - type: Transform - pos: -6.684969,-16.647165 - parent: 1 -- proto: FoodTomato - entities: - - uid: 2750 - components: - - type: Transform - pos: 7.7270474,-16.762527 - parent: 1 - - uid: 2753 - components: - - type: Transform - pos: 7.7270474,-16.762527 - parent: 1 - - uid: 2754 - components: - - type: Transform - pos: 7.7270474,-16.762527 - parent: 1 - - uid: 2755 - components: - - type: Transform - pos: 7.7270474,-16.762527 - parent: 1 - - uid: 2761 - components: - - type: Transform - pos: 7.7270474,-16.762527 - parent: 1 - - uid: 2762 - components: - - type: Transform - pos: 7.7270474,-16.762527 - parent: 1 - - uid: 2763 - components: - - type: Transform - pos: 7.7270474,-16.762527 - parent: 1 - - uid: 2764 - components: - - type: Transform - pos: 7.7270474,-16.762527 - parent: 1 - - uid: 2765 - components: - - type: Transform - pos: 7.7270474,-16.762527 - parent: 1 - - uid: 2766 - components: - - type: Transform - pos: 7.7270474,-16.762527 - parent: 1 - - uid: 2767 - components: - - type: Transform - pos: 7.7270474,-16.762527 - parent: 1 - - uid: 2768 - components: - - type: Transform - pos: 7.7270474,-16.762527 - parent: 1 - - uid: 2769 - components: - - type: Transform - pos: 7.7270474,-16.762527 - parent: 1 - - uid: 2770 - components: - - type: Transform - pos: 7.7270474,-16.762527 - parent: 1 - - uid: 2771 - components: - - type: Transform - pos: 7.7270474,-16.762527 - parent: 1 - - uid: 2772 - components: - - type: Transform - pos: 7.7270474,-16.762527 - parent: 1 - - uid: 2773 - components: - - type: Transform - pos: 7.7270474,-16.762527 - parent: 1 - - uid: 2774 - components: - - type: Transform - pos: 7.7270474,-16.762527 - parent: 1 - - uid: 2775 - components: - - type: Transform - pos: 7.7270474,-16.762527 - parent: 1 - - uid: 2776 - components: - - type: Transform - pos: 7.7270474,-16.762527 - parent: 1 - - uid: 2777 - components: - - type: Transform - pos: 7.7270474,-16.762527 - parent: 1 -- proto: FoodWatermelon - entities: - - uid: 2405 - components: - - type: Transform - pos: 7.315398,-17.36903 - parent: 1 - - uid: 2406 - components: - - type: Transform - pos: 7.315398,-17.36903 - parent: 1 - - uid: 2407 - components: - - type: Transform - pos: 7.315398,-17.36903 - parent: 1 - - uid: 2408 - components: - - type: Transform - pos: 7.315398,-17.36903 - parent: 1 - - uid: 2409 - components: - - type: Transform - pos: 7.315398,-17.36903 - parent: 1 - - uid: 2410 - components: - - type: Transform - pos: 7.315398,-17.36903 - parent: 1 - - uid: 2411 - components: - - type: Transform - pos: 7.315398,-17.36903 - parent: 1 - - uid: 2412 - components: - - type: Transform - pos: 7.315398,-17.36903 - parent: 1 - - uid: 2413 - components: - - type: Transform - pos: 7.315398,-17.36903 - parent: 1 - - uid: 2414 - components: - - type: Transform - pos: 7.315398,-17.36903 - parent: 1 - - uid: 2415 - components: - - type: Transform - pos: 7.315398,-17.36903 - parent: 1 - - uid: 2416 - components: - - type: Transform - pos: 7.315398,-17.36903 - parent: 1 - - uid: 2417 - components: - - type: Transform - pos: 7.315398,-17.36903 - parent: 1 - proto: Football entities: - uid: 2192 @@ -14466,25 +13792,6 @@ entities: rot: 3.141592653589793 rad pos: 8.6603775,-20.618158 parent: 1 -- proto: KitchenMicrowave - entities: - - uid: 683 - components: - - type: Transform - pos: 8.5,-21.5 - parent: 1 - - uid: 2075 - components: - - type: Transform - pos: -6.5,-5.5 - parent: 1 -- proto: KitchenReagentGrinder - entities: - - uid: 2787 - components: - - type: Transform - pos: 8.5,-22.5 - parent: 1 - proto: KitchenSpike entities: - uid: 1917 @@ -14541,7 +13848,7 @@ entities: - type: Transform pos: 13.5,-30.5 parent: 1 -- proto: LockerMedicalFilled +- proto: LockerMedical entities: - uid: 749 components: @@ -14570,7 +13877,7 @@ entities: - type: Transform pos: 2.5,-4.5 parent: 1 -- proto: LockerWallMedicalDoctorFilled +- proto: LockerWallMedical entities: - uid: 677 components: @@ -14578,27 +13885,13 @@ entities: rot: -1.5707963267948966 rad pos: -7.5,-34.5 parent: 1 -- proto: MedicalBed +- proto: Bed entities: - uid: 743 components: - type: Transform pos: -10.5,-36.5 parent: 1 -- proto: MedkitFilled - entities: - - uid: 741 - components: - - type: Transform - pos: -11.536187,-34.399456 - parent: 1 -- proto: MedkitOxygenFilled - entities: - - uid: 754 - components: - - type: Transform - pos: -11.541139,-34.77665 - parent: 1 - proto: MiningDrill entities: - uid: 2110 diff --git a/Resources/Maps/_NF/Shuttles/Scrap/canister.yml b/Resources/Maps/_NF/Shuttles/Scrap/canister.yml index 2e3e49b7a55..0238cacd87c 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/canister.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/canister.yml @@ -571,13 +571,6 @@ entities: rot: 3.141592653589793 rad pos: 2.5,2.5 parent: 1 -- proto: RandomSpawner - entities: - - uid: 13 - components: - - type: Transform - pos: -0.5,0.5 - parent: 1 - proto: SheetPlasma1 entities: - uid: 83 diff --git a/Resources/Maps/_NF/Shuttles/Scrap/disciple.yml b/Resources/Maps/_NF/Shuttles/Scrap/disciple.yml index 7504c286eb5..5a0de5b0b05 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/disciple.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/disciple.yml @@ -754,13 +754,6 @@ entities: - type: Transform pos: -2.7624044,5.4494452 parent: 1 -- proto: FoodMeatRatdoubleKebab - entities: - - uid: 154 - components: - - type: Transform - pos: -1.434973,-0.4808603 - parent: 1 - proto: FoodTinPeachesMaint entities: - uid: 135 @@ -1090,30 +1083,6 @@ entities: - type: Transform pos: -0.5,1.5 parent: 1 -- proto: RandomSpawner - entities: - - uid: 102 - components: - - type: Transform - pos: 3.5,2.5 - parent: 1 - - uid: 103 - components: - - type: Transform - pos: 0.5,4.5 - parent: 1 - - uid: 104 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-1.5 - parent: 1 - - uid: 105 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-1.5 - parent: 1 - proto: ReinforcedGirder entities: - uid: 49 diff --git a/Resources/Maps/_NF/Shuttles/Scrap/nugget.yml b/Resources/Maps/_NF/Shuttles/Scrap/nugget.yml index 1d758d70cb8..db50446e59c 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/nugget.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/nugget.yml @@ -1144,13 +1144,6 @@ entities: - pos: 6.592401,-7.4767485 parent: 1 type: Transform -- proto: DonkpocketBoxSpawner - entities: - - uid: 79 - components: - - pos: 12.5,-2.5 - parent: 1 - type: Transform - proto: DrinkGlass entities: - uid: 80 @@ -1726,70 +1719,6 @@ entities: - pos: 10.5,-4.5 parent: 1 type: Transform -- proto: RandomSpawner - entities: - - uid: 170 - components: - - pos: 5.5,-7.5 - parent: 1 - type: Transform - - uid: 171 - components: - - pos: 9.5,-4.5 - parent: 1 - type: Transform - - uid: 172 - components: - - pos: 7.5,-3.5 - parent: 1 - type: Transform - - uid: 173 - components: - - pos: 8.5,-6.5 - parent: 1 - type: Transform - - uid: 174 - components: - - pos: 11.5,-4.5 - parent: 1 - type: Transform - - uid: 175 - components: - - pos: 8.5,0.5 - parent: 1 - type: Transform - - uid: 176 - components: - - pos: 3.5,-3.5 - parent: 1 - type: Transform - - uid: 177 - components: - - pos: 3.5,-0.5 - parent: 1 - type: Transform - - uid: 339 - components: - - pos: 2.5,-3.5 - parent: 1 - type: Transform - - uid: 340 - components: - - pos: 4.5,0.5 - parent: 1 - type: Transform -- proto: RandomSpawner100 - entities: - - uid: 336 - components: - - pos: 7.5,-0.5 - parent: 1 - type: Transform - - uid: 337 - components: - - pos: 9.5,-6.5 - parent: 1 - type: Transform - proto: ReagentContainerFlourSmall entities: - uid: 178 @@ -2014,13 +1943,6 @@ entities: - pos: 3.5,-7.5 parent: 1 type: Transform -- proto: SpawnPointAssistant - entities: - - uid: 212 - components: - - pos: 6.5,-5.5 - parent: 1 - type: Transform - proto: SpawnPointLatejoin entities: - uid: 213 diff --git a/Resources/Maps/_NF/Shuttles/Scrap/orange.yml b/Resources/Maps/_NF/Shuttles/Scrap/orange.yml index f7dd1f7790c..f462b4af815 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/orange.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/orange.yml @@ -1305,13 +1305,6 @@ entities: type: EntityStorage - isPlaceable: True type: PlaceableSurface -- proto: DonkpocketBoxSpawner - entities: - - uid: 117 - components: - - pos: 14.5,3.5 - parent: 1 - type: Transform - proto: DrinkWaterCup entities: - uid: 118 @@ -1738,28 +1731,6 @@ entities: pos: 6.5,10.5 parent: 1 type: Transform -- proto: RandomSpawner - entities: - - uid: 189 - components: - - pos: 4.5,3.5 - parent: 1 - type: Transform - - uid: 190 - components: - - pos: 12.5,4.5 - parent: 1 - type: Transform - - uid: 191 - components: - - pos: 12.5,7.5 - parent: 1 - type: Transform - - uid: 192 - components: - - pos: -1.5,4.5 - parent: 1 - type: Transform - proto: ShardGlass entities: - uid: 193 @@ -1952,13 +1923,6 @@ entities: - pos: 2.5,4.5 parent: 1 type: Transform -- proto: SpawnPointSalvageSpecialist - entities: - - uid: 223 - components: - - pos: 2.5,4.5 - parent: 1 - type: Transform - proto: SubstationBasic entities: - uid: 224 diff --git a/Resources/Maps/_NF/Shuttles/Scrap/point.yml b/Resources/Maps/_NF/Shuttles/Scrap/point.yml index 0a89f62071b..5542492605d 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/point.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/point.yml @@ -1753,13 +1753,6 @@ entities: rot: 3.141592653589793 rad pos: 1.5,6.5 parent: 1 -- proto: KitchenMicrowave - entities: - - uid: 106 - components: - - type: Transform - pos: 5.5,0.5 - parent: 1 - proto: MachineArtifactAnalyzer entities: - uid: 231 @@ -1937,24 +1930,6 @@ entities: - type: Transform pos: 5.5,0.5 parent: 1 -- proto: RandomSpawner - entities: - - uid: 85 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,9.5 - parent: 1 - - uid: 233 - components: - - type: Transform - pos: 2.5,1.5 - parent: 1 - - uid: 234 - components: - - type: Transform - pos: 1.5,8.5 - parent: 1 - proto: ResearchAndDevelopmentServer entities: - uid: 110 diff --git a/Resources/Maps/_NF/Shuttles/Scrap/tide.yml b/Resources/Maps/_NF/Shuttles/Scrap/tide.yml index 294500a0a4b..7ec702afd13 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/tide.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/tide.yml @@ -1532,38 +1532,6 @@ entities: - pos: 7.5,6.5 parent: 1 type: Transform -- proto: RandomSpawner - entities: - - uid: 156 - components: - - pos: -0.5,9.5 - parent: 1 - type: Transform - - uid: 157 - components: - - pos: 2.5,6.5 - parent: 1 - type: Transform - - uid: 158 - components: - - pos: 0.5,3.5 - parent: 1 - type: Transform - - uid: 159 - components: - - pos: 1.5,0.5 - parent: 1 - type: Transform - - uid: 160 - components: - - pos: 2.5,1.5 - parent: 1 - type: Transform - - uid: 161 - components: - - pos: 5.5,5.5 - parent: 1 - type: Transform - proto: ShardGlass entities: - uid: 162 diff --git a/Resources/Maps/_NF/Shuttles/Syndicate/infiltrator.yml b/Resources/Maps/_NF/Shuttles/Syndicate/infiltrator.yml index 56c159a36ec..0dc9b9ced2d 100644 --- a/Resources/Maps/_NF/Shuttles/Syndicate/infiltrator.yml +++ b/Resources/Maps/_NF/Shuttles/Syndicate/infiltrator.yml @@ -2897,27 +2897,6 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-6.5 parent: 1 -- proto: FoodBoxDonkpocketPizza - entities: - - uid: 364 - components: - - type: Transform - pos: 2.7185502,-19.320925 - parent: 1 -- proto: FoodBoxDonut - entities: - - uid: 365 - components: - - type: Transform - pos: 5.5401826,-21.187487 - parent: 1 -- proto: FoodSnackSyndi - entities: - - uid: 298 - components: - - type: Transform - pos: 1.5133759,-21.37676 - parent: 1 - proto: GasMixer entities: - uid: 370 @@ -4046,14 +4025,6 @@ entities: - type: Transform pos: 2.5,-6.5 parent: 1 -- proto: PosterContrabandDonk - entities: - - uid: 527 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,-18.5 - parent: 1 - proto: PosterContrabandDonutCorp entities: - uid: 528 diff --git a/Resources/Maps/_NF/Shuttles/barge.yml b/Resources/Maps/_NF/Shuttles/barge.yml index 083dc881152..cfd868474c1 100644 --- a/Resources/Maps/_NF/Shuttles/barge.yml +++ b/Resources/Maps/_NF/Shuttles/barge.yml @@ -4440,20 +4440,6 @@ entities: - type: Transform pos: 4.5,-23.5 parent: 70 -- proto: SpawnPointBartender - entities: - - uid: 600 - components: - - type: Transform - pos: -4.5,-5.5 - parent: 70 -- proto: SpawnPointCargoTechnician - entities: - - uid: 601 - components: - - type: Transform - pos: 3.5,4.5 - parent: 70 - proto: SpawnPointLatejoin entities: - uid: 592 @@ -4461,27 +4447,6 @@ entities: - type: Transform pos: -2.5,-5.5 parent: 70 -- proto: SpawnPointPilot - entities: - - uid: 739 - components: - - type: Transform - pos: -0.5,-12.5 - parent: 70 -- proto: SpawnPointQuartermaster - entities: - - uid: 602 - components: - - type: Transform - pos: -3.5,5.5 - parent: 70 -- proto: SpawnPointSalvageSpecialist - entities: - - uid: 603 - components: - - type: Transform - pos: -2.5,5.5 - parent: 70 - proto: StoolBar entities: - uid: 138 diff --git a/Resources/Maps/_NF/Shuttles/bocadillo.yml b/Resources/Maps/_NF/Shuttles/bocadillo.yml index 9df476e8c4a..8d9aae4d1ee 100644 --- a/Resources/Maps/_NF/Shuttles/bocadillo.yml +++ b/Resources/Maps/_NF/Shuttles/bocadillo.yml @@ -1502,13 +1502,6 @@ entities: - pos: -9.5,4.5 parent: 2 type: Transform -- proto: SpawnPointChef - entities: - - uid: 254 - components: - - pos: -3.5,4.5 - parent: 2 - type: Transform - proto: SpawnPointLatejoin entities: - uid: 178 @@ -1516,13 +1509,6 @@ entities: - pos: -5.5,4.5 parent: 2 type: Transform -- proto: SpawnPointPilot - entities: - - uid: 253 - components: - - pos: -8.5,4.5 - parent: 2 - type: Transform - proto: Stool entities: - uid: 18 diff --git a/Resources/Maps/_NF/Shuttles/caduceus.yml b/Resources/Maps/_NF/Shuttles/caduceus.yml index 54742991365..c96085d8905 100644 --- a/Resources/Maps/_NF/Shuttles/caduceus.yml +++ b/Resources/Maps/_NF/Shuttles/caduceus.yml @@ -4651,14 +4651,6 @@ entities: parent: 1 - type: Fixtures fixtures: {} -- proto: FoodBoxDonkpocketPizza - entities: - - uid: 454 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 4.5405283,9.778789 - parent: 1 - proto: GasFilter entities: - uid: 769 @@ -8269,20 +8261,6 @@ entities: - type: Transform pos: 16.5,-14.5 parent: 1 -- proto: SpawnPointBorg - entities: - - uid: 1122 - components: - - type: Transform - pos: 13.5,-15.5 - parent: 1 -- proto: SpawnPointChiefMedicalOfficer - entities: - - uid: 1202 - components: - - type: Transform - pos: -4.5,-4.5 - parent: 1 - proto: SpawnPointLatejoin entities: - uid: 1380 @@ -8290,37 +8268,6 @@ entities: - type: Transform pos: 0.5,0.5 parent: 1 -- proto: SpawnPointMedicalDoctor - entities: - - uid: 1204 - components: - - type: Transform - pos: 2.5,-4.5 - parent: 1 - - uid: 1205 - components: - - type: Transform - pos: 3.5,-4.5 - parent: 1 -- proto: SpawnPointMedicalIntern - entities: - - uid: 1206 - components: - - type: Transform - pos: 2.5,4.5 - parent: 1 - - uid: 1207 - components: - - type: Transform - pos: -1.5,4.5 - parent: 1 -- proto: SpawnPointStationEngineer - entities: - - uid: 1201 - components: - - type: Transform - pos: 14.5,-12.5 - parent: 1 - proto: StasisBed entities: - uid: 1123 diff --git a/Resources/Maps/_NF/Shuttles/camper.yml b/Resources/Maps/_NF/Shuttles/camper.yml index 271696446fd..a35206de700 100644 --- a/Resources/Maps/_NF/Shuttles/camper.yml +++ b/Resources/Maps/_NF/Shuttles/camper.yml @@ -950,13 +950,6 @@ entities: - type: Transform pos: -3.4543009,-0.5313598 parent: 1 -- proto: KitchenMicrowave - entities: - - uid: 116 - components: - - type: Transform - pos: -3.5,-1.5 - parent: 1 - proto: LockerWoodenGeneric entities: - uid: 117 diff --git a/Resources/Maps/_NF/Shuttles/chisel.yml b/Resources/Maps/_NF/Shuttles/chisel.yml index 26d7c0f0c5d..a095100c879 100644 --- a/Resources/Maps/_NF/Shuttles/chisel.yml +++ b/Resources/Maps/_NF/Shuttles/chisel.yml @@ -1422,14 +1422,6 @@ entities: - type: Transform pos: 0.5,-3.5 parent: 1 -- proto: FoodBoxPizzaFilled - entities: - - uid: 216 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 3.3678956,2.7947533 - parent: 1 - proto: GasPassiveVent entities: - uid: 66 @@ -2235,20 +2227,6 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,1.5 parent: 1 -- proto: SpawnPointPilot - entities: - - uid: 207 - components: - - type: Transform - pos: -4.5,3.5 - parent: 1 -- proto: SpawnPointSalvageSpecialist - entities: - - uid: 346 - components: - - type: Transform - pos: 4.5,0.5 - parent: 1 - proto: SubstationWallBasic entities: - uid: 166 diff --git a/Resources/Maps/_NF/Shuttles/cleithro.yml b/Resources/Maps/_NF/Shuttles/cleithro.yml index 31391f5341a..56c5f3cd478 100644 --- a/Resources/Maps/_NF/Shuttles/cleithro.yml +++ b/Resources/Maps/_NF/Shuttles/cleithro.yml @@ -2084,18 +2084,6 @@ entities: parent: 2 - type: Fixtures fixtures: {} -- proto: FoodBoxPizza - entities: - - uid: 334 - components: - - type: Transform - pos: 0.50623906,-8.462236 - parent: 2 - - uid: 623 - components: - - type: Transform - pos: 0.50623906,-8.305986 - parent: 2 - proto: FoodCondimentSqueezeBottleKetchup entities: - uid: 597 @@ -2105,18 +2093,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: FoodKebabSkewer - entities: - - uid: 361 - components: - - type: Transform - pos: 8.517926,7.7147355 - parent: 2 - - uid: 625 - components: - - type: Transform - pos: 8.78876,7.67722 - parent: 2 - proto: FoodPizzaMoldySlice entities: - uid: 647 @@ -2124,23 +2100,6 @@ entities: - type: Transform pos: 0.49173152,-7.2009816 parent: 2 -- proto: FoodTinBeansTrash - entities: - - uid: 50 - components: - - type: Transform - pos: 9.788311,-6.519189 - parent: 2 - - uid: 53 - components: - - type: Transform - pos: 9.579978,-6.3421054 - parent: 2 - - uid: 79 - components: - - type: Transform - pos: 9.329978,-6.508772 - parent: 2 - proto: GasPassiveVent entities: - uid: 308 @@ -3747,20 +3706,6 @@ entities: rot: 3.141592653589793 rad pos: 2.5,0.5 parent: 2 -- proto: SpawnPointPsychologist - entities: - - uid: 649 - components: - - type: Transform - pos: 3.5,-2.5 - parent: 2 -- proto: SpawnPointServiceWorker - entities: - - uid: 650 - components: - - type: Transform - pos: -3.5,3.5 - parent: 2 - proto: SubstationBasic entities: - uid: 235 diff --git a/Resources/Maps/_NF/Shuttles/comet.yml b/Resources/Maps/_NF/Shuttles/comet.yml index bd6af2928ef..f959c2f420b 100644 --- a/Resources/Maps/_NF/Shuttles/comet.yml +++ b/Resources/Maps/_NF/Shuttles/comet.yml @@ -3548,13 +3548,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-13.5 parent: 1 -- proto: SpawnPointChiefEngineer - entities: - - uid: 438 - components: - - type: Transform - pos: 1.5,-1.5 - parent: 1 - proto: SpawnPointLatejoin entities: - uid: 325 @@ -3563,27 +3556,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,5.5 parent: 1 -- proto: SpawnPointPilot - entities: - - uid: 382 - components: - - type: Transform - pos: 0.5,1.5 - parent: 1 -- proto: SpawnPointSalvageSpecialist - entities: - - uid: 425 - components: - - type: Transform - pos: -1.5,7.5 - parent: 1 -- proto: SpawnPointStationEngineer - entities: - - uid: 435 - components: - - type: Transform - pos: 1.5,-4.5 - parent: 1 - proto: SubstationBasic entities: - uid: 171 diff --git a/Resources/Maps/_NF/Shuttles/condor.yml b/Resources/Maps/_NF/Shuttles/condor.yml index 92d492d1f95..b0221c7ef06 100644 --- a/Resources/Maps/_NF/Shuttles/condor.yml +++ b/Resources/Maps/_NF/Shuttles/condor.yml @@ -4729,20 +4729,6 @@ entities: - type: Transform pos: 4.5,19.5 parent: 281 -- proto: SpawnPointAtmos - entities: - - uid: 867 - components: - - type: Transform - pos: 4.5,3.5 - parent: 281 -- proto: SpawnPointChiefEngineer - entities: - - uid: 874 - components: - - type: Transform - pos: 6.5,-0.5 - parent: 281 - proto: SpawnPointLatejoin entities: - uid: 678 @@ -4760,27 +4746,6 @@ entities: - type: Transform pos: 5.5,-0.5 parent: 281 -- proto: SpawnPointResearchDirector - entities: - - uid: 866 - components: - - type: Transform - pos: 7.5,-0.5 - parent: 281 -- proto: SpawnPointScientist - entities: - - uid: 875 - components: - - type: Transform - pos: 2.5,-0.5 - parent: 281 -- proto: SpawnPointStationEngineer - entities: - - uid: 876 - components: - - type: Transform - pos: 4.5,2.5 - parent: 281 - proto: SubstationBasic entities: - uid: 543 diff --git a/Resources/Maps/_NF/Shuttles/crescent.yml b/Resources/Maps/_NF/Shuttles/crescent.yml index a9ec6154b75..b6fc47d050e 100644 --- a/Resources/Maps/_NF/Shuttles/crescent.yml +++ b/Resources/Maps/_NF/Shuttles/crescent.yml @@ -16255,7 +16255,7 @@ entities: - type: Transform pos: 29.5,19.5 parent: 1 -- proto: GunSafeShuttleT2Spawner +- proto: GunSafeShuttleCaptain entities: - uid: 2514 components: @@ -18088,32 +18088,6 @@ entities: - type: Transform pos: -3.5,3.5 parent: 1 -- proto: RandomFoodBakedSingle - entities: - - uid: 1178 - components: - - type: Transform - pos: 0.5,-0.5 - parent: 1 - - uid: 1185 - components: - - type: Transform - pos: 4.5,0.5 - parent: 1 -- proto: RandomFoodMeal - entities: - - uid: 1192 - components: - - type: Transform - pos: 0.5,4.5 - parent: 1 -- proto: RandomFoodSingle - entities: - - uid: 1200 - components: - - type: Transform - pos: -4.5,0.5 - parent: 1 - proto: RandomPosterAny entities: - uid: 2408 @@ -19467,62 +19441,6 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,16.5 parent: 1 -- proto: SpawnPointAtmos - entities: - - uid: 2643 - components: - - type: Transform - pos: 18.5,7.5 - parent: 1 -- proto: SpawnPointBartender - entities: - - uid: 2644 - components: - - type: Transform - pos: -4.5,3.5 - parent: 1 -- proto: SpawnPointBotanist - entities: - - uid: 2645 - components: - - type: Transform - pos: 9.5,4.5 - parent: 1 -- proto: SpawnPointChef - entities: - - uid: 2646 - components: - - type: Transform - pos: 2.5,4.5 - parent: 1 -- proto: SpawnPointChemist - entities: - - uid: 2647 - components: - - type: Transform - pos: -18.5,11.5 - parent: 1 -- proto: SpawnPointChiefEngineer - entities: - - uid: 2648 - components: - - type: Transform - pos: 20.5,3.5 - parent: 1 -- proto: SpawnPointChiefMedicalOfficer - entities: - - uid: 2649 - components: - - type: Transform - pos: -21.5,7.5 - parent: 1 -- proto: SpawnPointJanitor - entities: - - uid: 1229 - components: - - type: Transform - pos: -9.5,25.5 - parent: 1 - proto: SpawnPointLatejoin entities: - uid: 2651 @@ -19565,69 +19483,6 @@ entities: - type: Transform pos: 10.5,10.5 parent: 1 -- proto: SpawnPointLawyer - entities: - - uid: 2659 - components: - - type: Transform - pos: 0.5,28.5 - parent: 1 -- proto: SpawnPointMedicalDoctor - entities: - - uid: 2660 - components: - - type: Transform - pos: -27.5,22.5 - parent: 1 -- proto: SpawnPointMercenary - entities: - - uid: 2661 - components: - - type: Transform - pos: -11.5,5.5 - parent: 1 -- proto: SpawnPointMusician - entities: - - uid: 2662 - components: - - type: Transform - pos: -4.5,12.5 - parent: 1 -- proto: SpawnPointPilot - entities: - - uid: 1226 - components: - - type: Transform - pos: 6.5,30.5 - parent: 1 -- proto: SpawnPointQuartermaster - entities: - - uid: 2663 - components: - - type: Transform - pos: -2.5,28.5 - parent: 1 -- proto: SpawnPointResearchDirector - entities: - - uid: 2664 - components: - - type: Transform - pos: 5.5,25.5 - parent: 1 -- proto: SpawnPointScientist - entities: - - uid: 1184 - components: - - type: Transform - pos: 27.5,18.5 - parent: 1 -- proto: SpawnPointStationEngineer - entities: - - uid: 2666 - components: - - type: Transform - pos: 21.5,3.5 - parent: 1 - proto: SprayBottleWater entities: - uid: 2667 diff --git a/Resources/Maps/_NF/Shuttles/esquire.yml b/Resources/Maps/_NF/Shuttles/esquire.yml index a2854a17c2f..ef6bfe196e7 100644 --- a/Resources/Maps/_NF/Shuttles/esquire.yml +++ b/Resources/Maps/_NF/Shuttles/esquire.yml @@ -1585,20 +1585,6 @@ entities: - pos: -0.5,8.5 parent: 1 type: Transform -- proto: DonkpocketBoxSpawner - entities: - - uid: 68 - components: - - pos: 3.5,0.5 - parent: 1 - type: Transform -- proto: DrinkSodaWaterCan - entities: - - uid: 22 - components: - - pos: 4.729821,2.6469872 - parent: 1 - type: Transform - proto: DrinkWaterCup entities: - uid: 276 @@ -1725,34 +1711,6 @@ entities: - pos: -1.5,3.5 parent: 1 type: Transform -- proto: FoodBoxDonut - entities: - - uid: 294 - components: - - pos: 3.4641967,2.6282372 - parent: 1 - type: Transform -- proto: FoodDonutChocolate - entities: - - uid: 292 - components: - - pos: 4.1766963,2.496987 - parent: 1 - type: Transform -- proto: FoodDonutHomer - entities: - - uid: 293 - components: - - pos: 3.9610715,2.7876122 - parent: 1 - type: Transform -- proto: FoodDonutPlain - entities: - - uid: 8 - components: - - pos: 4.307946,2.778237 - parent: 1 - type: Transform - proto: GasMixer entities: - uid: 314 @@ -2725,13 +2683,6 @@ entities: - pos: 1.6126454,3.5893645 parent: 1 type: Transform -- proto: KitchenMicrowave - entities: - - uid: 280 - components: - - pos: 3.5,-0.5 - parent: 1 - type: Transform - proto: LampGold entities: - uid: 206 @@ -3094,19 +3045,6 @@ entities: - pos: 2.5,-1.5 parent: 1 type: Transform -- proto: RandomSpawner - entities: - - uid: 20 - components: - - rot: -1.5707963267948966 rad - pos: 5.5,3.5 - parent: 1 - type: Transform - - uid: 621 - components: - - pos: 6.5,1.5 - parent: 1 - type: Transform - proto: ReinforcedWindow entities: - uid: 258 @@ -3262,27 +3200,6 @@ entities: - pos: 0.5,-2.5 parent: 1 type: Transform -- proto: SpawnPointLawyer - entities: - - uid: 607 - components: - - pos: 1.5,4.5 - parent: 1 - type: Transform -- proto: SpawnPointMercenary - entities: - - uid: 483 - components: - - pos: 9.5,-3.5 - parent: 1 - type: Transform -- proto: SpawnPointPilot - entities: - - uid: 590 - components: - - pos: -0.5,7.5 - parent: 1 - type: Transform - proto: SubstationBasic entities: - uid: 178 diff --git a/Resources/Maps/_NF/Shuttles/garden.yml b/Resources/Maps/_NF/Shuttles/garden.yml index f61e5a48d75..4dcc259b511 100644 --- a/Resources/Maps/_NF/Shuttles/garden.yml +++ b/Resources/Maps/_NF/Shuttles/garden.yml @@ -823,13 +823,6 @@ entities: - type: Transform pos: 1.5,7.5 parent: 1 -- proto: FoodSaladFruit - entities: - - uid: 293 - components: - - type: Transform - pos: 0.3030392,4.8030844 - parent: 1 - proto: GasPassiveVent entities: - uid: 110 @@ -1761,13 +1754,6 @@ entities: rot: 3.141592653589793 rad pos: 4.5,-3.5 parent: 1 -- proto: SpawnPointBotanist - entities: - - uid: 261 - components: - - type: Transform - pos: -1.5,5.5 - parent: 1 - proto: SpawnPointLatejoin entities: - uid: 262 @@ -1775,13 +1761,6 @@ entities: - type: Transform pos: 2.5,5.5 parent: 1 -- proto: SpawnPointPilot - entities: - - uid: 264 - components: - - type: Transform - pos: 0.5,5.5 - parent: 1 - proto: SubstationWallBasic entities: - uid: 190 diff --git a/Resources/Maps/_NF/Shuttles/hauler.yml b/Resources/Maps/_NF/Shuttles/hauler.yml index 97c1ceef3fd..52d66d5f930 100644 --- a/Resources/Maps/_NF/Shuttles/hauler.yml +++ b/Resources/Maps/_NF/Shuttles/hauler.yml @@ -923,7 +923,7 @@ entities: - type: Transform pos: -1.5,0.5 parent: 1 -- proto: BedsheetMedical +- proto: BedsheetSpawner entities: - uid: 169 components: @@ -3074,50 +3074,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: FoodSnackChips - entities: - - uid: 662 - components: - - type: MetaData - flags: InContainer - - type: Transform - parent: 64 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: FoodSnackChocolate - entities: - - uid: 789 - components: - - type: MetaData - flags: InContainer - - type: Transform - parent: 64 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: FoodSnackRaisins - entities: - - uid: 889 - components: - - type: MetaData - flags: InContainer - - type: Transform - parent: 64 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: FoodSnackSus - entities: - - uid: 884 - components: - - type: MetaData - flags: InContainer - - type: Transform - parent: 64 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: GasPassiveVent entities: - uid: 934 @@ -4198,13 +4154,6 @@ entities: rot: 3.141592653589793 rad pos: 3.5,21.5 parent: 1 -- proto: KitchenMicrowave - entities: - - uid: 91 - components: - - type: Transform - pos: -3.5,4.5 - parent: 1 - proto: Lighter entities: - uid: 892 @@ -4281,27 +4230,13 @@ entities: - type: Transform pos: -0.5,12.5 parent: 1 -- proto: MedicalBed +- proto: Bed entities: - uid: 487 components: - type: Transform pos: -2.5,24.5 parent: 1 -- proto: MedkitAdvancedFilled - entities: - - uid: 520 - components: - - type: Transform - pos: -4.5700297,24.630707 - parent: 1 -- proto: MedkitFilled - entities: - - uid: 773 - components: - - type: Transform - pos: -4.6656375,25.021152 - parent: 1 - proto: OreBox entities: - uid: 159 @@ -5578,20 +5513,6 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,7.5 parent: 1 -- proto: SpawnPointBartender - entities: - - uid: 786 - components: - - type: Transform - pos: -2.5,8.5 - parent: 1 -- proto: SpawnPointCargoTechnician - entities: - - uid: 657 - components: - - type: Transform - pos: 4.5,7.5 - parent: 1 - proto: SpawnPointLatejoin entities: - uid: 496 @@ -5599,20 +5520,6 @@ entities: - type: Transform pos: -2.5,1.5 parent: 1 -- proto: SpawnPointQuartermaster - entities: - - uid: 810 - components: - - type: Transform - pos: 4.5,8.5 - parent: 1 -- proto: SpawnPointSalvageSpecialist - entities: - - uid: 845 - components: - - type: Transform - pos: 0.5,14.5 - parent: 1 - proto: StoolBar entities: - uid: 178 diff --git a/Resources/Maps/_NF/Shuttles/honker.yml b/Resources/Maps/_NF/Shuttles/honker.yml index efa684463e0..b6a137d0d93 100644 --- a/Resources/Maps/_NF/Shuttles/honker.yml +++ b/Resources/Maps/_NF/Shuttles/honker.yml @@ -1385,13 +1385,6 @@ entities: - type: Transform pos: -0.5,12.5 parent: 2 -- proto: SpawnPointClown - entities: - - uid: 116 - components: - - type: Transform - pos: 2.5,4.5 - parent: 2 - proto: SpawnPointLatejoin entities: - uid: 211 diff --git a/Resources/Maps/_NF/Shuttles/investigator.yml b/Resources/Maps/_NF/Shuttles/investigator.yml index 79aff7fc29b..08cdeffc14d 100644 --- a/Resources/Maps/_NF/Shuttles/investigator.yml +++ b/Resources/Maps/_NF/Shuttles/investigator.yml @@ -2853,13 +2853,6 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,-1.5 parent: 2 -- proto: DonkpocketBoxSpawner - entities: - - uid: 282 - components: - - type: Transform - pos: 7.5,-2.5 - parent: 2 - proto: DrinkGlass entities: - uid: 107 @@ -3597,13 +3590,6 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,0.5 parent: 2 -- proto: KitchenMicrowave - entities: - - uid: 222 - components: - - type: Transform - pos: 9.5,2.5 - parent: 2 - proto: Lamp entities: - uid: 105 @@ -4522,13 +4508,6 @@ entities: - type: Transform pos: 0.5,-8.5 parent: 2 -- proto: SpawnPointBartender - entities: - - uid: 109 - components: - - type: Transform - pos: -3.5,1.5 - parent: 2 - proto: SpawnPointLatejoin entities: - uid: 694 @@ -4536,25 +4515,6 @@ entities: - type: Transform pos: 3.5,-2.5 parent: 2 -- proto: SpawnPointSalvageSpecialist - entities: - - uid: 194 - components: - - type: Transform - pos: 2.5,-2.5 - parent: 2 - - uid: 195 - components: - - type: Transform - pos: 4.5,-2.5 - parent: 2 -- proto: SpawnPointScientist - entities: - - uid: 332 - components: - - type: Transform - pos: 8.5,0.5 - parent: 2 - proto: StoolBar entities: - uid: 100 diff --git a/Resources/Maps/_NF/Shuttles/knuckleverse.yml b/Resources/Maps/_NF/Shuttles/knuckleverse.yml index a1102448c6d..96400378afe 100644 --- a/Resources/Maps/_NF/Shuttles/knuckleverse.yml +++ b/Resources/Maps/_NF/Shuttles/knuckleverse.yml @@ -650,7 +650,7 @@ entities: rot: 1.5707963267948966 rad pos: 3.5,5.5 parent: 1 -- proto: BedsheetMedical +- proto: BedsheetSpawner entities: - uid: 45 components: @@ -1856,32 +1856,6 @@ entities: - type: DeviceNetwork deviceLists: - 3 -- proto: FoodSnackEnergy - entities: - - uid: 273 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -15.728836,2.6801424 - parent: 1 - - uid: 274 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -15.744461,2.3207674 - parent: 1 - - uid: 275 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -15.367756,2.6951714 - parent: 1 - - uid: 276 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -15.352131,2.1951714 - parent: 1 - proto: GasPassiveVent entities: - uid: 277 @@ -2801,7 +2775,7 @@ entities: rot: -1.5707963267948966 rad pos: -3.6449776,-1.0814991 parent: 1 -- proto: MedicalBed +- proto: Bed entities: - uid: 398 components: @@ -2813,20 +2787,6 @@ entities: - type: Transform pos: -12.5,0.5 parent: 1 -- proto: MedkitBruteFilled - entities: - - uid: 143 - components: - - type: Transform - pos: -12.270641,1.615612 - parent: 1 -- proto: MedkitFilled - entities: - - uid: 401 - components: - - type: Transform - pos: -12.80164,1.6445293 - parent: 1 - proto: Mirror entities: - uid: 402 @@ -3249,27 +3209,6 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,3.5 parent: 1 -- proto: SpawnPointBartender - entities: - - uid: 470 - components: - - type: Transform - pos: 0.5,4.5 - parent: 1 -- proto: SpawnPointBoxer - entities: - - uid: 471 - components: - - type: Transform - pos: -16.5,6.5 - parent: 1 -- proto: SpawnPointJanitor - entities: - - uid: 472 - components: - - type: Transform - pos: -4.5,12.5 - parent: 1 - proto: SpawnPointLatejoin entities: - uid: 400 @@ -3277,20 +3216,6 @@ entities: - type: Transform pos: -13.5,5.5 parent: 1 -- proto: SpawnPointMedicalDoctor - entities: - - uid: 473 - components: - - type: Transform - pos: -13.5,1.5 - parent: 1 -- proto: SpawnPointPilot - entities: - - uid: 474 - components: - - type: Transform - pos: -5.5,15.5 - parent: 1 - proto: SprayBottleWater entities: - uid: 475 diff --git a/Resources/Maps/_NF/Shuttles/lantern.yml b/Resources/Maps/_NF/Shuttles/lantern.yml index 4fe5e8aa690..8c67ba52d6f 100644 --- a/Resources/Maps/_NF/Shuttles/lantern.yml +++ b/Resources/Maps/_NF/Shuttles/lantern.yml @@ -3466,35 +3466,6 @@ entities: rot: 3.141592653589793 rad pos: 1.5,-15.5 parent: 1 -- proto: FoodBreadPlain - entities: - - uid: 728 - components: - - type: Transform - pos: 2.720112,-11.290295 - parent: 1 -- proto: FoodBreadPlainSlice - entities: - - uid: 729 - components: - - type: Transform - pos: 2.2826123,-11.33717 - parent: 1 - - uid: 730 - components: - - type: Transform - pos: 2.345112,-11.43092 - parent: 1 - - uid: 731 - components: - - type: Transform - pos: 2.376362,-11.46217 - parent: 1 - - uid: 732 - components: - - type: Transform - pos: 2.485737,-11.477795 - parent: 1 - proto: FoodPlate entities: - uid: 727 diff --git a/Resources/Maps/_NF/Shuttles/mccargo.yml b/Resources/Maps/_NF/Shuttles/mccargo.yml index 986f61d7899..c09e0d6ab1b 100644 --- a/Resources/Maps/_NF/Shuttles/mccargo.yml +++ b/Resources/Maps/_NF/Shuttles/mccargo.yml @@ -3766,14 +3766,6 @@ entities: parent: 1 - type: Fixtures fixtures: {} -- proto: FoodBurgerPlain - entities: - - uid: 706 - components: - - type: Transform - parent: 1081 - - type: Physics - canCollide: False - proto: FoodCartCold entities: - uid: 1013 @@ -3873,14 +3865,6 @@ entities: - type: Transform pos: -0.10305256,2.6391692 parent: 1 -- proto: FoodMealFries - entities: - - uid: 902 - components: - - type: Transform - parent: 1081 - - type: Physics - canCollide: False - proto: FoodPlatePlastic entities: - uid: 89 @@ -6240,46 +6224,6 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,10.5 parent: 1 -- proto: SpawnPointBorg - entities: - - uid: 803 - components: - - type: Transform - pos: -4.5,11.5 - parent: 1 -- proto: SpawnPointBotanist - entities: - - uid: 181 - components: - - type: Transform - pos: -5.5,4.5 - parent: 1 - - uid: 298 - components: - - type: Transform - pos: -6.5,4.5 - parent: 1 -- proto: SpawnPointCargoTechnician - entities: - - uid: 793 - components: - - type: Transform - pos: -5.5,8.5 - parent: 1 -- proto: SpawnPointChef - entities: - - uid: 1071 - components: - - type: Transform - pos: 2.5,6.5 - parent: 1 -- proto: SpawnPointJanitor - entities: - - uid: 602 - components: - - type: Transform - pos: 6.5,14.5 - parent: 1 - proto: SpawnPointLatejoin entities: - uid: 81 @@ -6287,20 +6231,6 @@ entities: - type: Transform pos: 0.5,6.5 parent: 1 -- proto: SpawnPointPilot - entities: - - uid: 997 - components: - - type: Transform - pos: -3.5,14.5 - parent: 1 -- proto: SpawnPointQuartermaster - entities: - - uid: 177 - components: - - type: Transform - pos: -6.5,8.5 - parent: 1 - proto: StoolBar entities: - uid: 59 diff --git a/Resources/Maps/_NF/Shuttles/metastable.yml b/Resources/Maps/_NF/Shuttles/metastable.yml index 9eae8c6f81b..b30c35e2e4b 100644 --- a/Resources/Maps/_NF/Shuttles/metastable.yml +++ b/Resources/Maps/_NF/Shuttles/metastable.yml @@ -6210,7 +6210,7 @@ entities: - type: Transform pos: -0.5,2.5 parent: 2 -- proto: GunSafeShuttleT2Spawner +- proto: GunSafeShuttleCaptain entities: - uid: 523 components: @@ -7368,33 +7368,6 @@ entities: - type: Transform pos: 6.5,9.5 parent: 2 -- proto: RandomSpawner - entities: - - uid: 1220 - components: - - type: Transform - pos: -5.5,-6.5 - parent: 2 - - uid: 1307 - components: - - type: Transform - pos: 7.5,-0.5 - parent: 2 - - uid: 1308 - components: - - type: Transform - pos: -12.5,0.5 - parent: 2 - - uid: 1327 - components: - - type: Transform - pos: -12.5,-1.5 - parent: 2 - - uid: 1353 - components: - - type: Transform - pos: 12.5,-3.5 - parent: 2 - proto: ReinforcedPlasmaWindow entities: - uid: 243 @@ -7922,27 +7895,6 @@ entities: - type: Transform pos: 8.5,-7.5 parent: 2 -- proto: SpawnPointBorg - entities: - - uid: 1454 - components: - - type: Transform - pos: -6.5,-3.5 - parent: 2 -- proto: SpawnPointChef - entities: - - uid: 1452 - components: - - type: Transform - pos: 7.5,-5.5 - parent: 2 -- proto: SpawnPointChemist - entities: - - uid: 1453 - components: - - type: Transform - pos: 0.5,-9.5 - parent: 2 - proto: SpawnPointLatejoin entities: - uid: 1509 @@ -7951,41 +7903,6 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-4.5 parent: 2 -- proto: SpawnPointMedicalDoctor - entities: - - uid: 1455 - components: - - type: Transform - pos: -2.5,-9.5 - parent: 2 -- proto: SpawnPointMercenary - entities: - - uid: 522 - components: - - type: Transform - pos: -3.5,8.5 - parent: 2 -- proto: SpawnPointPilot - entities: - - uid: 526 - components: - - type: Transform - pos: 0.5,-0.5 - parent: 2 -- proto: SpawnPointScientist - entities: - - uid: 1457 - components: - - type: Transform - pos: -8.5,-1.5 - parent: 2 -- proto: SpawnPointStationEngineer - entities: - - uid: 1458 - components: - - type: Transform - pos: 7.5,2.5 - parent: 2 - proto: SprayBottle entities: - uid: 527 diff --git a/Resources/Maps/_NF/Shuttles/mission.yml b/Resources/Maps/_NF/Shuttles/mission.yml index cdaa8c4fc45..81a385ad684 100644 --- a/Resources/Maps/_NF/Shuttles/mission.yml +++ b/Resources/Maps/_NF/Shuttles/mission.yml @@ -958,13 +958,6 @@ entities: parent: 1 - type: Fixtures fixtures: {} -- proto: FoodBreadPlain - entities: - - uid: 167 - components: - - type: Transform - pos: 2.527503,3.6734552 - parent: 1 - proto: GasPassiveVent entities: - uid: 225 @@ -1981,20 +1974,6 @@ entities: - type: Transform pos: -4.5,5.5 parent: 1 -- proto: SpawnPointChaplain - entities: - - uid: 268 - components: - - type: Transform - pos: -5.5,-0.5 - parent: 1 -- proto: SpawnPointJanitor - entities: - - uid: 267 - components: - - type: Transform - pos: 6.5,-0.5 - parent: 1 - proto: SpawnPointLatejoin entities: - uid: 334 @@ -2002,13 +1981,6 @@ entities: - type: Transform pos: 0.5,1.5 parent: 1 -- proto: SpawnPointPilot - entities: - - uid: 144 - components: - - type: Transform - pos: -6.5,5.5 - parent: 1 - proto: SubstationWallBasic entities: - uid: 161 diff --git a/Resources/Maps/_NF/Shuttles/phoenix.yml b/Resources/Maps/_NF/Shuttles/phoenix.yml index 073d9a14330..7a6fbc38777 100644 --- a/Resources/Maps/_NF/Shuttles/phoenix.yml +++ b/Resources/Maps/_NF/Shuttles/phoenix.yml @@ -3093,13 +3093,6 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,6.5 parent: 1 -- proto: DonkpocketBoxSpawner - entities: - - uid: 319 - components: - - type: Transform - pos: 7.5,12.5 - parent: 1 - proto: Drill entities: - uid: 660 @@ -3190,22 +3183,6 @@ entities: - type: Transform pos: 0.5,0.5 parent: 1 -- proto: FoodFrozenSnowconeTrash - entities: - - uid: 655 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -6.3389263,11.280289 - parent: 1 -- proto: FoodTinPeachesMaintTrash - entities: - - uid: 654 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -9.666124,9.632858 - parent: 1 - proto: GasCanisterBrokenBase entities: - uid: 649 @@ -4592,13 +4569,6 @@ entities: rot: 3.141592653589793 rad pos: -4.5,-1.5 parent: 1 -- proto: KitchenMicrowave - entities: - - uid: 317 - components: - - type: Transform - pos: 8.5,12.5 - parent: 1 - proto: KitchenReagentGrinder entities: - uid: 643 @@ -5009,18 +4979,6 @@ entities: - type: Transform pos: 12.5,9.5 parent: 1 -- proto: RandomSpawner - entities: - - uid: 656 - components: - - type: Transform - pos: -5.5,10.5 - parent: 1 - - uid: 657 - components: - - type: Transform - pos: -4.5,7.5 - parent: 1 - proto: ReinforcedPlasmaWindow entities: - uid: 52 @@ -5635,13 +5593,6 @@ entities: - type: Transform pos: 14.5,14.5 parent: 1 -- proto: SpawnPointCaptain - entities: - - uid: 680 - components: - - type: Transform - pos: 11.5,11.5 - parent: 1 - proto: SpawnPointLatejoin entities: - uid: 705 @@ -5654,34 +5605,6 @@ entities: - type: Transform pos: 8.5,11.5 parent: 1 -- proto: SpawnPointPilot - entities: - - uid: 878 - components: - - type: Transform - pos: 10.5,11.5 - parent: 1 -- proto: SpawnPointResearchDirector - entities: - - uid: 703 - components: - - type: Transform - pos: 7.5,11.5 - parent: 1 -- proto: SpawnPointSalvageSpecialist - entities: - - uid: 704 - components: - - type: Transform - pos: -3.5,7.5 - parent: 1 -- proto: SpawnPointScientist - entities: - - uid: 697 - components: - - type: Transform - pos: 4.5,4.5 - parent: 1 - proto: StorageCanister entities: - uid: 702 diff --git a/Resources/Maps/_NF/Shuttles/piecrust.yml b/Resources/Maps/_NF/Shuttles/piecrust.yml index 5d48045a024..d45f3a1f0c5 100644 --- a/Resources/Maps/_NF/Shuttles/piecrust.yml +++ b/Resources/Maps/_NF/Shuttles/piecrust.yml @@ -1983,13 +1983,6 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,2.5 parent: 8756 -- proto: SpawnPointChef - entities: - - uid: 303 - components: - - type: Transform - pos: 0.5,3.5 - parent: 8756 - proto: SpawnPointLatejoin entities: - uid: 306 @@ -1997,13 +1990,6 @@ entities: - type: Transform pos: 5.5,1.5 parent: 8756 -- proto: SpawnPointPilot - entities: - - uid: 304 - components: - - type: Transform - pos: 3.5,6.5 - parent: 8756 - proto: StoolBar entities: - uid: 98 diff --git a/Resources/Maps/_NF/Shuttles/placebo.yml b/Resources/Maps/_NF/Shuttles/placebo.yml index 80a4fdd6f02..a8653b7c80d 100644 --- a/Resources/Maps/_NF/Shuttles/placebo.yml +++ b/Resources/Maps/_NF/Shuttles/placebo.yml @@ -1734,13 +1734,6 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,3.5 parent: 1 -- proto: SpawnPointPsychologist - entities: - - uid: 122 - components: - - type: Transform - pos: -3.5,8.5 - parent: 1 - proto: SubstationBasic entities: - uid: 25 diff --git a/Resources/Maps/_NF/Shuttles/prospector.yml b/Resources/Maps/_NF/Shuttles/prospector.yml index 4f2810b8449..357fb3144c3 100644 --- a/Resources/Maps/_NF/Shuttles/prospector.yml +++ b/Resources/Maps/_NF/Shuttles/prospector.yml @@ -1504,13 +1504,6 @@ entities: - pos: 0.5,-5.5 parent: 201 type: Transform -- proto: SpawnPointSalvageSpecialist - entities: - - uid: 173 - components: - - pos: -1.5,-4.5 - parent: 201 - type: Transform - proto: SubstationBasic entities: - uid: 85 diff --git a/Resources/Maps/_NF/Shuttles/pts.yml b/Resources/Maps/_NF/Shuttles/pts.yml index 7f5b2bf14e7..0085cb314a6 100644 --- a/Resources/Maps/_NF/Shuttles/pts.yml +++ b/Resources/Maps/_NF/Shuttles/pts.yml @@ -1123,13 +1123,6 @@ entities: - pos: -1.5,-5.5 parent: 8756 type: Transform -- proto: SpawnPointAssistant - entities: - - uid: 7 - components: - - pos: -0.5,0.5 - parent: 8756 - type: Transform - proto: SpawnPointLatejoin entities: - uid: 6 @@ -1137,13 +1130,6 @@ entities: - pos: -0.5,-1.5 parent: 8756 type: Transform -- proto: SpawnPointPilot - entities: - - uid: 67 - components: - - pos: -0.5,2.5 - parent: 8756 - type: Transform - proto: SubstationWallBasic entities: - uid: 8818 diff --git a/Resources/Maps/_NF/Shuttles/pulse.yml b/Resources/Maps/_NF/Shuttles/pulse.yml index 6402eff268a..fb8ce022459 100644 --- a/Resources/Maps/_NF/Shuttles/pulse.yml +++ b/Resources/Maps/_NF/Shuttles/pulse.yml @@ -1378,20 +1378,6 @@ entities: - pos: -0.5,2.5 parent: 1 type: Transform -- proto: SpawnPointParamedic - entities: - - uid: 203 - components: - - pos: 0.5,-0.5 - parent: 1 - type: Transform -- proto: SpawnPointPilot - entities: - - uid: 111 - components: - - pos: 2.5,0.5 - parent: 1 - type: Transform - proto: SubstationWallBasic entities: - uid: 141 diff --git a/Resources/Maps/_NF/Shuttles/rosebudmki.yml b/Resources/Maps/_NF/Shuttles/rosebudmki.yml index 01909d0f733..bb47a7fbc5f 100644 --- a/Resources/Maps/_NF/Shuttles/rosebudmki.yml +++ b/Resources/Maps/_NF/Shuttles/rosebudmki.yml @@ -1706,7 +1706,7 @@ entities: pos: -10.5,2.5 parent: 1 type: Transform -- proto: BedsheetMedical +- proto: BedsheetSpawner entities: - uid: 190 components: @@ -3635,7 +3635,7 @@ entities: pos: 6.483588,2.141698 parent: 1 type: Transform -- proto: chem_master +- proto: MachineFrame entities: - uid: 26 components: @@ -4436,23 +4436,6 @@ entities: type: Transform - fixtures: {} type: Fixtures -- proto: FoodBakedCookie - entities: - - uid: 60 - components: - - pos: 6.3913617,2.0044975 - parent: 1 - type: Transform - - uid: 65 - components: - - pos: 6.6257367,1.934185 - parent: 1 - type: Transform - - uid: 75 - components: - - pos: 6.4499555,1.88731 - parent: 1 - type: Transform - proto: FoodPlate entities: - uid: 61 @@ -5591,7 +5574,7 @@ entities: - pos: 11.5,8.5 parent: 1 type: Transform -- proto: LockerMedicalFilled +- proto: LockerMedical entities: - uid: 130 components: @@ -5623,7 +5606,7 @@ entities: - 0 - 0 type: EntityStorage -- proto: MedicalBed +- proto: Bed entities: - uid: 206 components: @@ -5635,20 +5618,6 @@ entities: - pos: -5.5,0.5 parent: 1 type: Transform -- proto: MedkitAdvancedFilled - entities: - - uid: 1351 - components: - - pos: -8.571821,3.8535028 - parent: 1 - type: Transform -- proto: MedkitToxinFilled - entities: - - uid: 976 - components: - - pos: -8.642134,3.4433465 - parent: 1 - type: Transform - proto: Morgue entities: - uid: 175 @@ -7473,13 +7442,6 @@ entities: - pos: 4.5,-1.5 parent: 1 type: Transform -- proto: SpawnPointChemist - entities: - - uid: 586 - components: - - pos: -6.5,9.5 - parent: 1 - type: Transform - proto: SpawnPointLatejoin entities: - uid: 737 @@ -7488,34 +7450,6 @@ entities: pos: 0.5,8.5 parent: 1 type: Transform -- proto: SpawnPointMedicalDoctor - entities: - - uid: 1216 - components: - - pos: -6.5,2.5 - parent: 1 - type: Transform -- proto: SpawnPointPilot - entities: - - uid: 729 - components: - - pos: 0.5,2.5 - parent: 1 - type: Transform -- proto: SpawnPointSalvageSpecialist - entities: - - uid: 645 - components: - - pos: 12.5,3.5 - parent: 1 - type: Transform -- proto: SpawnPointStationEngineer - entities: - - uid: 115 - components: - - pos: 12.5,7.5 - parent: 1 - type: Transform - proto: SubstationBasic entities: - uid: 88 @@ -7914,7 +7848,7 @@ entities: - Right: Reverse - Middle: Off type: DeviceLinkSource -- proto: VendingMachineChemicals +- proto: MachineFrame entities: - uid: 1354 components: diff --git a/Resources/Maps/_NF/Shuttles/skipper.yml b/Resources/Maps/_NF/Shuttles/skipper.yml index 6ade944be97..2533ef3c633 100644 --- a/Resources/Maps/_NF/Shuttles/skipper.yml +++ b/Resources/Maps/_NF/Shuttles/skipper.yml @@ -2819,20 +2819,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,5.5 parent: 1 -- proto: SpawnPointBotanist - entities: - - uid: 39 - components: - - type: Transform - pos: 0.5,6.5 - parent: 1 -- proto: SpawnPointChef - entities: - - uid: 296 - components: - - type: Transform - pos: -1.5,1.5 - parent: 1 - proto: SpawnPointLatejoin entities: - uid: 298 diff --git a/Resources/Maps/_NF/Shuttles/sparrow.yml b/Resources/Maps/_NF/Shuttles/sparrow.yml index ec44f2a3fc2..33fd261235b 100644 --- a/Resources/Maps/_NF/Shuttles/sparrow.yml +++ b/Resources/Maps/_NF/Shuttles/sparrow.yml @@ -2147,20 +2147,6 @@ entities: - type: Transform pos: 0.5,2.5 parent: 174 -- proto: SpawnPointScientist - entities: - - uid: 323 - components: - - type: Transform - pos: -3.5,1.5 - parent: 174 -- proto: SpawnPointStationEngineer - entities: - - uid: 249 - components: - - type: Transform - pos: 4.5,1.5 - parent: 174 - proto: StorageCanister entities: - uid: 203 diff --git a/Resources/Maps/_NF/Shuttles/spectre.yml b/Resources/Maps/_NF/Shuttles/spectre.yml index 76364c0eaac..8f8a55bdd20 100644 --- a/Resources/Maps/_NF/Shuttles/spectre.yml +++ b/Resources/Maps/_NF/Shuttles/spectre.yml @@ -4331,13 +4331,6 @@ entities: - type: Transform pos: -4.5,-0.5 parent: 3 -- proto: FoodBurgerRobot - entities: - - uid: 642 - components: - - type: Transform - pos: -4.5,0.5 - parent: 3 - proto: GasMixer entities: - uid: 455 @@ -6085,13 +6078,6 @@ entities: - type: Transform pos: -0.5,20.5 parent: 3 -- proto: KitchenMicrowave - entities: - - uid: 557 - components: - - type: Transform - pos: 2.5,13.5 - parent: 3 - proto: LockerCaptainFilled entities: - uid: 1252 @@ -6527,20 +6513,6 @@ entities: - type: Transform pos: -0.5,12.5 parent: 3 -- proto: RandomFoodMeal - entities: - - uid: 1002 - components: - - type: Transform - pos: 2.5,12.5 - parent: 3 -- proto: RandomFoodSingle - entities: - - uid: 1078 - components: - - type: Transform - pos: 2.5,11.5 - parent: 3 - proto: RandomPosterContraband entities: - uid: 1228 @@ -6600,90 +6572,6 @@ entities: - type: Transform pos: 3.5,15.5 parent: 3 -- proto: RandomSpawner - entities: - - uid: 1016 - components: - - type: Transform - pos: 1.5,16.5 - parent: 3 - - uid: 1212 - components: - - type: Transform - pos: -10.5,0.5 - parent: 3 - - uid: 1217 - components: - - type: Transform - pos: 5.5,5.5 - parent: 3 - - uid: 1218 - components: - - type: Transform - pos: 5.5,4.5 - parent: 3 - - uid: 1219 - components: - - type: Transform - pos: 0.5,-5.5 - parent: 3 - - uid: 1220 - components: - - type: Transform - pos: 12.5,3.5 - parent: 3 - - uid: 1221 - components: - - type: Transform - pos: -0.5,15.5 - parent: 3 -- proto: RandomSpawner100 - entities: - - uid: 650 - components: - - type: Transform - pos: 12.5,5.5 - parent: 3 - - uid: 651 - components: - - type: Transform - pos: 1.5,11.5 - parent: 3 - - uid: 1185 - components: - - type: Transform - pos: -4.5,5.5 - parent: 3 - - uid: 1186 - components: - - type: Transform - pos: 12.5,-2.5 - parent: 3 - - uid: 1187 - components: - - type: Transform - pos: 10.5,-1.5 - parent: 3 - - uid: 1188 - components: - - type: Transform - pos: 6.5,9.5 - parent: 3 - - uid: 1189 - components: - - type: Transform - pos: -9.5,-1.5 - parent: 3 - - uid: 1190 - components: - - type: Transform - pos: -0.5,13.5 - parent: 3 - - uid: 1202 - components: - - type: Transform - pos: 2.5,17.5 - parent: 3 - proto: ReinforcedPlasmaWindow entities: - uid: 199 @@ -7239,13 +7127,6 @@ entities: - type: Transform pos: 0.5,14.5 parent: 3 -- proto: SpawnPointBartender - entities: - - uid: 528 - components: - - type: Transform - pos: -1.5,11.5 - parent: 3 - proto: SpawnPointLatejoin entities: - uid: 1339 @@ -7253,25 +7134,6 @@ entities: - type: Transform pos: -11.5,4.5 parent: 3 -- proto: SpawnPointScientist - entities: - - uid: 546 - components: - - type: Transform - pos: 7.5,-0.5 - parent: 3 - - uid: 1088 - components: - - type: Transform - pos: -6.5,-0.5 - parent: 3 -- proto: SpawnPointStationEngineer - entities: - - uid: 415 - components: - - type: Transform - pos: 2.5,-1.5 - parent: 3 - proto: StoolBar entities: - uid: 543 diff --git a/Resources/Maps/_NF/Shuttles/stellaris.yml b/Resources/Maps/_NF/Shuttles/stellaris.yml index 2edfd4b9552..c12ed5dc3f0 100644 --- a/Resources/Maps/_NF/Shuttles/stellaris.yml +++ b/Resources/Maps/_NF/Shuttles/stellaris.yml @@ -1966,13 +1966,6 @@ entities: - type: Transform pos: 3.648841,4.382324 parent: 1 -- proto: FoodBoxDonut - entities: - - uid: 612 - components: - - type: Transform - pos: 1.7737156,7.8469253 - parent: 1 - proto: FoodPlateTin entities: - uid: 607 @@ -3648,20 +3641,6 @@ entities: - type: Transform pos: 0.5,11.5 parent: 1 -- proto: SpawnPointChef - entities: - - uid: 415 - components: - - type: Transform - pos: 0.5,-7.5 - parent: 1 -- proto: SpawnPointClown - entities: - - uid: 412 - components: - - type: Transform - pos: 0.5,6.5 - parent: 1 - proto: SpawnPointLatejoin entities: - uid: 440 @@ -3684,20 +3663,6 @@ entities: - type: Transform pos: 0.5,5.5 parent: 1 -- proto: SpawnPointMime - entities: - - uid: 413 - components: - - type: Transform - pos: 1.5,6.5 - parent: 1 -- proto: SpawnPointMusician - entities: - - uid: 414 - components: - - type: Transform - pos: -0.5,6.5 - parent: 1 - proto: StairStage entities: - uid: 115 diff --git a/Resources/Maps/_NF/Shuttles/stratos.yml b/Resources/Maps/_NF/Shuttles/stratos.yml index 8c855ceca82..5524afe83fd 100644 --- a/Resources/Maps/_NF/Shuttles/stratos.yml +++ b/Resources/Maps/_NF/Shuttles/stratos.yml @@ -3326,13 +3326,6 @@ entities: deviceLists: - 838 - 1051 - - proto: FoodBoxDonkpocketPizza - entities: - - uid: 11 - components: - - type: Transform - pos: 6.6362467,11.607235 - parent: 1 - proto: GasPassiveVent entities: - uid: 351 @@ -5366,13 +5359,6 @@ entities: - type: Transform pos: 4.5,12.5 parent: 1 - - proto: RandomFoodSingle - entities: - - uid: 4 - components: - - type: Transform - pos: 4.5,13.5 - parent: 1 - proto: RandomPainting entities: - uid: 909 @@ -5848,20 +5834,6 @@ entities: - type: Transform pos: 0.50327635,8.438866 parent: 1 - - proto: SpawnPointBartender - entities: - - uid: 1022 - components: - - type: Transform - pos: 5.5,11.5 - parent: 1 - - proto: SpawnPointCaptain - entities: - - uid: 408 - components: - - type: Transform - pos: 0.5,19.5 - parent: 1 - proto: SpawnPointLatejoin entities: - uid: 588 @@ -5869,27 +5841,6 @@ entities: - type: Transform pos: 3.5,9.5 parent: 1 - - proto: SpawnPointSalvageSpecialist - entities: - - uid: 1023 - components: - - type: Transform - pos: -7.5,23.5 - parent: 1 - - proto: SpawnPointScientist - entities: - - uid: 1033 - components: - - type: Transform - pos: -4.5,6.5 - parent: 1 - - proto: SpawnPointStationEngineer - entities: - - uid: 1025 - components: - - type: Transform - pos: 8.5,8.5 - parent: 1 - proto: StoolBar entities: - uid: 547 diff --git a/Resources/Maps/_NF/Shuttles/vagabond.yml b/Resources/Maps/_NF/Shuttles/vagabond.yml index 724cb6142b2..0fc18de832d 100644 --- a/Resources/Maps/_NF/Shuttles/vagabond.yml +++ b/Resources/Maps/_NF/Shuttles/vagabond.yml @@ -2995,14 +2995,6 @@ entities: parent: 1 - type: Fixtures fixtures: {} -- proto: FoodBoxDonkpocket - entities: - - uid: 596 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -7.5,0.5 - parent: 1 - proto: FoodPlateSmall entities: - uid: 252 @@ -4082,13 +4074,6 @@ entities: - type: Transform pos: -4.5,13.5 parent: 1 -- proto: KitchenMicrowave - entities: - - uid: 259 - components: - - type: Transform - pos: -8.5,2.5 - parent: 1 - proto: LockerCaptainFilled entities: - uid: 72 @@ -4171,7 +4156,7 @@ entities: - type: Transform pos: 0.5,2.5 parent: 1 -- proto: LockerWallMedicalFilled +- proto: LockerWallMedical entities: - uid: 682 components: @@ -4591,13 +4576,6 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,1.5 parent: 1 -- proto: RandomSpawner100 - entities: - - uid: 260 - components: - - type: Transform - pos: -7.5,1.5 - parent: 1 - proto: ReinforcedWindow entities: - uid: 21 @@ -4829,13 +4807,6 @@ entities: rot: -1.5707963267948966 rad pos: -3.5,17.5 parent: 1 -- proto: SpawnPointCargoTechnician - entities: - - uid: 717 - components: - - type: Transform - pos: -8.5,-2.5 - parent: 1 - proto: SpawnPointLatejoin entities: - uid: 719 @@ -4843,27 +4814,6 @@ entities: - type: Transform pos: -9.5,0.5 parent: 1 -- proto: SpawnPointQuartermaster - entities: - - uid: 716 - components: - - type: Transform - pos: -8.5,3.5 - parent: 1 -- proto: SpawnPointSalvageSpecialist - entities: - - uid: 715 - components: - - type: Transform - pos: 1.5,1.5 - parent: 1 -- proto: SpawnPointStationEngineer - entities: - - uid: 718 - components: - - type: Transform - pos: -1.5,9.5 - parent: 1 - proto: SubstationBasic entities: - uid: 435 diff --git a/Resources/Maps/_NF/Shuttles/waveshot.yml b/Resources/Maps/_NF/Shuttles/waveshot.yml index c9d358a62a2..b601bb22c2a 100644 --- a/Resources/Maps/_NF/Shuttles/waveshot.yml +++ b/Resources/Maps/_NF/Shuttles/waveshot.yml @@ -1499,13 +1499,6 @@ entities: - ShutdownSubscribers: - 259 type: DeviceNetwork -- proto: FoodBoxDonut - entities: - - uid: 406 - components: - - pos: 2.493779,14.6571 - parent: 1 - type: Transform - proto: FoodPlateTin entities: - uid: 274 @@ -2925,20 +2918,6 @@ entities: pos: -1.5,6.5 parent: 1 type: Transform -- proto: SpawnPointPilot - entities: - - uid: 201 - components: - - pos: 0.5,15.5 - parent: 1 - type: Transform -- proto: SpawnPointReporter - entities: - - uid: 186 - components: - - pos: 2.5,6.5 - parent: 1 - type: Transform - proto: SubstationWallBasic entities: - uid: 183