Simple-Station · Adrian16199 · Jan 18, 2024 · Jan 25, 2024 · Jan 25, 2024 · Jan 30, 2024
diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl
@@ -34,7 +34,7 @@ job-description-mime = Entertain the crew through non-vocal means, and engage wi
 job-description-musician = Entertain the crew with your unique musical talent, and acquire new instruments to mess around with.
 job-description-passenger = Enjoy your stay aboard the station with no obligations!
 job-description-psychologist = Provide emotional support to traumatized crew.
-job-description-qm = Manage the supplies of the station & the logistics department, keep the salvage specialists working, make sure all orders are fulfilled, and keep the money flowing.
+job-description-qm = Manage the supplies of the station, make sure all orders are fulfilled, and keep the money flowing.
 job-description-rd = Manage the epistemics department, unlocking technologies, acquiring & researching artifacts, and performing experiments.
 job-description-research-assistant = Learn the basics of how to research various artifacts, anomalies and robotics.
 job-description-reporter = Entertain & inform the crew with your vibrant journalism through wireless cameras, the radio and the news.

diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl
@@ -33,7 +33,7 @@ job-name-botanist = Botanist
 job-name-bartender = Bartender
 job-name-passenger = Passenger
 job-name-salvagespec = Salvage specialist
-job-name-qm = Logistics Officer
+job-name-qm = QuarterMaster
 job-name-cargotech = Cargo Technician
 job-name-chef = Chef
 job-name-clown = Clown

@@ -1,6 +1,6 @@
 job-description-gladiator = Put on a combat spectacle for the crew. Fight for your freedom, glory, and honor. Currently available on Arena.
 job-description-guard = Keep track of prisoners and make sure they have their basic needs.
-job-description-mail-carrier = Deliver mail and other packages from and to logistics. Avoid dogs.
+job-description-mail-carrier = Deliver mail and other packages to and from Cargo. Avoid dogs.
 job-description-martialartist = Be honorable and disciplined, spar in the dojo, challenge security to CQC. Currently available on Shōkō.
 job-description-prisoner = Sit in prison. Gamble with your cellmates. Talk to the warden. Write your memoirs.
 job-description-mantis = Solve mysteries from the nature of the universe to the meaning of life. Be the main person to deal with Psionic beings.
@@ -1 +1,2 @@
 job-supervisors-css = the chief service supervisor
+job-supervisors-cc = central command, and discussion among the board of heads
@@ -57,8 +57,9 @@
   - type: StorageFill
     contents:
       - id: EngineerPDA
-        amount: 3
+        amount: 2
       - id: AtmosPDA
+      - id: SalvagePDA # Parkstation-EngineeringSalvagers
 
 - type: entity
   name: logistics PDA box

@@ -72,7 +72,7 @@
     - Common
     - Science
   - type: AccessReader
-    access: [["Cargo"], ["Salvage"], ["Command"], ["Research"]]
+    access: [["Engineering"], ["Salvage"], ["Command"], ["Research"]] # Parkstation-EngineeringSalvagers
   - type: Inventory
     templateId: borgTall
 

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

diff --git a/Resources/Prototypes/Maps/debug.yml b/Resources/Prototypes/Maps/debug.yml
@@ -28,7 +28,7 @@
           mapNameTemplate: "Dev"
         - type: StationJobs
           overflowJobs:
-          - Captain
+          - HeadOfPersonnel
           availableJobs:
             Captain: [ -1, -1 ]
 

@@ -10,7 +10,8 @@
   - Cargo
   - Maintenance
   - Mail
-
+  - Service # Parkstation
+
 - type: startingGear
   id: MailCarrierGear
   equipment:

@@ -3,7 +3,6 @@
   name: job-name-mantis
   description: job-description-mantis
   playTimeTracker: JobForensicMantis
-  setPreference: false # Parkstation-Playtime
   requirements:
     - !type:OverallPlaytimeRequirement
       time: 18000
