Sorting departments.

TO-DO:
-Get rid of certain syndicate objectives
-Find out how to get rid of Logistics in department.yml
-Add service supervisor from parkstation
-probably adjust icons to what they were in parkstation
-get rid of shoukou when its time to actualy get this on review.

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -64,7 +64,7 @@ public sealed class PostMapInitTest
             "MeteorArena",
             // "Pebble", //DeltaV
             // "Edge", //DeltaV
-            // "Shoukou", //DeltaV
+             "Shoukou", //DeltaV
             // "Tortuga", //DeltaV
             // "Arena", //DeltaV
             // "Asterisk", //DeltaV

Resources/Prototypes/Access/cargo.yml

@@ -14,7 +14,7 @@
   id: Cargo
   tags:
   - Quartermaster
-  - Salvage
+  - Salvage # Parkstation now in engineering but we just keep it here.
   - Cargo
   - Mail # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml
   - Orders # Delta V - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml

Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml

@@ -67,6 +67,8 @@
       - id: TechnicalAssistantPDA
       - id: AtmosPDA
       - id: SeniorEngineerPDA
+      - id: SalvagePDA # Parkstation - Salvage in engineering
+        amount: 2
 
 - type: entity
   name: logistics PDA box
@@ -78,7 +80,7 @@
     contents:
       - id: CargoPDA
         amount: 2
-      - id: SalvagePDA
-        amount: 2
+      #- id: SalvagePDA # Parkstation - Salvage no more in logistics.
+      #  amount: 2
       - id: MailCarrierPDA
         amount: 2

Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml

@@ -64,7 +64,7 @@
     - Common
     - Science
   - type: AccessReader
-    access: [["Cargo"], ["Salvage"], ["Command"], ["Research"]]
+    access: [["Engineering"], ["Salvage"], ["Command"], ["Research"]] # needs to change from cargo to Engineering - Parkstation
   - type: Inventory
     templateId: borgTall
 

Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml

@@ -207,7 +207,7 @@
     layers:
     - state: default
     - state: idshaftminer
-  - type: PresetIdCard
+  - type: PresetIdCard # notin this just incase.
     job: SalvageSpecialist
 
 - type: entity

Resources/Prototypes/Entities/Structures/Machines/salvage.yml

@@ -56,7 +56,7 @@
   - type: IntrinsicRadioReceiver
   - type: ActiveRadio
     channels:
-    - Supply
+    - Engineering  # Parkstation - Engineering instead of Supply
   - type: SalvageMagnet
   - type: ApcPowerReceiver
     powerLoad: 2500 # TODO change this to a HV power draw that really hits the grid hard WHEN active

Resources/Prototypes/Maps/Pools/default.yml

@@ -20,7 +20,7 @@
   #- Asterisk
   #- Edge
   #- Pebble
-  #- Shoukou
+  - Shoukou
   #- Tortuga
   #- TheHive
 # Parkstation

Resources/Prototypes/Maps/shoukou.yml

@@ -0,0 +1,67 @@
+- type: gameMap
+  id: Shoukou
+  mapName: 'Shōkō'
+  mapPath: /Maps/shoukou.yml
+  minPlayers: 0
+  maxPlayers: 65
+  stations:
+    Shoukou:
+      stationProto: StandardNanotrasenStation
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: '{0} Shōkō "Little Port" {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'
+        - type: StationEmergencyShuttle
+          emergencyShuttlePath: /Maps/Shuttles/emergency_box.yml
+        - type: StationJobs
+          overflowJobs:
+            - Passenger
+          availableJobs:
+          #Service
+            Passenger: [ -1, -1 ]
+            ServiceWorker: [ 1, 2]
+            Reporter: [ 0, 1 ]
+            Lawyer: [ 1, 1 ]
+            Bartender: [ 1, 2 ]
+            Botanist: [ 1, 2 ]
+            MartialArtist: [ 2, 3 ]
+            Chef: [ 1, 2 ]
+            Clown: [ 1, 1 ]
+            Janitor: [ 1, 2 ]
+            Musician: [ 1, 1]
+            Mime: [ 1, 1 ]
+            Captain: [ 1, 1 ]
+            HeadOfPersonnel: [ 1, 1 ]
+          #Engineering
+            ChiefEngineer: [ 1, 1 ]
+            StationEngineer: [ 2, 5 ]
+            TechnicalAssistant: [ 2, 3 ]
+            AtmosphericTechnician: [ 1, 2 ]
+          #Medical
+            ChiefMedicalOfficer: [ 1, 1 ]
+            Paramedic: [ 1, 2 ]
+            MedicalDoctor: [ 3, 5 ]
+            Chemist: [ 1, 2 ]
+            MedicalIntern: [ 2, 4 ]
+          #Security
+            HeadOfSecurity: [ 1, 1 ]
+            SecurityOfficer: [ 2, 4 ]
+            Detective: [ 1, 1 ]
+            Warden: [ 1, 1 ]
+            SecurityCadet: [ 1, 3 ]
+            Brigmedic: [ 1, 1 ]
+            #Prisoner: [ 2, 3 ] doesnt work yet aparently
+          #Science
+            ResearchDirector: [ 1, 1 ]
+            Scientist: [ 2, 4 ]
+            ResearchAssistant: [ 2, 3 ]
+            Chaplain: [ 1, 1 ]
+            ForensicMantis: [ 1, 1 ]
+            Borg: [ 2, 2 ]
+          #Logistics
+            Quartermaster: [ 1, 1 ]
+            SalvageSpecialist: [ 2, 4 ]
+            MailCarrier: [ 1, 2 ]
+            CargoTechnician: [ 2, 3 ]

Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml

