From: LankLTE <135308300+LankLTE@users.noreply.github.com> Date: Mon, 11 Mar 2024 03:33:08 +0000 (-0700) Subject: Return Detective to Security (#25986) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=88d424e877de68e75f25c6efbed21aa92b264a59;p=space-station-14.git 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 2a094fb0ad..c9d53bb5b5 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 6a27229af9..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: 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 44a1c88de3..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: 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 7b2bb55cac..3b1b7f73a5 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: 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 d4b18697bd..e8d6299f48 100644 --- 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 + 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 diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index d68edb3571..9be98be950 100644 --- 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 9b52e0e68b..fca34fb229 100644 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 e0f5c64557..3b749d582a 100644 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 d9d5ea0305..4d9ab7f1f9 100644 --- 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