@@ -39,7 +38,7 @@
     gloves: ClothingHandsGlovesColorWhite
     outerClothing: ClothingOuterCoatMantis
     belt: ClothingBeltMantis
-    # pocket2: ForensicScanner # DeltaV - Mantis is no longer a Detective
+    pocket2: ForensicScanner
   innerClothingSkirt: ClothingUniformSkirtMantis
   satchel: ClothingBackpackSatchelMantisFilled
   duffelbag: ClothingBackpackDuffelMantisFilled
@@ -9,6 +9,6 @@
     security: "#DE3A3A96"
     bar: "#79150096"
     epistemics: "#D381C996" # DeltaV - Epistemics Department replacing Science
-    logistics: "#A4610696" # DeltaV - Logistics Department replacing Cargo
+    #logistics: "#A4610696" # DeltaV - Logistics Department replacing Cargo
     neutral: "#D4D4D496"
     neutralLight: "#D4D4D428"
@@ -8,37 +8,37 @@
   #  - !type:RoleTimeRequirement #DeltaV
   #    role: JobCargoTechnician
   #    time: 21600 #6 hrs
-    - !type:RoleTimeRequirement
-      role: JobSalvageSpecialist
-      time: 10800 #3 hrs
-    - !type:RoleTimeRequirement # DeltaV - Courier role time requirement
-      role: JobMailCarrier
-      time: 7200 # 2 hours
-    - !type:DepartmentTimeRequirement
-      department: Logistics # DeltaV - Logistics Department replacing Cargo
-      time: 43200 #DeltaV 12 hours
-    - !type:OverallPlaytimeRequirement
-      time: 144000 #40 hrs
-  weight: 10
+    #- !type:RoleTimeRequirement   #Parkstation - No longer has these requirements from here.
+    #  role: JobSalvageSpecialist
+    #  time: 10800 #3 hrs
+    #- !type:RoleTimeRequirement # DeltaV - Courier role time requirement
+    #  role: JobMailCarrier
+    #  time: 7200 # 2 hours
+    #- !type:DepartmentTimeRequirement
+    #  department: Logistics # DeltaV - Logistics Department replacing Cargo
+    #  time: 43200 #DeltaV 12 hours
+    #- !type:OverallPlaytimeRequirement
+    #  time: 144000 #40 hrs     # Parkstation - No longer has these requirements till here.
+  # weight: 10   # Parkstation - No longer command.
   startingGear: QuartermasterGear
   icon: "JobIconQuarterMaster"
-  supervisors: job-supervisors-captain
-  canBeAntag: false
+  supervisors: job-supervisors-css
+  #canBeAntag: false
   access:
   - Cargo
-  - Salvage
+  #- Salvage # Parkstation - Salvage is now engineering
   - Mail # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml
   - Quartermaster
   - Maintenance
-  - Command
+  #- Command # Parkstation - Quartermaster isnt a head anymore.
   - Orders # DeltaV - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml
   - External # DeltaV - for promoting salvage specialists
-  special:
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
-  - !type:AddComponentSpecial
-    components:
-      - type: CommandStaff
+  #special: # Parkstation - No longer command.
+  #- !type:AddImplantSpecial
+  #  implants: [ MindShieldImplant ]
+  #- !type:AddComponentSpecial
+  #  components:
+  #    - type: CommandStaff
 
 - type: startingGear
   id: QuartermasterGear

@@ -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-EngineeringSalvagers
   access:
-  - Cargo
+  - Engineering # ParkStation-EngineeringSalvagers
   - Salvage
   - Maintenance
   - External

@@ -3,10 +3,11 @@
   name: job-name-captain
   description: job-description-captain
   playTimeTracker: JobCaptain
+  setPreference: false # Parkstation-Playtime
   requirements:
