Detectives gain independency (#23114)

* add

* fix

* civilian-ise

* update headset name

* aspid det door

* add

Resources/Locale/en-US/job/job-description.ftl

@@ -16,7 +16,7 @@ job-description-chemist = Produce medicinal drugs for the doctors to use, resear
 job-description-clown = Entertain the crew through elaborate slapstick routines or terrible jokes.
 job-description-cmo = Manage the resources and personnel of the medical department to keep the crew alive.
 job-description-paramedic = Rescue critically injured patients all over the station, sometimes outside too. Stablize them, give them a ride to medbay, and get back out there!
-job-description-detective = Investigate crime scenes using forensic tools, ensure that the guilty party is found, and have a couple smokes.
+job-description-detective = Answer requests for help, investigate crime scenes using forensic tools, and have a couple smokes.
 job-description-doctor = Diagnose and heal crewmembers through medicinal chemicals, advanced medicine, and defibrillators. Make sure the dead don't rot, and that cadavers are in the morgue.
 job-description-engineer = Keep the station's main engine & solars active, optimize the power network, and make emergency repairs using your hardsuit in spaced areas.
 job-description-ertengineer = Ensure that the station has power and clean air.

Resources/Maps/aspid.yml

@@ -10715,6 +10715,13 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,1.5
       parent: 8756
+- proto: AirlockDetectiveGlassLocked
+  entities:
+  - uid: 3192
+    components:
+    - type: Transform
+      pos: 39.5,48.5
+      parent: 1
 - proto: AirlockEngineeringGlassLocked
   entities:
   - uid: 9075
@@ -12484,11 +12491,6 @@ entities:
       parent: 1
 - proto: AirlockSecurityGlassLocked
   entities:
-  - uid: 3192
-    components:
-    - type: Transform
-      pos: 39.5,48.5
-      parent: 1
   - uid: 8211
     components:
     - type: Transform

Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml

@@ -31,13 +31,12 @@
 
 - type: entity
   noSpawn: true
-  parent: ClothingBackpackSecurity
-  id: ClothingBackpackSecurityFilledDetective
+  parent: ClothingBackpack
+  id: ClothingBackpackFilledDetective
   components:
   - type: StorageFill
     contents:
       - id: BoxSurvivalSecurity
-      - id: Flash
       - id: ForensicPad
       - id: ForensicScanner
 

Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml

@@ -30,13 +30,12 @@
 
 - type: entity
   noSpawn: true
-  parent: ClothingBackpackDuffelSecurity
-  id: ClothingBackpackDuffelSecurityFilledDetective
+  parent: ClothingBackpackDuffel
+  id: ClothingBackpackDuffelFilledDetective
   components:
   - type: StorageFill
     contents:
       - id: BoxSurvivalSecurity
-      - id: Flash
       - id: ForensicPad
       - id: ForensicScanner
 

Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml

@@ -44,13 +44,12 @@
 
 - type: entity
   noSpawn: true
-  parent: ClothingBackpackSatchelSecurity
-  id: ClothingBackpackSatchelSecurityFilledDetective
+  parent: ClothingBackpackSatchel
+  id: ClothingBackpackSatchelFilledDetective
   components:
   - type: StorageFill
     contents:
       - id: BoxSurvivalSecurity
-      - id: Flash
       - id: ForensicPad
       - id: ForensicScanner
 

Resources/Prototypes/Roles/Jobs/Security/detective.yml → Resources/Prototypes/Roles/Jobs/Civilian/detective.yml

@@ -1,38 +1,39 @@
-- type: job
-  id: Detective
-  name: job-name-detective
-  description: job-description-detective
-  playTimeTracker: JobDetective
-  requirements:
-  - !type:DepartmentTimeRequirement
-    department: Security
-    time: 54000 # 15 hours
-  startingGear: DetectiveGear
-  icon: "JobIconDetective"
-  supervisors: job-supervisors-hos
-  canBeAntag: false
-  access:
-  - Security
-  - Brig
-  - Maintenance
-  - Service
-  - Detective
-  special:
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
-
-- type: startingGear
-  id: DetectiveGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitDetective
-    back: ClothingBackpackSecurityFilledDetective
-    shoes: ClothingShoesBootsCombatFilled
-    eyes: ClothingEyesGlassesSunglasses
-    head: ClothingHeadHatFedoraBrown
-    outerClothing: ClothingOuterVestDetective
-    id: DetectivePDA
-    ears: ClothingHeadsetSecurity
-    belt: ClothingBeltHolsterFilled
-  innerClothingSkirt: ClothingUniformJumpskirtDetective
-  satchel: ClothingBackpackSatchelSecurityFilledDetective
-  duffelbag: ClothingBackpackDuffelSecurityFilledDetective
+- type: job
+  id: Detective
+  name: job-name-detective
+  description: job-description-detective
+  playTimeTracker: JobDetective
+  requirements:
+  - !type:DepartmentTimeRequirement
+    department: Security
+    time: 36000 # 10 hours
+  - !type:DepartmentTimeRequirement
+    department: Civilian
+    time: 18000 # 5 hours
+  startingGear: DetectiveGear
+  icon: "JobIconDetective"
+  supervisors: job-supervisors-hop
+  canBeAntag: true
+  access:
+  - Brig
+  - Maintenance
+  - Service
+  - Detective
+  extendedAccess:
+  - Security
+
+- type: startingGear
+  id: DetectiveGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitDetective
+    back: ClothingBackpackFilledDetective
+    shoes: ClothingShoesBootsCombatFilled
+    eyes: ClothingEyesGlassesSunglasses
+    head: ClothingHeadHatFedoraBrown
+    outerClothing: ClothingOuterVestDetective
+    id: DetectivePDA
+    ears: ClothingHeadsetSecurity
+    belt: ClothingBeltHolsterFilled
+  innerClothingSkirt: ClothingUniformJumpskirtDetective
+  satchel: ClothingBackpackSatchelFilledDetective
+  duffelbag: ClothingBackpackDuffelFilledDetective

Resources/migration.yml

@@ -165,3 +165,8 @@ ClothingHeadHelmetVoidParamed: null
 
 # 2024-01-19
 DefaultStationBeaconTeslaEngine: null
+
+#2024-01-27
+ClothingBackpackSecurityFilledDetective: ClothingBackpackFilledDetective
+ClothingBackpackDuffelSecurityFilledDetective: ClothingBackpackDuffelFilledDetective
+ClothingBackpackSatchelSecurityFilledDetective: ClothingBackpackSatchelFilledDetective