bagel update (#31562)

* bagel update * ore processor cargo
2024-08-28 01:23:28 -06:00
parent d93fc73f3c
commit ed6649b7f3
2 changed files with 171 additions and 49 deletions
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -14104,6 +14104,12 @@ entities:
    - type: Transform
      pos: -24.5,62.5
      parent: 60
+  - uid: 21249
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -69.5,16.5
+      parent: 60
  - uid: 21604
    components:
    - type: MetaData
@@ -30507,21 +30513,6 @@ entities:
    - type: Transform
      pos: -58.5,16.5
      parent: 60
-  - uid: 21249
-    components:
-    - type: Transform
-      pos: -58.5,17.5
-      parent: 60
-  - uid: 21250
-    components:
-    - type: Transform
-      pos: -59.5,17.5
-      parent: 60
-  - uid: 21251
-    components:
-    - type: Transform
-      pos: -60.5,17.5
-      parent: 60
  - uid: 21252
    components:
    - type: Transform
@@ -43102,6 +43093,11 @@ entities:
    - type: Transform
      pos: 1.5,-1.5
      parent: 7536
+  - uid: 8152
+    components:
+    - type: Transform
+      pos: -91.5,17.5
+      parent: 60
  - uid: 8173
    components:
    - type: Transform
@@ -46217,6 +46213,11 @@ entities:
    - type: Transform
      pos: -2.5,-1.5
      parent: 60
+  - uid: 18495
+    components:
+    - type: Transform
+      pos: -93.5,17.5
+      parent: 60
  - uid: 18521
    components:
    - type: Transform
@@ -46912,6 +46913,11 @@ entities:
    - type: Transform
      pos: -9.5,1.5
      parent: 60
+  - uid: 21251
+    components:
+    - type: Transform
+      pos: -90.5,17.5
+      parent: 60
  - uid: 21430
    components:
    - type: Transform
@@ -47237,6 +47243,26 @@ entities:
    - type: Transform
      pos: -94.5,15.5
      parent: 60
+  - uid: 23092
+    components:
+    - type: Transform
+      pos: -89.5,17.5
+      parent: 60
+  - uid: 23093
+    components:
+    - type: Transform
+      pos: -88.5,17.5
+      parent: 60
+  - uid: 23094
+    components:
+    - type: Transform
+      pos: -92.5,17.5
+      parent: 60
+  - uid: 23095
+    components:
+    - type: Transform
+      pos: -87.5,17.5
+      parent: 60
  - uid: 23169
    components:
    - type: Transform
@@ -47907,6 +47933,101 @@ entities:
    - type: Transform
      pos: -111.5,22.5
      parent: 60
+  - uid: 24793
+    components:
+    - type: Transform
+      pos: -86.5,17.5
+      parent: 60
+  - uid: 24794
+    components:
+    - type: Transform
+      pos: -85.5,17.5
+      parent: 60
+  - uid: 24795
+    components:
+    - type: Transform
+      pos: -84.5,17.5
+      parent: 60
+  - uid: 24796
+    components:
+    - type: Transform
+      pos: -83.5,17.5
+      parent: 60
+  - uid: 24797
+    components:
+    - type: Transform
+      pos: -82.5,17.5
+      parent: 60
+  - uid: 24798
+    components:
+    - type: Transform
+      pos: -81.5,17.5
+      parent: 60
+  - uid: 24799
+    components:
+    - type: Transform
+      pos: -80.5,17.5
+      parent: 60
+  - uid: 24800
+    components:
+    - type: Transform
+      pos: -79.5,17.5
+      parent: 60
+  - uid: 24801
+    components:
+    - type: Transform
+      pos: -77.5,17.5
+      parent: 60
+  - uid: 24802
+    components:
+    - type: Transform
+      pos: -78.5,17.5
+      parent: 60
+  - uid: 24803
+    components:
+    - type: Transform
+      pos: -76.5,17.5
+      parent: 60
+  - uid: 24804
+    components:
+    - type: Transform
+      pos: -75.5,17.5
+      parent: 60
+  - uid: 24805
+    components:
+    - type: Transform
+      pos: -74.5,17.5
+      parent: 60
+  - uid: 24806
+    components:
+    - type: Transform
+      pos: -73.5,17.5
+      parent: 60
+  - uid: 24807
+    components:
+    - type: Transform
+      pos: -72.5,17.5
+      parent: 60
+  - uid: 24808
+    components:
+    - type: Transform
+      pos: -71.5,17.5
+      parent: 60
+  - uid: 24809
+    components:
+    - type: Transform
+      pos: -70.5,17.5
+      parent: 60
+  - uid: 24810
+    components:
+    - type: Transform
+      pos: -70.5,16.5
+      parent: 60
+  - uid: 24811
+    components:
+    - type: Transform
+      pos: -69.5,16.5
+      parent: 60
 - proto: CableMVStack
  entities:
  - uid: 6601
@@ -62231,6 +62352,13 @@ entities:
    - type: Transform
      pos: 51.475224,-22.209888
      parent: 60
+- proto: CurtainsWhiteOpen
+  entities:
+  - uid: 21250
+    components:
+    - type: Transform
+      pos: -2.5,-11.5
+      parent: 60
 - proto: CyberPen
  entities:
  - uid: 10827
@@ -106800,11 +106928,6 @@ entities:
    - type: Transform
      pos: 20.5,14.5
      parent: 60
-  - uid: 18495
-    components:
-    - type: Transform
-      pos: -2.5,-11.5
-      parent: 60
 - proto: HydroponicsToolMiniHoe
  entities:
  - uid: 6157
@@ -109706,6 +109829,13 @@ entities:
      rot: 1.5707963267948966 rad
      pos: 48.5,-1.5
      parent: 60
+- proto: OreProcessor
+  entities:
+  - uid: 19027
+    components:
+    - type: Transform
+      pos: 43.5,3.5
+      parent: 60
 - proto: OxygenCanister
  entities:
  - uid: 2757
@@ -128360,6 +128490,16 @@ entities:
    - type: Transform
      pos: -31.5,13.5
      parent: 60
+  - uid: 24812
+    components:
+    - type: Transform
+      pos: -114.5,30.5
+      parent: 60
+  - uid: 24813
+    components:
+    - type: Transform
+      pos: -108.5,30.5
+      parent: 60
 - proto: SpawnPointBotanist
  entities:
  - uid: 2779
@@ -151448,26 +151588,6 @@ entities:
    - type: Transform
      pos: -108.5,15.5
      parent: 60
-  - uid: 23092
-    components:
-    - type: Transform
-      pos: -107.5,21.5
-      parent: 60
-  - uid: 23093
-    components:
-    - type: Transform
-      pos: -115.5,21.5
-      parent: 60
-  - uid: 23094
-    components:
-    - type: Transform
-      pos: -115.5,30.5
-      parent: 60
-  - uid: 23095
-    components:
-    - type: Transform
-      pos: -107.5,30.5
-      parent: 60
  - uid: 23160
    components:
    - type: Transform
@@ -151896,6 +152016,12 @@ entities:
      rot: 3.141592653589793 rad
      pos: 54.5,5.5
      parent: 60
+  - uid: 24814
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,3.5
+      parent: 60
 - proto: WindoorSecureChapelLocked
  entities:
  - uid: 14513
@@ -153388,12 +153514,6 @@ entities:
      rot: 1.5707963267948966 rad
      pos: 56.5,6.5
      parent: 60
-  - uid: 19027
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 43.5,3.5
-      parent: 60
  - uid: 19907
    components:
    - type: Transform
--- a/Resources/Prototypes/Maps/bagel.yml
+++ b/Resources/Prototypes/Maps/bagel.yml
@@ -17,9 +17,9 @@
          emergencyShuttlePath: /Maps/Shuttles/emergency_lox.yml
        - type: StationJobs
          availableJobs:
-            #service
+            #command
            Captain: [ 1, 1 ]
-            StationAi: [ 1, 1 ]
+            #service
            HeadOfPersonnel: [ 1, 1 ]
            Bartender: [ 1, 2 ]
            Botanist: [ 2, 2 ]
@@ -43,7 +43,6 @@
            ResearchDirector: [ 1, 1 ]
            Scientist: [ 5, 5 ]
            ResearchAssistant: [ 4, 4 ]
-            Borg: [ 2, 2 ]
            #security
            HeadOfSecurity: [ 1, 1 ]
            Warden: [ 1, 1 ]
@@ -61,3 +60,6 @@
            Mime: [ 1, 1 ]
            Musician: [ 1, 1 ]
            Reporter: [ 2, 2 ]
+            #silicon
+            StationAi: [ 1, 1 ]
+            Borg: [ 4, 4 ]