]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Adds a salvage jobspawn to reach (#31712)
authorBoaz1111 <149967078+Boaz1111@users.noreply.github.com>
Mon, 2 Sep 2024 04:37:02 +0000 (06:37 +0200)
committerGitHub <noreply@github.com>
Mon, 2 Sep 2024 04:37:02 +0000 (22:37 -0600)
* salvspawn

* removed one cargo tech slot

Resources/Maps/reach.yml
Resources/Prototypes/Maps/reach.yml

index bf2e0ec5a0e1f510f1c05f8658f7fa63d5e35b4e..c556d8367f6ad56012050368cafd839fa2adb0df 100644 (file)
@@ -1128,7 +1128,7 @@ entities:
             0: 54783
           4,1:
             0: 157
-            4: 64
+            2: 64
           -5,0:
             0: 61183
           -4,1:
@@ -1164,8 +1164,8 @@ entities:
           2,-2:
             0: 61687
           2,-4:
-            2: 6
-            3: 1536
+            3: 6
+            4: 1536
           3,-4:
             1: 8737
             0: 256
@@ -1255,10 +1255,10 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.15
+          temperature: 293.14975
           moles:
-          - 0
-          - 6666.982
+          - 20.078888
+          - 75.53487
           - 0
           - 0
           - 0
@@ -1272,8 +1272,8 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 6666.982
           - 0
+          - 6666.982
           - 0
           - 0
           - 0
@@ -1285,10 +1285,10 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.14975
+          temperature: 293.15
           moles:
-          - 20.078888
-          - 75.53487
+          - 6666.982
+          - 0
           - 0
           - 0
           - 0
@@ -6524,13 +6524,6 @@ entities:
     - type: Transform
       pos: 2.5,11.5
       parent: 2
-- proto: ComputerShuttleSalvage
-  entities:
-  - uid: 953
-    components:
-    - type: Transform
-      pos: 0.5,16.5
-      parent: 2
 - proto: ComputerStationRecords
   entities:
   - uid: 954
@@ -10924,8 +10917,6 @@ entities:
     - type: Transform
       pos: -22.5,-2.5
       parent: 2
-    - type: GravityGenerator
-      charge: 100
     - type: PointLight
       radius: 175.75
 - proto: Grille
@@ -13786,6 +13777,13 @@ entities:
     - type: Transform
       pos: 8.5,15.5
       parent: 2
+- proto: SpawnPointSalvageSpecialist
+  entities:
+  - uid: 953
+    components:
+    - type: Transform
+      pos: -1.5,15.5
+      parent: 2
 - proto: SpawnPointScientist
   entities:
   - uid: 1997
index 0824e317758419ee697c1fc5441565c76f0c520e..376e336671709c0152168f98c3f7abc779d55fa4 100644 (file)
@@ -20,7 +20,8 @@
             Captain: [ 1, 1 ]
             HeadOfSecurity: [ 1, 1 ]
             SecurityOfficer: [ 1, 3 ]
-            CargoTechnician: [ 1, 2 ]
+            CargoTechnician: [ 1, 1 ]
+            SalvageSpecialist: [ 1, 1 ]
             Bartender: [ 1, 1 ]
             Botanist: [ 1, 1 ]
             Chef: [ 1, 1 ]