From 7a4c30de2d7f408557214550c8efde9d0208ee35 Mon Sep 17 00:00:00 2001
From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Tue, 25 Jul 2023 23:32:26 -0600
Subject: [PATCH] Fland update (#18312)

* fland update

* fland

* Update fland.yml
---
 Resources/Maps/fland.yml            | 237 ++++++++++++++--------------
 Resources/Prototypes/Maps/fland.yml |  59 ++++---
 2 files changed, 157 insertions(+), 139 deletions(-)

diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml
index c6d55e2f87..8e533ee8ac 100644
--- a/Resources/Maps/fland.yml
+++ b/Resources/Maps/fland.yml
@@ -29362,16 +29362,16 @@ entities:
     - pos: 3.542757,-12.43592
       parent: 13329
       type: Transform
+  - uid: 18803
+    components:
+    - pos: 75.59073,-9.579284
+      parent: 13329
+      type: Transform
   - uid: 26254
     components:
     - pos: 84.57733,-11.181693
       parent: 13329
       type: Transform
-  - uid: 26564
-    components:
-    - pos: 77.38629,-11.050114
-      parent: 13329
-      type: Transform
   - uid: 27818
     components:
     - pos: 88.52823,36.58386
@@ -94627,42 +94627,6 @@ entities:
       pos: 40.5,-7.5
       parent: 13329
       type: Transform
-  - uid: 26504
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 75.5,-11.5
-      parent: 13329
-      type: Transform
-  - uid: 26505
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 78.5,-9.5
-      parent: 13329
-      type: Transform
-  - uid: 26506
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 78.5,-10.5
-      parent: 13329
-      type: Transform
-  - uid: 26507
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 75.5,-10.5
-      parent: 13329
-      type: Transform
-  - uid: 26508
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 75.5,-9.5
-      parent: 13329
-      type: Transform
-  - uid: 26509
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 78.5,-11.5
-      parent: 13329
-      type: Transform
   - uid: 29383
     components:
     - rot: 1.5707963267948966 rad
@@ -95261,6 +95225,11 @@ entities:
       pos: 31.5,21.5
       parent: 13329
       type: Transform
+  - uid: 10163
+    components:
+    - pos: 76.5,-9.5
+      parent: 13329
+      type: Transform
   - uid: 10171
     components:
     - rot: -1.5707963267948966 rad
@@ -95329,6 +95298,18 @@ entities:
     - pos: 50.5,-20.5
       parent: 13329
       type: Transform
+  - uid: 18605
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 76.5,-10.5
+      parent: 13329
+      type: Transform
+  - uid: 18755
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 76.5,-11.5
+      parent: 13329
+      type: Transform
   - uid: 18811
     components:
     - rot: -1.5707963267948966 rad
@@ -99986,6 +99967,13 @@ entities:
     - pos: -35.455948,-39.408646
       parent: 13329
       type: Transform
+- proto: ClothingBeltUtilityEngineering
+  entities:
+  - uid: 18480
+    components:
+    - pos: 75.48135,-11.298034
+      parent: 13329
+      type: Transform
 - proto: ClothingEyesBlindfold
   entities:
   - uid: 34069
@@ -100108,14 +100096,14 @@ entities:
       type: Transform
 - proto: ClothingEyesHudDiagnostic
   entities:
-  - uid: 34226
+  - uid: 18535
     components:
-    - pos: 76.599434,-10.249322
+    - pos: 76.46573,-8.423034
       parent: 13329
       type: Transform
-  - uid: 34227
+  - uid: 18565
     components:
-    - pos: 76.67756,-10.374322
+    - pos: 76.23135,-8.282409
       parent: 13329
       type: Transform
 - proto: ClothingEyesHudMedical
@@ -100399,13 +100387,6 @@ entities:
     - pos: 60.558964,5.5990562
       parent: 13329
       type: Transform
-- proto: ClothingHeadHatBeretEngineering
-  entities:
-  - uid: 34228
-    components:
-    - pos: 77.581795,-9.247614
-      parent: 13329
-      type: Transform
 - proto: ClothingHeadHatBunny
   entities:
   - uid: 26738
@@ -114887,13 +114868,6 @@ entities:
     - pos: 76.51208,10.037497
       parent: 13329
       type: Transform
-- proto: DrinkMug
-  entities:
-  - uid: 26565
-    components:
-    - pos: 76.93317,-9.509
-      parent: 13329
-      type: Transform
 - proto: DrinkMugBlue
   entities:
   - uid: 18894
@@ -114901,13 +114875,6 @@ entities:
     - pos: 12.583618,68.310875
       parent: 13329
       type: Transform
-- proto: DrinkMugDog
-  entities:
-  - uid: 26567
-    components:
-    - pos: 77.37067,-10.415103
-      parent: 13329
-      type: Transform
 - proto: DrinkMugHeart
   entities:
   - uid: 18893
@@ -114922,11 +114889,6 @@ entities:
       type: Transform
 - proto: DrinkMugMetal
   entities:
-  - uid: 26566
-    components:
-    - pos: 76.677574,-9.710828
-      parent: 13329
-      type: Transform
   - uid: 31471
     components:
     - pos: 68.35971,44.462242
@@ -116245,6 +116207,11 @@ entities:
     - pos: 21.5,-12.5
       parent: 13329
       type: Transform
+  - uid: 18797
+    components:
+    - pos: 75.5,-12.5
+      parent: 13329
+      type: Transform
   - uid: 19162
     components:
     - pos: 11.5,-14.5
@@ -170415,11 +170382,6 @@ entities:
     - pos: -26.46547,56.93831
       parent: 13329
       type: Transform
-  - uid: 10163
-    components:
-    - pos: 16.51569,21.87028
-      parent: 13329
-      type: Transform
   - uid: 10495
     components:
     - pos: 37.489162,24.909925
@@ -170651,6 +170613,13 @@ entities:
     - pos: 123.55489,3.5750852
       parent: 13329
       type: Transform
+- proto: LampInterrogator
+  entities:
+  - uid: 18604
+    components:
+    - pos: 16.491692,21.953949
+      parent: 13329
+      type: Transform
 - proto: lantern
   entities:
   - uid: 6634
@@ -170744,9 +170713,9 @@ entities:
     - pos: 2.4595866,8.876804
       parent: 13329
       type: Transform
-  - uid: 26568
+  - uid: 18479
     components:
-    - pos: 76.54254,-11.196353
+    - pos: 75.46573,-10.173034
       parent: 13329
       type: Transform
   - uid: 26691
@@ -173807,6 +173776,11 @@ entities:
     - pos: 52.5,27.5
       parent: 13329
       type: Transform
+  - uid: 19148
+    components:
+    - pos: 9.5,65.5
+      parent: 13329
+      type: Transform
   - uid: 28917
     components:
     - pos: 63.5,14.5
@@ -176165,6 +176139,11 @@ entities:
     - pos: 13.5,40.5
       parent: 13329
       type: Transform
+  - uid: 18564
+    components:
+    - pos: 75.5,-8.5
+      parent: 13329
+      type: Transform
   - uid: 18634
     components:
     - pos: 12.5,47.5
@@ -176426,11 +176405,6 @@ entities:
     - pos: -41.511772,-51.484776
       parent: 13329
       type: Transform
-  - uid: 26572
-    components:
-    - pos: 77.57379,-10.878239
-      parent: 13329
-      type: Transform
   - uid: 29479
     components:
     - pos: 65.34044,35.71446
@@ -197306,9 +197280,9 @@ entities:
       type: Transform
 - proto: SpawnMobBandito
   entities:
-  - uid: 19940
+  - uid: 18629
     components:
-    - pos: 55.5,-19.5
+    - pos: 50.5,-39.5
       parent: 13329
       type: Transform
 - proto: SpawnMobBearSalvage
@@ -197822,6 +197796,16 @@ entities:
     - pos: 5.5,67.5
       parent: 13329
       type: Transform
+  - uid: 19144
+    components:
+    - pos: 5.5,68.5
+      parent: 13329
+      type: Transform
+  - uid: 19145
+    components:
+    - pos: 7.5,65.5
+      parent: 13329
+      type: Transform
 - proto: SpawnPointMime
   entities:
   - uid: 1661
@@ -197979,6 +197963,34 @@ entities:
     - pos: 35.5,13.5
       parent: 13329
       type: Transform
+- proto: SpawnPointSeniorEngineer
+  entities:
+  - uid: 19142
+    components:
+    - pos: 72.5,-2.5
+      parent: 13329
+      type: Transform
+- proto: SpawnPointSeniorOfficer
+  entities:
+  - uid: 19141
+    components:
+    - pos: 35.5,9.5
+      parent: 13329
+      type: Transform
+- proto: SpawnPointSeniorPhysician
+  entities:
+  - uid: 19143
+    components:
+    - pos: 7.5,68.5
+      parent: 13329
+      type: Transform
+- proto: SpawnPointSeniorResearcher
+  entities:
+  - uid: 18924
+    components:
+    - pos: 28.5,-49.5
+      parent: 13329
+      type: Transform
 - proto: SpawnPointServiceWorker
   entities:
   - uid: 1798
@@ -204696,6 +204708,31 @@ entities:
     - pos: 13.5,41.5
       parent: 13329
       type: Transform
+  - uid: 18478
+    components:
+    - pos: 75.5,-10.5
+      parent: 13329
+      type: Transform
+  - uid: 18610
+    components:
+    - pos: 76.5,-8.5
+      parent: 13329
+      type: Transform
+  - uid: 18787
+    components:
+    - pos: 75.5,-9.5
+      parent: 13329
+      type: Transform
+  - uid: 18794
+    components:
+    - pos: 75.5,-8.5
+      parent: 13329
+      type: Transform
+  - uid: 18804
+    components:
+    - pos: 75.5,-11.5
+      parent: 13329
+      type: Transform
   - uid: 18886
     components:
     - pos: 12.5,68.5
@@ -204782,36 +204819,6 @@ entities:
       pos: 86.5,-15.5
       parent: 13329
       type: Transform
-  - uid: 26510
-    components:
-    - pos: 76.5,-10.5
-      parent: 13329
-      type: Transform
-  - uid: 26511
-    components:
-    - pos: 76.5,-11.5
-      parent: 13329
-      type: Transform
-  - uid: 26512
-    components:
-    - pos: 77.5,-11.5
-      parent: 13329
-      type: Transform
-  - uid: 26513
-    components:
-    - pos: 77.5,-9.5
-      parent: 13329
-      type: Transform
-  - uid: 26514
-    components:
-    - pos: 77.5,-10.5
-      parent: 13329
-      type: Transform
-  - uid: 26515
-    components:
-    - pos: 76.5,-9.5
-      parent: 13329
-      type: Transform
   - uid: 29011
     components:
     - pos: 80.5,14.5
diff --git a/Resources/Prototypes/Maps/fland.yml b/Resources/Prototypes/Maps/fland.yml
index dbb595ca8c..da81beba2c 100644
--- a/Resources/Prototypes/Maps/fland.yml
+++ b/Resources/Prototypes/Maps/fland.yml
@@ -18,37 +18,48 @@
           overflowJobs:
             - Passenger
           availableJobs:
-            CargoTechnician: [ 4, 4 ]
-            Passenger: [ -1, -1 ]
+            #service
+            Captain: [ 1, 1 ]
+            HeadOfPersonnel: [ 1, 1 ]
             Bartender: [ 2, 2 ]
             Botanist: [ 4, 4 ]
             Chef: [ 2, 2 ]
-            Clown: [ 1, 1 ]
             Janitor: [ 3, 3 ]
-            Mime: [ 1, 1 ]
-            Captain: [ 1, 1 ]
-            HeadOfPersonnel: [ 1, 1 ]
-            ChiefEngineer: [ 1, 1 ]
-            StationEngineer: [ 6, 6 ]
-            ChiefMedicalOfficer: [ 1, 1 ]
-            MedicalDoctor: [ 6, 6 ]
-            Chemist: [ 3, 3 ]
-            ResearchDirector: [ 1, 1 ]
-            Scientist: [ 4, 4 ]
-            HeadOfSecurity: [ 1, 1 ]
-            SecurityOfficer: [ 7, 7 ]
             Chaplain: [ 1, 1 ]
-            Warden: [ 1, 1 ]
             Librarian: [ 1, 1 ]
+            ServiceWorker: [ 2, 2 ]
+            #engineering
+            ChiefEngineer: [ 1, 1 ]
+            SeniorEngineer: [ 1, 1 ]
+            AtmosphericTechnician: [ 3, 3 ]
+            StationEngineer: [ 4, 4 ]
+            TechnicalAssistant: [ 4, 4 ]
+            #medical
+            ChiefMedicalOfficer: [ 1, 1 ]
+            SeniorPhysician: [ 1, 1 ]
+            Chemist: [ 3, 3 ]
+            MedicalDoctor: [ 5, 5 ]
+            Paramedic: [ 2, 2 ]
+            MedicalIntern: [ 4, 4 ]
+            #science
+            ResearchDirector: [ 1, 1 ]
+            SeniorResearcher: [ 1, 1 ]        
+            Scientist: [ 4, 4 ]
+            ResearchAssistant: [ 6, 6 ] 
+            #security
+            HeadOfSecurity: [ 1, 1 ]
+            Warden: [ 1, 1 ]
+            SeniorOfficer: [ 1, 1 ]
+            SecurityOfficer: [ 7, 7 ]
+            Detective: [ 1, 1 ]
+            SecurityCadet: [ 4, 4 ]
             Lawyer: [ 2, 2 ]
+            #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]
+            CargoTechnician: [ 4, 4 ]
+            #civilian
+            Passenger: [ -1, -1 ]
+            Clown: [ 1, 1 ]
+            Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            AtmosphericTechnician: [ 3, 3 ]
-            TechnicalAssistant: [ 4, 4 ]
-            MedicalIntern: [ 4, 4 ]
-            ServiceWorker: [ 2, 2 ]
-            SecurityCadet: [ 4, 4 ]
-            Detective: [ 1, 1 ]
-            ResearchAssistant: [ 6, 6 ]
-            Paramedic: [ 2, 2 ]