Merge remote-tracking branch 'WD-core/master' into upstream-core

2024-12-29 18:29:29 +03:00
parent e37967088b d22f6284ec
commit 44175ce102
165 changed files with 133760 additions and 53663 deletions
--- a/Resources/Prototypes/Maps/DryDock.yml
+++ b/Resources/Prototypes/Maps/DryDock.yml
@@ -13,7 +13,7 @@
            !type:NanotrasenNameGenerator
            prefixCreator: 'TG'
        - type: StationEmergencyShuttle
-          emergencyShuttlePath: /Maps/Shuttles/emergency_box.yml
+          emergencyShuttlePath: /Maps/Shuttles/White/emergency_boxNY.yml
        - type: StationJobs
          overflowJobs:
            - Passenger
--- a/Resources/Prototypes/Maps/WhiteMoose.yml
+++ b/Resources/Prototypes/Maps/WhiteMoose.yml
@@ -13,7 +13,7 @@
          !type:NanotrasenNameGenerator
          prefixCreator: 'TG'
      - type: StationEmergencyShuttle
-        emergencyShuttlePath: /Maps/Shuttles/emergency_box.yml
+        emergencyShuttlePath: /Maps/Shuttles/White/emergency_boxNY.yml
      - type: StationJobs
        overflowJobs:
        - Passenger
--- a/Resources/Prototypes/Maps/Whitebox.yml
+++ b/Resources/Prototypes/Maps/Whitebox.yml
@@ -13,7 +13,7 @@
            !type:NanotrasenNameGenerator
            prefixCreator: 'TG'
        - type: StationEmergencyShuttle
-          emergencyShuttlePath: /Maps/Shuttles/emergency_box.yml
+          emergencyShuttlePath: /Maps/Shuttles/White/emergency_boxNY.yml
        - type: StationJobs
          overflowJobs:
            - Passenger
--- a/Resources/Prototypes/Maps/WonderBox.yml
+++ b/Resources/Prototypes/Maps/WonderBox.yml
@@ -13,7 +13,7 @@
            !type:NanotrasenNameGenerator
            prefixCreator: 'TG'
        - type: StationEmergencyShuttle
-          emergencyShuttlePath: /Maps/Shuttles/emergency_box.yml
+          emergencyShuttlePath: /Maps/Shuttles/White/emergency_boxNY.yml
        - type: StationJobs
          overflowJobs:
            - Passenger
--- a/Resources/Prototypes/Maps/centcomm.yml
+++ b/Resources/Prototypes/Maps/centcomm.yml
@@ -1,7 +1,7 @@
 - type: gameMap
  id: CentComm
  mapName: 'Central Command'
-  mapPath: /Maps/White/centcomm.yml
+  mapPath: /Maps/White/centcommNY.yml
  minPlayers: 10
  stations:
    centcomm:
--- a/Resources/Prototypes/Maps/meta.yml
+++ b/Resources/Prototypes/Maps/meta.yml
@@ -13,7 +13,7 @@
            !type:NanotrasenNameGenerator
            prefixCreator: 'TG'
        - type: StationEmergencyShuttle
-          emergencyShuttlePath: /Maps/Shuttles/emergency_meta.yml
+          emergencyShuttlePath: /Maps/Shuttles/White/emergency_metaNY.yml
        - type: StationJobs
          overflowJobs:
            - Passenger