-    - !type:DepartmentTimeRequirement
-      department: Logistics # DeltaV - Logistics Department replacing Cargo
-      time: 18000 # DeltaV - 5 hours
+    #- !type:DepartmentTimeRequirement
+    #  department: Logistics # DeltaV - Logistics Department replacing Cargo
+    #  time: 18000 # DeltaV - 5 hours
     - !type:DepartmentTimeRequirement
       department: Engineering
       time: 18000 # DeltaV - 5 hours

@@ -21,7 +21,7 @@
   startingGear: HoPGear
   icon: "JobIconHeadOfPersonnel"
   requireAdminNotify: true
-  supervisors: job-supervisors-captain
+  supervisors: job-supervisors-cc # ParkStation - Oligarchy
   canBeAntag: false
   access:
   - Command
@@ -32,24 +32,24 @@
   - Janitor
   - Theatre
   - Kitchen
-#  - Chapel
+  - Chapel
   - Hydroponics
   - External
   # I mean they'll give themselves the rest of the access levels *anyways*.
   # As of 15/03/23 they can't do that so here's MOST of the rest of the access levels.
   # Head level access that isn't their own was deliberately left out, get AA from the captain instead.
-  # Delta V - fuck all of this HoP is a service role
-#  - Chemistry
-#  - Engineering
-#  - Research
-#  - Detective
-#  - Salvage
-#  - Security # NoooOoOo!! My HoPcurity!1
+  # Delta V - fuck all of this HoP is a service role, # Parkstation - NU UH
+  - Chemistry
+  - Engineering
+  - Research
+  - Detective
+  - Salvage
+  - Security # NoooOoOo!! My HoPcurity!1
 #  - Brig
   - Lawyer
-#  - Cargo
-#  - Atmospherics
-#  - Medical
+  - Cargo
+  - Atmospherics
+  - Medical
   - Boxer # DeltaV - Add Boxer access
   - Clown # DeltaV - Add Clown access
   - Library # DeltaV - Add Library access

@@ -1,12 +1,12 @@
-- type: department
-  id: Logistics # DeltaV - Logistics Department replacing Cargo
-  description: department-Cargo-description
-  color: "#A46106"
-  roles:
-  - CargoTechnician
-  - Quartermaster
-  - SalvageSpecialist
-  - MailCarrier # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml
+#- type: department # Parkstation - logistics is in civilian, deletin this gives big error.
+#  id: Logistics # DeltaV - Logistics Department replacing Cargo
+#  description: department-Cargo-description
+#  color: "#A46106"
+#  roles:
+  #- CargoTechnician
+#  - Quartermaster
+  #- SalvageSpecialist # Going to need to change that
+#  - MailCarrier # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml
 
 - type: department
   id: Civilian
@@ -21,8 +21,10 @@
   # - Chaplain # DeltaV - Move Chaplain into Epistemics
   - Chef
   - Clown
-  - HeadOfPersonnel
+  #- HeadOfPersonnel # Parkstation - Replaced by ChiefServiceSupervisor as service command.
+  - MailCarrier # Parkstation - civilian job
   - ChiefServiceSupervisor # Parkstation-CSS
+  - Quartermaster # Parkstation - the cargo man.
   - Janitor
   - Lawyer
   - Librarian
@@ -41,15 +43,15 @@
   description: department-Command-description
   color: "#334E6D"
   roles:
-  - Captain
+  - Captain # Parkstation - keepin this for Death to handle it.
   - CentralCommandOfficial
   - ChiefServiceSupervisor # Parkstation-CSS
   - ChiefEngineer
   - ChiefMedicalOfficer
   - HeadOfPersonnel
   - HeadOfSecurity
   - ResearchDirector
-  - Quartermaster
+  #- Quartermaster # Parkstation - No more, cargo becomes part of service
   primary: false
   weight: 100
 
@@ -63,6 +65,7 @@
   - SeniorEngineer
   - StationEngineer
   - TechnicalAssistant
+  - SalvageSpecialist # Parkstation - salvage in engi
 
 - type: department
   id: Medical

diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png b/Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png