From de3ddc142d40df26b8463e2960cca58e77931262 Mon Sep 17 00:00:00 2001 From: Remuchi Date: Tue, 6 Feb 2024 11:36:27 +0700 Subject: [PATCH] Revert "Detectives gain independency (#23114)" This reverts commit 807f5facbbc4a9e646e9f8257a42412841a5340f. # Conflicts: # Resources/Maps/aspid.yml # Resources/Prototypes/Roles/Jobs/Security/detective.yml # Resources/migration.yml --- Resources/Locale/en-US/job/job-description.ftl | 2 +- .../Catalog/Fills/Backpacks/StarterGear/backpack.yml | 5 +++-- .../Catalog/Fills/Backpacks/StarterGear/duffelbag.yml | 5 +++-- .../Catalog/Fills/Backpacks/StarterGear/satchel.yml | 5 +++-- .../Roles/Jobs/{Civilian => Security}/detective.yml | 0 5 files changed, 10 insertions(+), 7 deletions(-) rename Resources/Prototypes/Roles/Jobs/{Civilian => Security}/detective.yml (100%) diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl index 55d6300ed2..41a7770fec 100644 --- 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 ebadce5ada..b961659c08 100644 --- 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: 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 e844871499..504054dc27 100644 --- 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: 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 87fa5c5322..a17d49127d 100644 --- 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: 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 100% rename from Resources/Prototypes/Roles/Jobs/Civilian/detective.yml rename to Resources/Prototypes/Roles/Jobs/Security/detective.yml