Merge branch 'master' into tailstuff

Content.Server/_DV/Station/Components/StationExfiltrationComponent.cs

@@ -58,7 +58,7 @@ public sealed partial class StationExfiltrationComponent : Component
     /// The map to spawn for the shuttle
     /// </summary>
     [DataField]
-    public ResPath ShuttlePath = new("/Maps/_DV/Shuttles/exfiltration.yml");
+    public ResPath ShuttlePath = new("/Maps/_DV/Shuttles/Misc/exfiltration.yml");
 
     /// <summary>
     /// The spawned shuttle

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

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

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

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

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:

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:

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:

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:

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

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

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

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

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:

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:

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

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

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

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

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

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

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

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

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

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

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
 

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

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

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