From fad71486d554a4ba9951dacbc6d8244877b3b284 Mon Sep 17 00:00:00 2001 From: Vape <76235372+Vapetastic-Gaming@users.noreply.github.com> Date: Sat, 18 Oct 2025 22:03:13 -0400 Subject: [PATCH] Organizing Shuttle Folder (#4549) * Reuploading PR, it is readie * Some convention fixes * Rename the file again Signed-off-by: Vape <76235372+Vapetastic-Gaming@users.noreply.github.com> --------- Signed-off-by: Vape <76235372+Vapetastic-Gaming@users.noreply.github.com> --- .../StationExfiltrationComponent.cs | 2 +- .../_DV/Shuttles/{ => Admin}/dreadnought.yml | 0 .../Shuttles/{ => Admin}/recruiter_ship.yml | 0 .../{ => Admin}/roboneuroticist_ship.yml | 0 .../{ => Admin}/syndicate_dropship.yml | 0 .../Maps/_DV/Shuttles/{ => Admin}/trader.yml | 0 .../Maps/_DV/Shuttles/{ => Cargo}/cargo.yml | 0 .../cargo_model_b.yml} | 0 .../ntcs_duster.yml} | 0 .../{NTES_Basu.yml => Evac/ntes_basu.yml} | 0 .../{NTES_BC20.yml => Evac/ntes_bc20.yml} | 0 .../{NTES_Box.yml => Evac/ntes_box.yml} | 0 .../ntes_centipede.yml} | 0 .../{NTES_Delta.yml => Evac/ntes_delta.yml} | 0 .../ntes_fishbowl.yml} | 0 .../{NTES_Kaeri.yml => Evac/ntes_kaeri.yml} | 0 .../{NTES_Lox.yml => Evac/ntes_lox.yml} | 0 .../ntes_propeller.yml} | 0 .../{NTES_Right.yml => Evac/ntes_right.yml} | 0 .../{NTES_Seal.yml => Evac/ntes_seal.yml} | 0 .../{NTES_Titan.yml => Evac/ntes_titan.yml} | 0 .../ntes_transport.yml} | 0 .../{NTES_UCLB.yml => Evac/ntes_uclb.yml} | 0 .../{NTES_Vertex.yml => Evac/ntes_vertex.yml} | 0 .../ntes_yggdrasil.yml} | 0 .../Maps/_DV/Shuttles/{ => Event}/census.yml | 0 .../Maps/_DV/Shuttles/{ => Event}/haibu.yml | 0 .../Maps/_DV/Shuttles/{ => Event}/hammer.yml | 0 .../Shuttles/{ => Event}/lost_cargo_dv.yml | 0 .../_DV/Shuttles/{ => Event}/strongbox.yml | 0 .../syndie_evacpod.yml | 0 .../Shuttles/{ => Event}/synthesis_ship.yml | 0 .../{ => Event}/traveling_cuisines_dv.yml | 0 .../_DV/Shuttles/{ => Misc}/exfiltration.yml | 0 .../{ => Misc}/glacier_surface_shuttle.yml | 0 .../Maps/_DV/Shuttles/{ => Misc}/mining.yml | 0 .../Shuttles/{ => Misc}/sub_escape_pod.yml | 0 .../_DV/Shuttles/{ => Shipyard}/barge.yml | 0 .../_DV/Shuttles/{ => Shipyard}/helix.yml | 0 .../Shuttles/{ => Shipyard}/ntcv-nomad.yml | 0 .../Shuttles/{ => Shipyard}/ntsp-bulwark.yml | 0 .../_DV/Shuttles/{ => Shipyard}/ntsv-tote.yml | 0 .../_DV/Shuttles/{ => Shipyard}/ntv-pulse.yml | 0 .../Shuttles/{ => Shipyard}/ntxr-saucer.yml | 0 .../Shuttles/{ => Shipyard}/prospector.yml | 0 .../Maps/_DV/Shuttles/{ => Shipyard}/pts.yml | 0 .../ussps_eden.yml} | 0 .../ussps_miriam.yml} | 0 .../ussps_orit.yml} | 0 .../Prototypes/Entities/Stations/base.yml | 2 +- Resources/Prototypes/GameRules/events.yml | 2 +- Resources/Prototypes/Maps/ArenaMedieval.yml | 4 ++-- Resources/Prototypes/Maps/arena.yml | 4 ++-- Resources/Prototypes/Maps/asterisk.yml | 2 +- Resources/Prototypes/Maps/byoin.yml | 2 +- Resources/Prototypes/Maps/division.yml | 2 +- Resources/Prototypes/Maps/edge.yml | 2 +- Resources/Prototypes/Maps/elegance.yml | 2 +- Resources/Prototypes/Maps/glacier.yml | 2 +- Resources/Prototypes/Maps/hammurabi.yml | 2 +- Resources/Prototypes/Maps/hive.yml | 2 +- Resources/Prototypes/Maps/lighthouse.yml | 2 +- Resources/Prototypes/Maps/pebble.yml | 2 +- Resources/Prototypes/Maps/shoukou.yml | 2 +- Resources/Prototypes/Maps/submarine.yml | 4 ++-- Resources/Prototypes/Maps/terra.yml | 4 ++-- Resources/Prototypes/Maps/tortuga.yml | 4 ++-- .../Shuttles/shuttle_incoming_event.yml | 6 +++--- .../_DV/Catalog/Shipyard/civilian.yml | 20 +++++++++---------- .../_DV/Catalog/Shipyard/experimental.yml | 2 +- .../_DV/Catalog/Shipyard/military.yml | 2 +- .../Structures/Doors/Airlocks/access.yml | 6 +++--- Resources/Prototypes/_DV/GameRules/events.yml | 2 +- Resources/Prototypes/_DV/Mapping/maps.yml | 14 ++++++------- .../Prototypes/_DV/Shuttles/armsdealer.yml | 2 +- .../Prototypes/_DV/Shuttles/recruiter.yml | 2 +- .../Prototypes/_DV/Shuttles/synthesis.yml | 2 +- 77 files changed, 53 insertions(+), 53 deletions(-) rename Resources/Maps/_DV/Shuttles/{ => Admin}/dreadnought.yml (100%) rename Resources/Maps/_DV/Shuttles/{ => Admin}/recruiter_ship.yml (100%) rename Resources/Maps/_DV/Shuttles/{ => Admin}/roboneuroticist_ship.yml (100%) rename Resources/Maps/_DV/Shuttles/{ => Admin}/syndicate_dropship.yml (100%) rename Resources/Maps/_DV/Shuttles/{ => Admin}/trader.yml (100%) rename Resources/Maps/_DV/Shuttles/{ => Cargo}/cargo.yml (100%) rename Resources/Maps/_DV/Shuttles/{cargo_model_B.yml => Cargo/cargo_model_b.yml} (100%) rename Resources/Maps/_DV/Shuttles/{NTCS_Duster.yml => Cargo/ntcs_duster.yml} (100%) rename Resources/Maps/_DV/Shuttles/{NTES_Basu.yml => Evac/ntes_basu.yml} (100%) rename Resources/Maps/_DV/Shuttles/{NTES_BC20.yml => Evac/ntes_bc20.yml} (100%) rename Resources/Maps/_DV/Shuttles/{NTES_Box.yml => Evac/ntes_box.yml} (100%) rename Resources/Maps/_DV/Shuttles/{NTES_Centipede.yml => Evac/ntes_centipede.yml} (100%) rename Resources/Maps/_DV/Shuttles/{NTES_Delta.yml => Evac/ntes_delta.yml} (100%) rename Resources/Maps/_DV/Shuttles/{NTES_Fishbowl.yml => Evac/ntes_fishbowl.yml} (100%) rename Resources/Maps/_DV/Shuttles/{NTES_Kaeri.yml => Evac/ntes_kaeri.yml} (100%) rename Resources/Maps/_DV/Shuttles/{NTES_Lox.yml => Evac/ntes_lox.yml} (100%) rename Resources/Maps/_DV/Shuttles/{NTES_Propeller.yml => Evac/ntes_propeller.yml} (100%) rename Resources/Maps/_DV/Shuttles/{NTES_Right.yml => Evac/ntes_right.yml} (100%) rename Resources/Maps/_DV/Shuttles/{NTES_Seal.yml => Evac/ntes_seal.yml} (100%) rename Resources/Maps/_DV/Shuttles/{NTES_Titan.yml => Evac/ntes_titan.yml} (100%) rename Resources/Maps/_DV/Shuttles/{NTES_Transport.yml => Evac/ntes_transport.yml} (100%) rename Resources/Maps/_DV/Shuttles/{NTES_UCLB.yml => Evac/ntes_uclb.yml} (100%) rename Resources/Maps/_DV/Shuttles/{NTES_Vertex.yml => Evac/ntes_vertex.yml} (100%) rename Resources/Maps/_DV/Shuttles/{NTES_Yggdrasil.yml => Evac/ntes_yggdrasil.yml} (100%) rename Resources/Maps/_DV/Shuttles/{ => Event}/census.yml (100%) rename Resources/Maps/_DV/Shuttles/{ => Event}/haibu.yml (100%) rename Resources/Maps/_DV/Shuttles/{ => Event}/hammer.yml (100%) rename Resources/Maps/_DV/Shuttles/{ => Event}/lost_cargo_dv.yml (100%) rename Resources/Maps/_DV/Shuttles/{ => Event}/strongbox.yml (100%) rename Resources/Maps/_DV/Shuttles/{ShuttleEvent => Event}/syndie_evacpod.yml (100%) rename Resources/Maps/_DV/Shuttles/{ => Event}/synthesis_ship.yml (100%) rename Resources/Maps/_DV/Shuttles/{ => Event}/traveling_cuisines_dv.yml (100%) rename Resources/Maps/_DV/Shuttles/{ => Misc}/exfiltration.yml (100%) rename Resources/Maps/_DV/Shuttles/{ => Misc}/glacier_surface_shuttle.yml (100%) rename Resources/Maps/_DV/Shuttles/{ => Misc}/mining.yml (100%) rename Resources/Maps/_DV/Shuttles/{ => Misc}/sub_escape_pod.yml (100%) rename Resources/Maps/_DV/Shuttles/{ => Shipyard}/barge.yml (100%) rename Resources/Maps/_DV/Shuttles/{ => Shipyard}/helix.yml (100%) rename Resources/Maps/_DV/Shuttles/{ => Shipyard}/ntcv-nomad.yml (100%) rename Resources/Maps/_DV/Shuttles/{ => Shipyard}/ntsp-bulwark.yml (100%) rename Resources/Maps/_DV/Shuttles/{ => Shipyard}/ntsv-tote.yml (100%) rename Resources/Maps/_DV/Shuttles/{ => Shipyard}/ntv-pulse.yml (100%) rename Resources/Maps/_DV/Shuttles/{ => Shipyard}/ntxr-saucer.yml (100%) rename Resources/Maps/_DV/Shuttles/{ => Shipyard}/prospector.yml (100%) rename Resources/Maps/_DV/Shuttles/{ => Shipyard}/pts.yml (100%) rename Resources/Maps/_DV/Shuttles/{USSPS_Eden.yml => Shipyard/ussps_eden.yml} (100%) rename Resources/Maps/_DV/Shuttles/{USSPS_Miriam.yml => Shipyard/ussps_miriam.yml} (100%) rename Resources/Maps/_DV/Shuttles/{USSPS_Orit.yml => Shipyard/ussps_orit.yml} (100%) diff --git a/Content.Server/_DV/Station/Components/StationExfiltrationComponent.cs b/Content.Server/_DV/Station/Components/StationExfiltrationComponent.cs index d181f7bd11d..26aeb720209 100644 --- a/Content.Server/_DV/Station/Components/StationExfiltrationComponent.cs +++ b/Content.Server/_DV/Station/Components/StationExfiltrationComponent.cs @@ -58,7 +58,7 @@ public sealed partial class StationExfiltrationComponent : Component /// The map to spawn for the shuttle /// [DataField] - public ResPath ShuttlePath = new("/Maps/_DV/Shuttles/exfiltration.yml"); + public ResPath ShuttlePath = new("/Maps/_DV/Shuttles/Misc/exfiltration.yml"); /// /// The spawned shuttle diff --git a/Resources/Maps/_DV/Shuttles/dreadnought.yml b/Resources/Maps/_DV/Shuttles/Admin/dreadnought.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/dreadnought.yml rename to Resources/Maps/_DV/Shuttles/Admin/dreadnought.yml diff --git a/Resources/Maps/_DV/Shuttles/recruiter_ship.yml b/Resources/Maps/_DV/Shuttles/Admin/recruiter_ship.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/recruiter_ship.yml rename to Resources/Maps/_DV/Shuttles/Admin/recruiter_ship.yml diff --git a/Resources/Maps/_DV/Shuttles/roboneuroticist_ship.yml b/Resources/Maps/_DV/Shuttles/Admin/roboneuroticist_ship.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/roboneuroticist_ship.yml rename to Resources/Maps/_DV/Shuttles/Admin/roboneuroticist_ship.yml diff --git a/Resources/Maps/_DV/Shuttles/syndicate_dropship.yml b/Resources/Maps/_DV/Shuttles/Admin/syndicate_dropship.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/syndicate_dropship.yml rename to Resources/Maps/_DV/Shuttles/Admin/syndicate_dropship.yml diff --git a/Resources/Maps/_DV/Shuttles/trader.yml b/Resources/Maps/_DV/Shuttles/Admin/trader.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/trader.yml rename to Resources/Maps/_DV/Shuttles/Admin/trader.yml diff --git a/Resources/Maps/_DV/Shuttles/cargo.yml b/Resources/Maps/_DV/Shuttles/Cargo/cargo.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/cargo.yml rename to Resources/Maps/_DV/Shuttles/Cargo/cargo.yml diff --git a/Resources/Maps/_DV/Shuttles/cargo_model_B.yml b/Resources/Maps/_DV/Shuttles/Cargo/cargo_model_b.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/cargo_model_B.yml rename to Resources/Maps/_DV/Shuttles/Cargo/cargo_model_b.yml diff --git a/Resources/Maps/_DV/Shuttles/NTCS_Duster.yml b/Resources/Maps/_DV/Shuttles/Cargo/ntcs_duster.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/NTCS_Duster.yml rename to Resources/Maps/_DV/Shuttles/Cargo/ntcs_duster.yml diff --git a/Resources/Maps/_DV/Shuttles/NTES_Basu.yml b/Resources/Maps/_DV/Shuttles/Evac/ntes_basu.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/NTES_Basu.yml rename to Resources/Maps/_DV/Shuttles/Evac/ntes_basu.yml diff --git a/Resources/Maps/_DV/Shuttles/NTES_BC20.yml b/Resources/Maps/_DV/Shuttles/Evac/ntes_bc20.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/NTES_BC20.yml rename to Resources/Maps/_DV/Shuttles/Evac/ntes_bc20.yml diff --git a/Resources/Maps/_DV/Shuttles/NTES_Box.yml b/Resources/Maps/_DV/Shuttles/Evac/ntes_box.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/NTES_Box.yml rename to Resources/Maps/_DV/Shuttles/Evac/ntes_box.yml diff --git a/Resources/Maps/_DV/Shuttles/NTES_Centipede.yml b/Resources/Maps/_DV/Shuttles/Evac/ntes_centipede.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/NTES_Centipede.yml rename to Resources/Maps/_DV/Shuttles/Evac/ntes_centipede.yml diff --git a/Resources/Maps/_DV/Shuttles/NTES_Delta.yml b/Resources/Maps/_DV/Shuttles/Evac/ntes_delta.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/NTES_Delta.yml rename to Resources/Maps/_DV/Shuttles/Evac/ntes_delta.yml diff --git a/Resources/Maps/_DV/Shuttles/NTES_Fishbowl.yml b/Resources/Maps/_DV/Shuttles/Evac/ntes_fishbowl.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/NTES_Fishbowl.yml rename to Resources/Maps/_DV/Shuttles/Evac/ntes_fishbowl.yml diff --git a/Resources/Maps/_DV/Shuttles/NTES_Kaeri.yml b/Resources/Maps/_DV/Shuttles/Evac/ntes_kaeri.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/NTES_Kaeri.yml rename to Resources/Maps/_DV/Shuttles/Evac/ntes_kaeri.yml diff --git a/Resources/Maps/_DV/Shuttles/NTES_Lox.yml b/Resources/Maps/_DV/Shuttles/Evac/ntes_lox.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/NTES_Lox.yml rename to Resources/Maps/_DV/Shuttles/Evac/ntes_lox.yml diff --git a/Resources/Maps/_DV/Shuttles/NTES_Propeller.yml b/Resources/Maps/_DV/Shuttles/Evac/ntes_propeller.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/NTES_Propeller.yml rename to Resources/Maps/_DV/Shuttles/Evac/ntes_propeller.yml diff --git a/Resources/Maps/_DV/Shuttles/NTES_Right.yml b/Resources/Maps/_DV/Shuttles/Evac/ntes_right.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/NTES_Right.yml rename to Resources/Maps/_DV/Shuttles/Evac/ntes_right.yml diff --git a/Resources/Maps/_DV/Shuttles/NTES_Seal.yml b/Resources/Maps/_DV/Shuttles/Evac/ntes_seal.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/NTES_Seal.yml rename to Resources/Maps/_DV/Shuttles/Evac/ntes_seal.yml diff --git a/Resources/Maps/_DV/Shuttles/NTES_Titan.yml b/Resources/Maps/_DV/Shuttles/Evac/ntes_titan.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/NTES_Titan.yml rename to Resources/Maps/_DV/Shuttles/Evac/ntes_titan.yml diff --git a/Resources/Maps/_DV/Shuttles/NTES_Transport.yml b/Resources/Maps/_DV/Shuttles/Evac/ntes_transport.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/NTES_Transport.yml rename to Resources/Maps/_DV/Shuttles/Evac/ntes_transport.yml diff --git a/Resources/Maps/_DV/Shuttles/NTES_UCLB.yml b/Resources/Maps/_DV/Shuttles/Evac/ntes_uclb.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/NTES_UCLB.yml rename to Resources/Maps/_DV/Shuttles/Evac/ntes_uclb.yml diff --git a/Resources/Maps/_DV/Shuttles/NTES_Vertex.yml b/Resources/Maps/_DV/Shuttles/Evac/ntes_vertex.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/NTES_Vertex.yml rename to Resources/Maps/_DV/Shuttles/Evac/ntes_vertex.yml diff --git a/Resources/Maps/_DV/Shuttles/NTES_Yggdrasil.yml b/Resources/Maps/_DV/Shuttles/Evac/ntes_yggdrasil.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/NTES_Yggdrasil.yml rename to Resources/Maps/_DV/Shuttles/Evac/ntes_yggdrasil.yml diff --git a/Resources/Maps/_DV/Shuttles/census.yml b/Resources/Maps/_DV/Shuttles/Event/census.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/census.yml rename to Resources/Maps/_DV/Shuttles/Event/census.yml diff --git a/Resources/Maps/_DV/Shuttles/haibu.yml b/Resources/Maps/_DV/Shuttles/Event/haibu.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/haibu.yml rename to Resources/Maps/_DV/Shuttles/Event/haibu.yml diff --git a/Resources/Maps/_DV/Shuttles/hammer.yml b/Resources/Maps/_DV/Shuttles/Event/hammer.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/hammer.yml rename to Resources/Maps/_DV/Shuttles/Event/hammer.yml diff --git a/Resources/Maps/_DV/Shuttles/lost_cargo_dv.yml b/Resources/Maps/_DV/Shuttles/Event/lost_cargo_dv.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/lost_cargo_dv.yml rename to Resources/Maps/_DV/Shuttles/Event/lost_cargo_dv.yml diff --git a/Resources/Maps/_DV/Shuttles/strongbox.yml b/Resources/Maps/_DV/Shuttles/Event/strongbox.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/strongbox.yml rename to Resources/Maps/_DV/Shuttles/Event/strongbox.yml diff --git a/Resources/Maps/_DV/Shuttles/ShuttleEvent/syndie_evacpod.yml b/Resources/Maps/_DV/Shuttles/Event/syndie_evacpod.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/ShuttleEvent/syndie_evacpod.yml rename to Resources/Maps/_DV/Shuttles/Event/syndie_evacpod.yml diff --git a/Resources/Maps/_DV/Shuttles/synthesis_ship.yml b/Resources/Maps/_DV/Shuttles/Event/synthesis_ship.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/synthesis_ship.yml rename to Resources/Maps/_DV/Shuttles/Event/synthesis_ship.yml diff --git a/Resources/Maps/_DV/Shuttles/traveling_cuisines_dv.yml b/Resources/Maps/_DV/Shuttles/Event/traveling_cuisines_dv.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/traveling_cuisines_dv.yml rename to Resources/Maps/_DV/Shuttles/Event/traveling_cuisines_dv.yml diff --git a/Resources/Maps/_DV/Shuttles/exfiltration.yml b/Resources/Maps/_DV/Shuttles/Misc/exfiltration.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/exfiltration.yml rename to Resources/Maps/_DV/Shuttles/Misc/exfiltration.yml diff --git a/Resources/Maps/_DV/Shuttles/glacier_surface_shuttle.yml b/Resources/Maps/_DV/Shuttles/Misc/glacier_surface_shuttle.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/glacier_surface_shuttle.yml rename to Resources/Maps/_DV/Shuttles/Misc/glacier_surface_shuttle.yml diff --git a/Resources/Maps/_DV/Shuttles/mining.yml b/Resources/Maps/_DV/Shuttles/Misc/mining.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/mining.yml rename to Resources/Maps/_DV/Shuttles/Misc/mining.yml diff --git a/Resources/Maps/_DV/Shuttles/sub_escape_pod.yml b/Resources/Maps/_DV/Shuttles/Misc/sub_escape_pod.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/sub_escape_pod.yml rename to Resources/Maps/_DV/Shuttles/Misc/sub_escape_pod.yml diff --git a/Resources/Maps/_DV/Shuttles/barge.yml b/Resources/Maps/_DV/Shuttles/Shipyard/barge.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/barge.yml rename to Resources/Maps/_DV/Shuttles/Shipyard/barge.yml diff --git a/Resources/Maps/_DV/Shuttles/helix.yml b/Resources/Maps/_DV/Shuttles/Shipyard/helix.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/helix.yml rename to Resources/Maps/_DV/Shuttles/Shipyard/helix.yml diff --git a/Resources/Maps/_DV/Shuttles/ntcv-nomad.yml b/Resources/Maps/_DV/Shuttles/Shipyard/ntcv-nomad.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/ntcv-nomad.yml rename to Resources/Maps/_DV/Shuttles/Shipyard/ntcv-nomad.yml diff --git a/Resources/Maps/_DV/Shuttles/ntsp-bulwark.yml b/Resources/Maps/_DV/Shuttles/Shipyard/ntsp-bulwark.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/ntsp-bulwark.yml rename to Resources/Maps/_DV/Shuttles/Shipyard/ntsp-bulwark.yml diff --git a/Resources/Maps/_DV/Shuttles/ntsv-tote.yml b/Resources/Maps/_DV/Shuttles/Shipyard/ntsv-tote.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/ntsv-tote.yml rename to Resources/Maps/_DV/Shuttles/Shipyard/ntsv-tote.yml diff --git a/Resources/Maps/_DV/Shuttles/ntv-pulse.yml b/Resources/Maps/_DV/Shuttles/Shipyard/ntv-pulse.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/ntv-pulse.yml rename to Resources/Maps/_DV/Shuttles/Shipyard/ntv-pulse.yml diff --git a/Resources/Maps/_DV/Shuttles/ntxr-saucer.yml b/Resources/Maps/_DV/Shuttles/Shipyard/ntxr-saucer.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/ntxr-saucer.yml rename to Resources/Maps/_DV/Shuttles/Shipyard/ntxr-saucer.yml diff --git a/Resources/Maps/_DV/Shuttles/prospector.yml b/Resources/Maps/_DV/Shuttles/Shipyard/prospector.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/prospector.yml rename to Resources/Maps/_DV/Shuttles/Shipyard/prospector.yml diff --git a/Resources/Maps/_DV/Shuttles/pts.yml b/Resources/Maps/_DV/Shuttles/Shipyard/pts.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/pts.yml rename to Resources/Maps/_DV/Shuttles/Shipyard/pts.yml diff --git a/Resources/Maps/_DV/Shuttles/USSPS_Eden.yml b/Resources/Maps/_DV/Shuttles/Shipyard/ussps_eden.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/USSPS_Eden.yml rename to Resources/Maps/_DV/Shuttles/Shipyard/ussps_eden.yml diff --git a/Resources/Maps/_DV/Shuttles/USSPS_Miriam.yml b/Resources/Maps/_DV/Shuttles/Shipyard/ussps_miriam.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/USSPS_Miriam.yml rename to Resources/Maps/_DV/Shuttles/Shipyard/ussps_miriam.yml diff --git a/Resources/Maps/_DV/Shuttles/USSPS_Orit.yml b/Resources/Maps/_DV/Shuttles/Shipyard/ussps_orit.yml similarity index 100% rename from Resources/Maps/_DV/Shuttles/USSPS_Orit.yml rename to Resources/Maps/_DV/Shuttles/Shipyard/ussps_orit.yml diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml index d2aec662351..5e3c6804160 100644 --- a/Resources/Prototypes/Entities/Stations/base.yml +++ b/Resources/Prototypes/Entities/Stations/base.yml @@ -51,7 +51,7 @@ abstract: true components: - type: StationCargoShuttle - path: /Maps/_DV/Shuttles/cargo.yml # DeltaV - Custom cargo shuttle + path: /Maps/_DV/Shuttles/Cargo/cargo.yml # DeltaV - Custom cargo shuttle - type: GridSpawn groups: # trade: # DeltaV - trade station has its own map diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index 20d11aab1d8..8ed6d6cfb49 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -589,7 +589,7 @@ message: psionic-power-precognition-lone-ops-spawn-result-message - type: RuleGrids - type: LoadMapRule - gridPath: /Maps/_DV/Shuttles/hammer.yml # DeltaV - Was /Shuttles/ShuttleEvent/striker.yml + gridPath: /Maps/_DV/Shuttles/Event/hammer.yml # DeltaV - Was /Shuttles/ShuttleEvent/striker.yml - type: NukeopsRule roundEndBehavior: Nothing - type: AntagSelection diff --git a/Resources/Prototypes/Maps/ArenaMedieval.yml b/Resources/Prototypes/Maps/ArenaMedieval.yml index a469eb18bc7..a679a24787a 100644 --- a/Resources/Prototypes/Maps/ArenaMedieval.yml +++ b/Resources/Prototypes/Maps/ArenaMedieval.yml @@ -14,9 +14,9 @@ !type:NanotrasenNameGenerator prefixCreator: 'NY' - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/_DV/Shuttles/NTES_UCLB.yml + emergencyShuttlePath: /Maps/_DV/Shuttles/Evac/ntes_uclb.yml - type: StationCargoShuttle - path: /Maps/_DV/Shuttles/NTCS_Duster.yml + path: /Maps/_DV/Shuttles/Cargo/ntcs_duster.yml - type: StationJobs availableJobs: #civilian diff --git a/Resources/Prototypes/Maps/arena.yml b/Resources/Prototypes/Maps/arena.yml index c9df6ac2e00..f9d47d812c0 100644 --- a/Resources/Prototypes/Maps/arena.yml +++ b/Resources/Prototypes/Maps/arena.yml @@ -14,9 +14,9 @@ !type:NanotrasenNameGenerator prefixCreator: 'NY' - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/_DV/Shuttles/NTES_UCLB.yml + emergencyShuttlePath: /Maps/_DV/Shuttles/Evac/ntes_uclb.yml - type: StationCargoShuttle - path: /Maps/_DV/Shuttles/NTCS_Duster.yml + path: /Maps/_DV/Shuttles/Cargo/ntcs_duster.yml - type: StationJobs availableJobs: #civilian diff --git a/Resources/Prototypes/Maps/asterisk.yml b/Resources/Prototypes/Maps/asterisk.yml index 6d8d3b8abe9..136dc192f4f 100644 --- a/Resources/Prototypes/Maps/asterisk.yml +++ b/Resources/Prototypes/Maps/asterisk.yml @@ -9,7 +9,7 @@ stationProto: StandardNanotrasenStation components: - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/_DV/Shuttles/NTES_Kaeri.yml + emergencyShuttlePath: /Maps/_DV/Shuttles/Evac/ntes_kaeri.yml - type: StationNameSetup mapNameTemplate: '{0} Asterisk Station {1}' nameGenerator: diff --git a/Resources/Prototypes/Maps/byoin.yml b/Resources/Prototypes/Maps/byoin.yml index 982581e3754..642227725ac 100644 --- a/Resources/Prototypes/Maps/byoin.yml +++ b/Resources/Prototypes/Maps/byoin.yml @@ -9,7 +9,7 @@ stationProto: StandardNanotrasenStation components: - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/_DV/Shuttles/NTES_Basu.yml + emergencyShuttlePath: /Maps/_DV/Shuttles/Evac/ntes_basu.yml - type: StationNameSetup mapNameTemplate: '{0} Byōin Station {1}' nameGenerator: diff --git a/Resources/Prototypes/Maps/division.yml b/Resources/Prototypes/Maps/division.yml index 800fe27b080..5c015bed929 100644 --- a/Resources/Prototypes/Maps/division.yml +++ b/Resources/Prototypes/Maps/division.yml @@ -9,7 +9,7 @@ stationProto: StandardNanotrasenStation components: - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/_DV/Shuttles/NTES_Right.yml + emergencyShuttlePath: /Maps/_DV/Shuttles/Evac/ntes_right.yml - type: StationNameSetup mapNameTemplate: '{0} Division Station {1}' nameGenerator: diff --git a/Resources/Prototypes/Maps/edge.yml b/Resources/Prototypes/Maps/edge.yml index 9c774affa73..7c1571797e2 100644 --- a/Resources/Prototypes/Maps/edge.yml +++ b/Resources/Prototypes/Maps/edge.yml @@ -9,7 +9,7 @@ stationProto: StandardNanotrasenStation components: - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/_DV/Shuttles/NTES_Vertex.yml + emergencyShuttlePath: /Maps/_DV/Shuttles/Evac/ntes_vertex.yml - type: StationNameSetup mapNameTemplate: '{0} Edge Station {1}' nameGenerator: diff --git a/Resources/Prototypes/Maps/elegance.yml b/Resources/Prototypes/Maps/elegance.yml index 71a8bea3825..6df60a4330f 100644 --- a/Resources/Prototypes/Maps/elegance.yml +++ b/Resources/Prototypes/Maps/elegance.yml @@ -13,7 +13,7 @@ !type:NanotrasenNameGenerator prefixCreator: 'DV' - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/_DV/Shuttles/NTES_Transport.yml + emergencyShuttlePath: /Maps/_DV/Shuttles/Evac/ntes_transport.yml - type: StationJobs availableJobs: #civilian diff --git a/Resources/Prototypes/Maps/glacier.yml b/Resources/Prototypes/Maps/glacier.yml index 4b4912cc23d..6bc9d09d899 100644 --- a/Resources/Prototypes/Maps/glacier.yml +++ b/Resources/Prototypes/Maps/glacier.yml @@ -16,7 +16,7 @@ !type:NanotrasenNameGenerator prefixCreator: 'NY' - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/_DV/Shuttles/NTES_Vertex.yml + emergencyShuttlePath: /Maps/_DV/Shuttles/Evac/ntes_vertex.yml - type: StationPlanetSpawner planet: GlacierSurface gridPath: /Maps/_DV/Nonstations/glacier_surface_outpost.yml diff --git a/Resources/Prototypes/Maps/hammurabi.yml b/Resources/Prototypes/Maps/hammurabi.yml index 45fa1f256cd..37ce1a37d90 100644 --- a/Resources/Prototypes/Maps/hammurabi.yml +++ b/Resources/Prototypes/Maps/hammurabi.yml @@ -13,7 +13,7 @@ !type:NanotrasenNameGenerator prefixCreator: 'NY' - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/_DV/Shuttles/NTES_Centipede.yml + emergencyShuttlePath: /Maps/_DV/Shuttles/Evac/ntes_centipede.yml - type: StationJobs availableJobs: #civilian diff --git a/Resources/Prototypes/Maps/hive.yml b/Resources/Prototypes/Maps/hive.yml index cbf1fda14a7..40af8b45dd6 100644 --- a/Resources/Prototypes/Maps/hive.yml +++ b/Resources/Prototypes/Maps/hive.yml @@ -14,7 +14,7 @@ !type:NanotrasenNameGenerator prefixCreator: 'NY' - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/_DV/Shuttles/NTES_Fishbowl.yml + emergencyShuttlePath: /Maps/_DV/Shuttles/Evac/ntes_fishbowl.yml - type: StationJobs availableJobs: #civilian diff --git a/Resources/Prototypes/Maps/lighthouse.yml b/Resources/Prototypes/Maps/lighthouse.yml index b04b9c8e270..0f5bb9fd3db 100644 --- a/Resources/Prototypes/Maps/lighthouse.yml +++ b/Resources/Prototypes/Maps/lighthouse.yml @@ -11,7 +11,7 @@ stationProto: StandardNanotrasenStation components: - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/_DV/Shuttles/NTES_BC20.yml + emergencyShuttlePath: /Maps/_DV/Shuttles/Evac/ntes_bc20.yml - type: StationNameSetup mapNameTemplate: '{0} Lighthouse {1}' nameGenerator: diff --git a/Resources/Prototypes/Maps/pebble.yml b/Resources/Prototypes/Maps/pebble.yml index f2a5d89cbc2..b9fa1344e43 100644 --- a/Resources/Prototypes/Maps/pebble.yml +++ b/Resources/Prototypes/Maps/pebble.yml @@ -9,7 +9,7 @@ stationProto: StandardNanotrasenStation components: - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/_DV/Shuttles/NTES_Basu.yml + emergencyShuttlePath: /Maps/_DV/Shuttles/Evac/ntes_basu.yml - type: StationNameSetup mapNameTemplate: '{0} Pebble Station {1}' nameGenerator: diff --git a/Resources/Prototypes/Maps/shoukou.yml b/Resources/Prototypes/Maps/shoukou.yml index aa4bba5a399..5403de3caba 100644 --- a/Resources/Prototypes/Maps/shoukou.yml +++ b/Resources/Prototypes/Maps/shoukou.yml @@ -14,7 +14,7 @@ !type:NanotrasenNameGenerator prefixCreator: 'NY' - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/_DV/Shuttles/NTES_Kaeri.yml + emergencyShuttlePath: /Maps/_DV/Shuttles/Evac/ntes_kaeri.yml - type: StationJobs availableJobs: #Command diff --git a/Resources/Prototypes/Maps/submarine.yml b/Resources/Prototypes/Maps/submarine.yml index de7d8c5b0d4..4e7fb3ca21a 100644 --- a/Resources/Prototypes/Maps/submarine.yml +++ b/Resources/Prototypes/Maps/submarine.yml @@ -13,9 +13,9 @@ !type:NanotrasenNameGenerator prefixCreator: 'DV' - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/_DV/Shuttles/NTES_Propeller.yml + emergencyShuttlePath: /Maps/_DV/Shuttles/Evac/ntes_propeller.yml - type: StationCargoShuttle - path: /Maps/_DV/Shuttles/cargo_model_B.yml + path: /Maps/_DV/Shuttles/Cargo/cargo_model_b.yml - type: StationJobs availableJobs: #civilian diff --git a/Resources/Prototypes/Maps/terra.yml b/Resources/Prototypes/Maps/terra.yml index b23e9e64e22..3170779f18d 100644 --- a/Resources/Prototypes/Maps/terra.yml +++ b/Resources/Prototypes/Maps/terra.yml @@ -13,9 +13,9 @@ !type:NanotrasenNameGenerator prefixCreator: 'DV' - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/_DV/Shuttles/NTES_Yggdrasil.yml + emergencyShuttlePath: /Maps/_DV/Shuttles/Evac/ntes_yggdrasil.yml - type: StationCargoShuttle - path: /Maps/_DV/Shuttles/cargo_model_B.yml + path: /Maps/_DV/Shuttles/Cargo/cargo_model_b.yml - type: StationJobs availableJobs: #civilian diff --git a/Resources/Prototypes/Maps/tortuga.yml b/Resources/Prototypes/Maps/tortuga.yml index f0be3d093a7..e6fe82a3788 100644 --- a/Resources/Prototypes/Maps/tortuga.yml +++ b/Resources/Prototypes/Maps/tortuga.yml @@ -13,9 +13,9 @@ !type:NanotrasenNameGenerator prefixCreator: 'NY' - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/_DV/Shuttles/NTES_Seal.yml + emergencyShuttlePath: /Maps/_DV/Shuttles/Evac/ntes_seal.yml - type: StationCargoShuttle - path: /Maps/_DV/Shuttles/cargo_model_B.yml + path: /Maps/_DV/Shuttles/Cargo/cargo_model_b.yml - type: StationJobs availableJobs: #civilian diff --git a/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml b/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml index 3cafd2ab17d..a6838615f4f 100644 --- a/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml +++ b/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml @@ -1,11 +1,11 @@ - type: preloadedGrid id: ShuttleCargoLost - path: /Maps/_DV/Shuttles/lost_cargo_dv.yml # DeltaV - DV custom lost cargo shuttle, was /Maps/Shuttles/ShuttleEvent/lost_cargo.yml + path: /Maps/_DV/Shuttles/Event/lost_cargo_dv.yml # DeltaV - DV custom lost cargo shuttle, was /Maps/Shuttles/ShuttleEvent/lost_cargo.yml copies: 2 - type: preloadedGrid id: TravelingCuisine - path: /Maps/_DV/Shuttles/traveling_cuisines_dv.yml # DeltaV - DV custom traveling cuisines shuttle, was /Maps/Shuttles/ShuttleEvent/traveling_china_cuisine.yml + path: /Maps/_DV/Shuttles/Event/traveling_cuisines_dv.yml # DeltaV - DV custom traveling cuisines shuttle, was /Maps/Shuttles/ShuttleEvent/traveling_china_cuisine.yml copies: 2 - type: preloadedGrid @@ -21,7 +21,7 @@ - type: preloadedGrid id: SyndieEvacPod - path: /Maps/_DV/Shuttles/ShuttleEvent/syndie_evacpod.yml # DeltaV - Switched to our version, was /Maps/Shuttles/ShuttleEvent/syndie_evacpod.yml + path: /Maps/_DV/Shuttles/Event/syndie_evacpod.yml # DeltaV - Switched to our version, was /Maps/Shuttles/ShuttleEvent/syndie_evacpod.yml copies: 2 - type: preloadedGrid diff --git a/Resources/Prototypes/_DV/Catalog/Shipyard/civilian.yml b/Resources/Prototypes/_DV/Catalog/Shipyard/civilian.yml index 50111dc53ff..8c2d1c4a0d7 100644 --- a/Resources/Prototypes/_DV/Catalog/Shipyard/civilian.yml +++ b/Resources/Prototypes/_DV/Catalog/Shipyard/civilian.yml @@ -3,7 +3,7 @@ name: Private Transport Shuttle description: A private transport vessel for up to 6 passengers. price: 23000 - path: /Maps/_DV/Shuttles/pts.yml + path: /Maps/_DV/Shuttles/Shipyard/pts.yml categories: - Civilian - Small @@ -14,7 +14,7 @@ name: The Barge description: A large shipping vessel repurposed into a salvage bar. price: 56500 - path: /Maps/_DV/Shuttles/barge.yml + path: /Maps/_DV/Shuttles/Shipyard/barge.yml categories: - Civilian - Large @@ -26,7 +26,7 @@ name: NTMC Helix description: A large mobile health clinic for servicing distant outposts. price: 56000 - path: /Maps/_DV/Shuttles/helix.yml + path: /Maps/_DV/Shuttles/Shipyard/helix.yml categories: - Civilian - Medium @@ -37,7 +37,7 @@ name: USSPS Eden description: A modestly sized botanical garden with a chemistry lab for pushing the bounds of hydroponics. price: 73500 - path: /Maps/_DV/Shuttles/USSPS_Eden.yml + path: /Maps/_DV/Shuttles/Shipyard/ussps_eden.yml categories: - Civilian - Medium @@ -48,7 +48,7 @@ name: USSPS Orit description: A small medical vessel designed for the fast search and retrieval of patients in deep space. price: 33000 - path: /Maps/_DV/Shuttles/USSPS_Orit.yml + path: /Maps/_DV/Shuttles/Shipyard/ussps_orit.yml categories: - Civilian - Small @@ -59,7 +59,7 @@ name: USSPS Miriam description: A modestly sized medical vessel with all the equipment to operate a cryogenics laboratory. price: 59500 - path: /Maps/_DV/Shuttles/USSPS_Miriam.yml + path: /Maps/_DV/Shuttles/Shipyard/ussps_miriam.yml categories: - Civilian - Medium @@ -70,7 +70,7 @@ name: NT-7 Prospector description: A small mining vessel designed to assist salvage operations. price: 25800 - path: /Maps/_DV/Shuttles/prospector.yml + path: /Maps/_DV/Shuttles/Shipyard/prospector.yml categories: - Civilian - Small @@ -81,7 +81,7 @@ name: NTCV Nomad description: A small shuttle for transporting up to 3 passengers with relative comfort. price: 22000 - path: /Maps/_DV/Shuttles/ntcv-nomad.yml + path: /Maps/_DV/Shuttles/Shipyard/ntcv-nomad.yml categories: - Civilian - Small @@ -92,7 +92,7 @@ name: NTSV Tote description: A small shipping vessel, adapted from the Nomad line of shuttles with room for 2 passengers. price: 24000 - path: /Maps/_DV/Shuttles/ntsv-tote.yml + path: /Maps/_DV/Shuttles/Shipyard/ntsv-tote.yml categories: - Civilian - Small @@ -103,7 +103,7 @@ name: NTV Pulse description: A moderately sized shuttle intended for all-purpose use. It can comfortably accomodate a crew of up to ten people. price: 59000 - path: /Maps/_DV/Shuttles/ntv-pulse.yml + path: /Maps/_DV/Shuttles/Shipyard/ntv-pulse.yml categories: - Civilian - Medium diff --git a/Resources/Prototypes/_DV/Catalog/Shipyard/experimental.yml b/Resources/Prototypes/_DV/Catalog/Shipyard/experimental.yml index 0decc52c357..1dd7f5f8ee7 100644 --- a/Resources/Prototypes/_DV/Catalog/Shipyard/experimental.yml +++ b/Resources/Prototypes/_DV/Catalog/Shipyard/experimental.yml @@ -3,7 +3,7 @@ name: NTXR Saucer description: A high-tech research vessel with a unique interior propulsion system. price: 49000 - path: /Maps/_DV/Shuttles/ntxr-saucer.yml + path: /Maps/_DV/Shuttles/Shipyard/ntxr-saucer.yml categories: - Experimental - Medium diff --git a/Resources/Prototypes/_DV/Catalog/Shipyard/military.yml b/Resources/Prototypes/_DV/Catalog/Shipyard/military.yml index 7daaed7cbf8..9c1e57aa27c 100644 --- a/Resources/Prototypes/_DV/Catalog/Shipyard/military.yml +++ b/Resources/Prototypes/_DV/Catalog/Shipyard/military.yml @@ -3,7 +3,7 @@ name: NTSP Bulwark description: A compact security shuttle with cells for 2 prisoners and plenty of donuts. price: 44000 - path: /Maps/_DV/Shuttles/ntsp-bulwark.yml + path: /Maps/_DV/Shuttles/Shipyard/ntsp-bulwark.yml categories: - Military - Small diff --git a/Resources/Prototypes/_DV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/_DV/Entities/Structures/Doors/Airlocks/access.yml index 572b8376794..1f25df2bc21 100644 --- a/Resources/Prototypes/_DV/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/_DV/Entities/Structures/Doors/Airlocks/access.yml @@ -26,7 +26,7 @@ suffix: Mining, Filled, Locked components: - type: GridFill - path: /Maps/_DV/Shuttles/mining.yml + path: /Maps/_DV/Shuttles/Misc/mining.yml addComponents: - type: IFF flags: @@ -39,7 +39,7 @@ suffix: Glacier, Filled, Locked components: - type: GridFill - path: /Maps/_DV/Shuttles/glacier_surface_shuttle.yml + path: /Maps/_DV/Shuttles/Misc/glacier_surface_shuttle.yml # Delta V specific roles - type: entity @@ -186,7 +186,7 @@ suffix: External, Escape Sub, Glass, Docking components: - type: GridFill - path: /Maps/_DV/Shuttles/sub_escape_pod.yml + path: /Maps/_DV/Shuttles/Misc/sub_escape_pod.yml - type: entity parent: AirlockRobotics diff --git a/Resources/Prototypes/_DV/GameRules/events.yml b/Resources/Prototypes/_DV/GameRules/events.yml index 5eecc373788..8e429b1b90f 100644 --- a/Resources/Prototypes/_DV/GameRules/events.yml +++ b/Resources/Prototypes/_DV/GameRules/events.yml @@ -226,7 +226,7 @@ maxOccurrences: 1 - type: RuleGrids - type: LoadMapRule - gridPath: /Maps/_DV/Shuttles/haibu.yml # was roboneuroticist_ship.yml + gridPath: /Maps/_DV/Shuttles/Event/haibu.yml # was /Maps/_DV/Shuttles/Admin/roboneuroticist_ship.yml - type: AntagSpawner prototype: MobHuman - type: AntagObjectives diff --git a/Resources/Prototypes/_DV/Mapping/maps.yml b/Resources/Prototypes/_DV/Mapping/maps.yml index 43f6aa4f81e..63e264a25fe 100644 --- a/Resources/Prototypes/_DV/Mapping/maps.yml +++ b/Resources/Prototypes/_DV/Mapping/maps.yml @@ -47,7 +47,7 @@ - type: mapCategories id: Dreadnought - map: /Maps/_DV/Shuttles/dreadnought.yml + map: /Maps/_DV/Shuttles/Admin/dreadnought.yml allowed: - Syndicate @@ -78,7 +78,7 @@ - type: mapCategories id: RoboNeuroticistShip - map: /Maps/Shuttles/roboneuroticist_ship.yml + map: /Maps/_DV/Shuttles/Admin/roboneuroticist_ship.yml allowed: - Syndicate @@ -102,31 +102,31 @@ - type: mapCategories id: TraderShip - map: /Maps/_DV/Shuttles/trader.yml + map: /Maps/_DV/Shuttles/Admin/trader.yml allowed: - Stamps # Trader stamp - type: mapCategories id: TravelingCuisineDv - map: /Maps/_DV/Shuttles/traveling_cuisines_dv.yml + map: /Maps/_DV/Shuttles/Event/traveling_cuisines_dv.yml allowed: - Stamps # Trader stamp - type: mapCategories id: HaibuShuttleSRN - map: /Maps/_DV/Shuttles/haibu.yml + map: /Maps/_DV/Shuttles/Event/haibu.yml allowed: - Syndicate - type: mapCategories id: HammerShuttleLOP - map: /Maps/_DV/Shuttles/hammer.yml + map: /Maps/_DV/Shuttles/Event/hammer.yml allowed: - Syndicate - type: mapCategories id: StrongboxShuttle - map: /Maps/_DV/Shuttles/strongbox.yml + map: /Maps/_DV/Shuttles/Event/strongbox.yml allowed: - Syndicate diff --git a/Resources/Prototypes/_DV/Shuttles/armsdealer.yml b/Resources/Prototypes/_DV/Shuttles/armsdealer.yml index 0ae644f3d07..93292b22cb7 100644 --- a/Resources/Prototypes/_DV/Shuttles/armsdealer.yml +++ b/Resources/Prototypes/_DV/Shuttles/armsdealer.yml @@ -1,4 +1,4 @@ - type: preloadedGrid id: SyndieArmsdealerShip - path: /Maps/_DV/Shuttles/strongbox.yml + path: /Maps/_DV/Shuttles/Event/strongbox.yml copies: 1 diff --git a/Resources/Prototypes/_DV/Shuttles/recruiter.yml b/Resources/Prototypes/_DV/Shuttles/recruiter.yml index 536abc3a6b8..8b6ab399b92 100644 --- a/Resources/Prototypes/_DV/Shuttles/recruiter.yml +++ b/Resources/Prototypes/_DV/Shuttles/recruiter.yml @@ -1,4 +1,4 @@ - type: preloadedGrid id: SyndieRecruiterShip - path: /Maps/_DV/Shuttles/census.yml # Was /Maps/_DV/Shuttles/recruiter_ship.yml + path: /Maps/_DV/Shuttles/Event/census.yml # Was /Maps/_DV/Shuttles/Admin/recruiter_ship.yml copies: 1 diff --git a/Resources/Prototypes/_DV/Shuttles/synthesis.yml b/Resources/Prototypes/_DV/Shuttles/synthesis.yml index 0482904cf68..415c3f446ea 100644 --- a/Resources/Prototypes/_DV/Shuttles/synthesis.yml +++ b/Resources/Prototypes/_DV/Shuttles/synthesis.yml @@ -1,4 +1,4 @@ - type: preloadedGrid id: SyndieSynthesisShip - path: /Maps/_DV/Shuttles/synthesis_ship.yml + path: /Maps/_DV/Shuttles/Event/synthesis_ship.yml copies: 1