Merge pull request #125 from Kesiath/kes-fixes-and-more

Kes fixes and more
new-frontiers-14 · Jul 31, 2023 · 52fa9bc · 52fa9bc
2 parents c39af68 + 62dddb0
commit 52fa9bc
Show file tree

Hide file tree

Showing 9 changed files with 6,770 additions and 6,648 deletions.
diff --git a/Resources/Maps/Shuttles/courserx.yml b/Resources/Maps/Shuttles/courserx.yml
diff --git a/Resources/Maps/Shuttles/helix.yml b/Resources/Maps/Shuttles/helix.yml
diff --git a/Resources/Maps/Shuttles/marauder.yml b/Resources/Maps/Shuttles/marauder.yml
diff --git a/Resources/Maps/Shuttles/pulse.yml b/Resources/Maps/Shuttles/pulse.yml
diff --git a/Resources/Maps/Shuttles/skipper.yml b/Resources/Maps/Shuttles/skipper.yml
diff --git a/Resources/Maps/Shuttles/sprinter.yml b/Resources/Maps/Shuttles/sprinter.yml
@@ -5704,6 +5704,13 @@ entities:
     - pos: 3.5,-7.5
       parent: 1
       type: Transform
+- proto: SpawnPointSalvageSpecialist
+  entities:
+  - uid: 819
+    components:
+    - pos: -2.5,-6.5
+      parent: 1
+      type: Transform
 - proto: SpeedLoaderMagnum
   entities:
   - uid: 399
@@ -6239,11 +6246,6 @@ entities:
     - pos: -1.5,-13.5
       parent: 1
       type: Transform
-  - uid: 819
-    components:
-    - pos: 5.5,-6.5
-      parent: 1
-      type: Transform
   - uid: 820
     components:
     - rot: -1.5707963267948966 rad

diff --git a/Resources/Prototypes/_NF/Shipyard/default_shipyard_catalog.yml b/Resources/Prototypes/_NF/Shipyard/default_shipyard_catalog.yml
@@ -93,10 +93,10 @@
           overflowJobs: []
           availableJobs:
             Passenger: [ 0, 0 ]
-            Bartender: [ 1, 1 ]
-            StationEngineer: [ 1, 1 ]
-            Mercenary: [ 1, 1 ]
-            Paramedic: [ 1, 1 ]
+            Bartender: [ 0, 0 ]
+            StationEngineer: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
+            Paramedic: [ 0, 0 ]
 
 - type: vessel
   id: Construct
@@ -180,10 +180,10 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            CargoTechnician: [ 1, 1 ]
-            Bartender: [ 1, 1 ]
-            SalvageSpecialist: [ 1, 1 ]
-            Quartermaster: [ 1, 1 ]
+            CargoTechnician: [ 0, 0 ]
+            Bartender: [ 0, 0 ]
+            SalvageSpecialist: [ 0, 0 ]
+            Quartermaster: [ 0, 0 ]
 
 - type: vessel
   id: Prospector
@@ -211,7 +211,7 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            SalvageSpecialist: [ 1, 1 ]
+            SalvageSpecialist: [ 0, 0 ]
 
 - type: vessel
   id: Sparrow
@@ -239,8 +239,8 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            StationEngineer: [ 1, 1 ]
-            Scientist: [ 1, 1 ]
+            StationEngineer: [ 0, 0 ]
+            Scientist: [ 0, 0 ]
             ##Cyborg:[ 1, 1 ]
 
 - type: vessel
@@ -270,10 +270,10 @@
           overflowJobs: []
           availableJobs:
             StationEngineer: [ 0, 0 ]
-            Scientist: [ 1, 1 ]
-            ResearchDirector: [ 1, 1 ]
-            ChiefEngineer: [ 1, 1 ]
-            AtmosphericTechnician: [ 1, 1 ]
+            Scientist: [ 0, 0 ]
+            ResearchDirector: [ 0, 0 ]
+            ChiefEngineer: [ 0, 0 ]
+            AtmosphericTechnician: [ 0, 0 ]
             ##Cyborg [ 1, 1 ]
 
 - type: vessel
@@ -302,7 +302,7 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Detective: [ 1, 1 ]
+            Detective: [ 0, 0 ]
 
 # - type: vessel
   # id: Enforcer
@@ -359,8 +359,8 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            PrisonGuard: [ 1, 1 ]
-            SecurityOfficer: [ 1, 1 ]
+            PrisonGuard: [ 0, 0 ]
+            SecurityOfficer: [ 0, 0 ]
 
 - type: vessel
   id: Pulse
@@ -388,7 +388,7 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Paramedic: [ 1, 1 ]
+            Paramedic: [ 0, 0 ]
             MedicalCyborg: [ 0, 0 ]
 
 - type: vessel
@@ -418,10 +418,10 @@
           overflowJobs: []
           availableJobs:
             Paramedic: [ 0, 0 ]
-            ChiefMedicalOfficer: [ 1, 1 ]
-            MedicalDoctor: [ 1, 1 ]
-            Chemist: [ 1, 1 ]
-            MedicalCyborg: [ 1, 1 ]
+            ChiefMedicalOfficer: [ 0, 0 ]
+            MedicalDoctor: [ 0, 0 ]
+            Chemist: [ 0, 0 ]
+            MedicalCyborg: [ 0, 0 ]
 
 - type: vessel
   id: Skipper
@@ -449,5 +449,5 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Botanist: [ 1, 1 ]
-            Chef: [ 1, 1 ]
+            Botanist: [ 0, 0 ]
+            Chef: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/marauder.yml b/Resources/Prototypes/_NF/Shipyard/marauder.yml
@@ -24,7 +24,8 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Detective: [ 1, 1 ]
-            SecurityOfficer: [ 2, 2 ]
+            Detective: [ 0, 0 ]
+            SecurityOfficer: [ 0, 0 ]
             Warden: [ 1, 1 ]
-            Brigmedic: [ 1, 1 ]
+            Brigmedic: [ 0, 0 ]
+            Chef: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/sprinter.yml b/Resources/Prototypes/_NF/Shipyard/sprinter.yml
@@ -24,6 +24,7 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Bartender: [ 1, 1 ]
-            Paramedic: [ 1, 1 ]
-            Mercenary: [ 1, 1 ]
+            Bartender: [ 0, 0 ]
+            Paramedic: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
+            SalvageSpecialist: [ 0, 0 ]