@@ -6,12 +6,12 @@
   antagAdvantage: 2 # DeltaV - Reduced TC: External Access
   startingGear: CargoTechGear
   icon: "JobIconCargoTechnician"
-  supervisors: job-supervisors-qm
+  supervisors: job-supervisors-qm # keep this in mind that it needs to service head.
   access:
   - Cargo
   - Maintenance
-  extendedAccess:
-  - Salvage
+  #extendedAccess:
+  #- Salvage # Parkstation - Salvage is now in engineering.
   - Orders # DeltaV - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml
 
 - type: startingGear
@@ -22,7 +22,7 @@
     back: ClothingBackpackCargoFilled
     shoes: ClothingShoesColorBlack
     id: CargoPDA
-    ears: ClothingHeadsetCargo
+    ears: ClothingHeadsetCargo # Parkstation = This needs to be service because cargo no more.
     pocket1: AppraisalTool
   innerClothingSkirt: ClothingUniformJumpskirtCargo
   satchel: ClothingBackpackSatchelCargoFilled

Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml

@@ -6,15 +6,15 @@
   antagAdvantage: 3 # DeltaV - Reduced TC: External Access + Free hardsuit and weapons
   requirements:
     - !type:DepartmentTimeRequirement
-      department: Logistics # DeltaV - Logistics Department replacing Cargo
+      department: Engineering # DeltaV - Logistics Department replacing Cargo # ParkStation - Engineering is now their home.
       time: 21600 #DeltaV 6 hrs
   #  - !type:OverallPlaytimeRequirement #DeltaV
   #    time: 36000 #10 hrs
   icon: "JobIconShaftMiner"
   startingGear: SalvageSpecialistGear
-  supervisors: job-supervisors-qm
+  supervisors: job-supervisors-ce # Parkstation - CE is now the head instead of QM
   access:
-  - Cargo
+  - Engineering # ParkStation - Engineering instead of Cargo
   - Salvage
   - Maintenance
   - External
@@ -26,6 +26,6 @@
     back: ClothingBackpackSalvageFilled
     shoes: ClothingShoesBootsSalvage
     id: SalvagePDA
-    ears: ClothingHeadsetCargo
+    ears: ClothingHeadsetEngineering # Parkstation - Engineering instead of Cargo headset, NOTE THAT THE MAGNET NEEDS TO BE CHANGED ASWELL TO APPEAR IN ENGINEERING RADIO
   satchel: ClothingBackpackSatchelSalvageFilled
   duffelbag: ClothingBackpackDuffelSalvageFilled

Resources/Prototypes/Roles/Jobs/departments.yml

@@ -1,11 +1,11 @@
-- type: department
+- type: department # Parkstation - logistics is in civilian, keepin this as its causin fatal error due to it not seein the department.
   id: Logistics # DeltaV - Logistics Department replacing Cargo
   description: department-Cargo-description
   color: "#A46106"
   roles:
   - CargoTechnician
-  - Quartermaster
-  - SalvageSpecialist
+#  - Quartermaster
+#  - SalvageSpecialist # Going to need to change that
   - MailCarrier # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml
 
 - type: department
@@ -20,7 +20,9 @@
   # - Chaplain # DeltaV - Move Chaplain into Epistemics
   - Chef
   - Clown
-  - HeadOfPersonnel
+  #- HeadOfPersonnel # Parkstation - Replaced by different command in place of service head
+  - MailCarrier # Parkstation - civilian job
+  - CargoTechnician # Parkstation - civilian job
   - Janitor
   - Lawyer
   - Librarian
@@ -39,14 +41,14 @@
   description: department-Command-description
   color: "#334E6D"
   roles:
-  - Captain
+  #- Captain # Parkstation - No more, replaced by HoP pretty much
   - CentralCommandOfficial
   - ChiefEngineer
   - ChiefMedicalOfficer
   - HeadOfPersonnel
   - HeadOfSecurity
   - ResearchDirector
-  - Quartermaster
+  #- Quartermaster # Parkstation - No more, cargo becomes part of service
 
 - type: department
   id: Engineering
@@ -58,6 +60,7 @@
   - SeniorEngineer
   - StationEngineer
   - TechnicalAssistant
+  - SalvageSpecialist # Parkstation - salvage in engi
 
 - type: department
   id: Medical