Merge pull request #132 from Gersoon458/Winter

ZimaBlyat
WWhiteDreamProject · Dec 2, 2024 · f33b0c4 · f33b0c4
2 parents f3c3277 + 724b391
commit f33b0c4
Show file tree

Hide file tree

Showing 8 changed files with 72,519 additions and 74,113 deletions.
diff --git a/Resources/Maps/DryDock.yml b/Resources/Maps/DryDock.yml
diff --git a/Resources/Maps/Moose.yml b/Resources/Maps/Moose.yml
diff --git a/Resources/Maps/Shuttles/mining.yml b/Resources/Maps/Shuttles/mining.yml
diff --git a/Resources/Maps/WhiteBox.yml b/Resources/Maps/WhiteBox.yml
diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml
@@ -61,7 +61,7 @@
           - /Maps/Shuttles/trading_outpost.yml
         mining:
           paths:
-          - /Maps/Shuttles/pathfinder.yml
+          - /Maps/Shuttles/mining.yml
         # Spawn last
         ruins:
           hide: true

diff --git a/Resources/Prototypes/Maps/drydock.yml b/Resources/Prototypes/Maps/drydock.yml
@@ -21,6 +21,7 @@
         availableJobs:
           #Heads
           Captain: [ 1, 1 ]
+          Maid: [ 1, 1 ]
           HeadOfSecurity: [ 1, 1 ]
           HeadOfPersonnel: [ 1, 1 ]
           ChiefEngineer: [ 1, 1 ]
@@ -65,4 +66,5 @@
           Reporter: [ 1, 1 ]
           Borg: [ 1, 2 ]
           Passenger: [ -1, -1 ]
+          Hobo: [ 1, 1 ]
 
diff --git a/Resources/Prototypes/Maps/moose.yml b/Resources/Prototypes/Maps/moose.yml
@@ -21,6 +21,7 @@
         availableJobs:
           #Heads
           Captain: [ 1, 1 ]
+          Maid: [ 1, 1 ]
           HeadOfSecurity: [ 1, 1 ]
           HeadOfPersonnel: [ 1, 1 ]
           ChiefEngineer: [ 1, 1 ]
@@ -66,4 +67,5 @@
           Boxer: [ 1, 1 ]
           Borg: [ 1, 1 ]
           Passenger: [ -1, -1 ]
+          Hobo: [ 1, 1 ]
 
diff --git a/Resources/Prototypes/Maps/whitebox.yml b/Resources/Prototypes/Maps/whitebox.yml
@@ -29,6 +29,8 @@
             Janitor: [ 3, 3 ]
             Mime: [ 1, 1 ]
             Captain: [ 1, 1 ]
+            Maid: [ 1, 1 ]
+            Hobo: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
             ChiefEngineer: [ 1, 1 ]
             StationEngineer: [ 4, 4 ]