Return Detective to Security (#25986)

* Revert "detective patch (#24739)"

This reverts commit 8ef69ff2e1f83b08c9585d2517e917075c8271cf.

* Revert "Detectives gain independency (#23114)"

This reverts commit 807f5facbbc4a9e646e9f8257a42412841a5340f.

diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl
index 2a094fb0adca96f9c53d454df0bf3df741ed6462..c9d53bb5b5e6d794a6fd5e2562c40e43584f7b12 100644 (file)
--- a/Resources/Locale/en-US/job/job-description.ftl
+++ b/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 = Answer requests for help, investigate crime scenes using forensic tools, and have a couple smokes.
+job-description-detective = Investigate crime scenes using forensic tools, ensure that the guilty party is found, 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.

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
index 6a27229af9bac68420b9d23b4740c3d24ff800a0..b961659c0825103f06272e569775b7ddda872e17 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -31,12 +31,13 @@
 
 - type: entity
   noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackFilledDetective
+  parent: ClothingBackpackSecurity
+  id: ClothingBackpackSecurityFilledDetective
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvival
+      - id: BoxSurvivalSecurity
+      - id: Flash
       - id: ForensicPad
       - id: ForensicScanner
 

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
index 44a1c88de3534d52a663193cf9d8d7c2e546b1fb..504054dc27882e31bb949d3507b8fd680d81bd9b 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -30,12 +30,13 @@
 
 - type: entity
   noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelFilledDetective
+  parent: ClothingBackpackDuffelSecurity
+  id: ClothingBackpackDuffelSecurityFilledDetective
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvival
+      - id: BoxSurvivalSecurity
+      - id: Flash
       - id: ForensicPad
       - id: ForensicScanner
 

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
index 7b2bb55cac4fd8418995536db92805f10cb84e0b..3b1b7f73a5cd9b69ed0d45385391893f9fc142f1 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -44,12 +44,13 @@
 
 - type: entity
   noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelFilledDetective
+  parent: ClothingBackpackSatchelSecurity
+  id: ClothingBackpackSatchelSecurityFilledDetective
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvival
+      - id: BoxSurvivalSecurity
+      - id: Flash
       - id: ForensicPad
       - id: ForensicScanner
 

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
similarity index 63%
rename from Resources/Prototypes/Roles/Jobs/Civilian/detective.yml
rename to Resources/Prototypes/Roles/Jobs/Security/detective.yml
index d4b18697bdc0d0e077246dde2d7cb0281e56dd2d..e8d6299f48b817e612c95a968f4b26da50c21ddd 100644 (file)
--- a/Resources/Prototypes/Roles/Jobs/Civilian/detective.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
@@ -1,39 +1,38 @@
-- 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
-    outerClothing: ClothingOuterVestDetective
-    back: ClothingBackpackFilledDetective
-    shoes: ClothingShoesBootsJack
-    eyes: ClothingEyesGlassesSunglasses
-    head: ClothingHeadHatFedoraBrown
-    id: DetectivePDA
-    ears: ClothingHeadsetSecurity
-    belt: ClothingBeltHolsterFilled
-  innerClothingSkirt: ClothingUniformJumpskirtDetective
-  satchel: ClothingBackpackSatchelFilledDetective
-  duffelbag: ClothingBackpackDuffelFilledDetective
+- type: job\r
+  id: Detective\r
+  name: job-name-detective\r
+  description: job-description-detective\r
+  playTimeTracker: JobDetective\r
+  requirements:\r
+  - !type:DepartmentTimeRequirement\r
+    department: Security\r
+    time: 54000 # 15 hours\r
+  startingGear: DetectiveGear\r
+  icon: "JobIconDetective"\r
+  supervisors: job-supervisors-hos\r
+  canBeAntag: false\r
+  access:\r
+  - Security\r
+  - Brig\r
+  - Maintenance\r
+  - Service\r
+  - Detective\r
+  special:\r
+  - !type:AddImplantSpecial\r
+    implants: [ MindShieldImplant ]\r
+\r
+- type: startingGear\r
+  id: DetectiveGear\r
+  equipment:\r
+    jumpsuit: ClothingUniformJumpsuitDetective\r
+    back: ClothingBackpackSecurityFilledDetective\r
+    shoes: ClothingShoesBootsCombatFilled\r
+    eyes: ClothingEyesGlassesSunglasses\r
+    head: ClothingHeadHatFedoraBrown\r
+    outerClothing: ClothingOuterVestDetective\r
+    id: DetectivePDA\r
+    ears: ClothingHeadsetSecurity\r
+    belt: ClothingBeltHolsterFilled\r
+  innerClothingSkirt: ClothingUniformJumpskirtDetective\r
+  satchel: ClothingBackpackSatchelSecurityFilledDetective\r
+  duffelbag: ClothingBackpackDuffelSecurityFilledDetective\r

diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
index d68edb357121c0e561d0f63cfea2bef9fbffbdfe..9be98be950c6bf675771cf5ec4f3f210da9fab55 100644 (file)
--- a/Resources/Prototypes/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -30,7 +30,6 @@
   - Reporter
   - Visitor
   - Zookeeper
-  - Detective
   - ServiceWorker
 
 - type: department
@@ -80,6 +79,7 @@
   - HeadOfSecurity
   - SecurityCadet
   - SecurityOfficer
+  - Detective
   - Warden
 
 - type: department

diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Detective.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Detective.png
index 9b52e0e68b73d5d128318e752b4553cfc169b63f..fca34fb229322330d0d953e95c46731b53166d9f 100644 (file)
Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Detective.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Detective.png differ

diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png b/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png
index e0f5c645576b72afe3638268346ed349a56e0c83..3b749d582a5a02cef8a3a38ad01aab30ad129526 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png differ

diff --git a/Resources/migration.yml b/Resources/migration.yml
index d9d5ea0305043cdd281b804985c3a42e5719c4d2..4d9ab7f1f92af8cea3aa5a6a98686b6852a654d2 100644 (file)
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -166,10 +166,10 @@ ClothingHeadHelmetVoidParamed: null
 # 2024-01-19
 DefaultStationBeaconTeslaEngine: null
 
-#2024-01-27
-ClothingBackpackSecurityFilledDetective: ClothingBackpackFilledDetective
-ClothingBackpackDuffelSecurityFilledDetective: ClothingBackpackDuffelFilledDetective
-ClothingBackpackSatchelSecurityFilledDetective: ClothingBackpackSatchelFilledDetective
+# 2024-01-27 (Reverted on 2024-03-10)
+# ClothingBackpackSecurityFilledDetective: ClothingBackpackFilledDetective
+# ClothingBackpackDuffelSecurityFilledDetective: ClothingBackpackDuffelFilledDetective
+# ClothingBackpackSatchelSecurityFilledDetective: ClothingBackpackSatchelFilledDetective
 
 # 2024-01-28
 FoodBoxDonkpocketGondola: FoodBoxDonkpocketPizza
@@ -236,3 +236,8 @@ AirlockExternalEasyPryLocked: AirlockExternalLocked
 AirlockExternalGlassEasyPryLocked: AirlockExternalGlassLocked
 AirlockGlassShuttleEasyPryLocked: AirlockExternalGlassShuttleLocked
 AirlockShuttleEasyPryLocked: AirlockExternalShuttleLocked
+
+#2024-03-10
+ClothingBackpackFilledDetective: ClothingBackpackSecurityFilledDetective
+ClothingBackpackDuffelFilledDetective: ClothingBackpackDuffelSecurityFilledDetective
+ClothingBackpackSatchelFilledDetective: ClothingBackpackSatchelSecurityFilledDetective