Merge pull request #1646 from DinnerCalzone/stations

Add Supply Assistant and Administrative Assistant to Amber, Atlas, Bagel, Boat, Cluster, Cog, Convex, Hummingbird, Marathon, Oasis, Omega, Origin, Plasma, Saltern, Train
impstation · Feb 11, 2025 · 9e19082 · 9e19082
2 parents bca8075 + 308f2c6
commit 9e19082
Show file tree

Hide file tree

Showing 30 changed files with 414,397 additions and 1,625 deletions.
diff --git a/Resources/Maps/_Impstation/amber.yml b/Resources/Maps/_Impstation/amber.yml
@@ -61939,6 +61939,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 20.469517,17.597729
       parent: 2
+  - uid: 23414
+    components:
+    - type: Transform
+      pos: -19.5,-52.5
+      parent: 2
 - proto: ChairFoldingSpawnFolded
   entities:
   - uid: 18834
@@ -109566,6 +109571,13 @@ entities:
         - Pressed: Toggle
         4890:
         - Pressed: Toggle
+- proto: LockerAdministrativeAssistantFilled
+  entities:
+  - uid: 23416
+    components:
+    - type: Transform
+      pos: -20.5,-51.5
+      parent: 2
 - proto: LockerAtmosphericsFilledHardsuit
   entities:
   - uid: 1929
@@ -112483,6 +112495,7 @@ entities:
 
         ===================================================
     - type: Contraband
+      allowedJobs: []
       allowedDepartments:
       - Security
       severity: Syndicate
@@ -128159,6 +128172,13 @@ entities:
     - type: Transform
       pos: -37.5,-38.5
       parent: 2
+- proto: SpawnPointAdminAssistant
+  entities:
+  - uid: 23415
+    components:
+    - type: Transform
+      pos: -19.5,-52.5
+      parent: 2
 - proto: SpawnPointAtmos
   entities:
   - uid: 1931
@@ -128243,21 +128263,11 @@ entities:
       parent: 2
 - proto: SpawnPointCargoTechnician
   entities:
-  - uid: 916
-    components:
-    - type: Transform
-      pos: 1.5,24.5
-      parent: 2
   - uid: 917
     components:
     - type: Transform
       pos: -0.5,24.5
       parent: 2
-  - uid: 920
-    components:
-    - type: Transform
-      pos: 0.5,22.5
-      parent: 2
   - uid: 921
     components:
     - type: Transform
@@ -128521,6 +128531,18 @@ entities:
     - type: Transform
       pos: 20.5,-8.5
       parent: 2
+- proto: SpawnPointLogisticsAssistant
+  entities:
+  - uid: 916
+    components:
+    - type: Transform
+      pos: 1.5,24.5
+      parent: 2
+  - uid: 920
+    components:
+    - type: Transform
+      pos: 0.5,22.5
+      parent: 2
 - proto: SpawnPointMedicalDoctor
   entities:
   - uid: 3656

diff --git a/Resources/Maps/_Impstation/atlas.yml b/Resources/Maps/_Impstation/atlas.yml
@@ -14303,6 +14303,11 @@ entities:
     - type: Transform
       pos: -27.5,14.5
       parent: 2
+  - uid: 7069
+    components:
+    - type: Transform
+      pos: 41.5,2.5
+      parent: 2
 - proto: CableApcStack
   entities:
   - uid: 1898
@@ -22246,6 +22251,12 @@ entities:
     - type: Transform
       pos: -19.5,13.5
       parent: 2
+  - uid: 9948
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 35.5,2.5
+      parent: 2
 - proto: ChairOfficeLight
   entities:
   - uid: 3428
@@ -47254,6 +47265,13 @@ entities:
     - type: Transform
       pos: -65.51371,-16.937654
       parent: 2
+- proto: LockerAdministrativeAssistantFilled
+  entities:
+  - uid: 9950
+    components:
+    - type: Transform
+      pos: 37.5,4.5
+      parent: 2
 - proto: LockerAtmosphericsFilledHardsuit
   entities:
   - uid: 6796
@@ -48994,7 +49012,8 @@ entities:
   - uid: 7050
     components:
     - type: Transform
-      pos: 39.5,4.5
+      rot: -1.5707963267948966 rad
+      pos: 42.5,2.5
       parent: 2
   - uid: 7051
     components:
@@ -49128,12 +49147,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -53.5,-1.5
       parent: 2
-  - uid: 7069
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 39.5,0.5
-      parent: 2
   - uid: 7070
     components:
     - type: Transform
@@ -50251,6 +50264,17 @@ entities:
       rot: 3.141592653589793 rad
       pos: -19.5,9.5
       parent: 2
+  - uid: 9951
+    components:
+    - type: Transform
+      pos: 38.5,4.5
+      parent: 2
+  - uid: 9952
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 38.5,0.5
+      parent: 2
 - proto: PoweredlightLED
   entities:
   - uid: 7227
@@ -54850,6 +54874,13 @@ entities:
     - type: Transform
       pos: -2.5,-8.5
       parent: 2
+- proto: SpawnPointAdminAssistant
+  entities:
+  - uid: 9949
+    components:
+    - type: Transform
+      pos: 35.5,2.5
+      parent: 2
 - proto: SpawnPointAtmos
   entities:
   - uid: 7984
@@ -55093,6 +55124,18 @@ entities:
     - type: Transform
       pos: -39.5,-8.5
       parent: 2
+- proto: SpawnPointLogisticsAssistant
+  entities:
+  - uid: 9946
+    components:
+    - type: Transform
+      pos: -22.5,14.5
+      parent: 2
+  - uid: 9947
+    components:
+    - type: Transform
+      pos: -16.5,15.5
+      parent: 2
 - proto: SpawnPointMedicalDoctor
   entities:
   - uid: 8017