From: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> Date: Thu, 1 Feb 2024 22:49:53 +0000 (-0500) Subject: detective patch (#24739) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=8ef69ff2e1f83b08c9585d2517e917075c8271cf;p=space-station-14.git detective patch (#24739) * inital * fikss * nuh uh --- diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index ebadce5ada..6a27229af9 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -36,7 +36,7 @@ components: - type: StorageFill contents: - - id: BoxSurvivalSecurity + - id: BoxSurvival - 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..44a1c88de3 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -35,7 +35,7 @@ components: - type: StorageFill contents: - - id: BoxSurvivalSecurity + - id: BoxSurvival - 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..eab3a9243c 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -49,7 +49,7 @@ components: - type: StorageFill contents: - - id: BoxSurvivalSecurity + - id: BoxSurvival - id: ForensicPad - id: ForensicScanner diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/detective.yml b/Resources/Prototypes/Roles/Jobs/Civilian/detective.yml index a7e54d8856..d4b18697bd 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/detective.yml @@ -26,11 +26,11 @@ id: DetectiveGear equipment: jumpsuit: ClothingUniformJumpsuitDetective + outerClothing: ClothingOuterVestDetective back: ClothingBackpackFilledDetective - shoes: ClothingShoesBootsCombatFilled + shoes: ClothingShoesBootsJack eyes: ClothingEyesGlassesSunglasses head: ClothingHeadHatFedoraBrown - outerClothing: ClothingOuterVestDetective id: DetectivePDA ears: ClothingHeadsetSecurity belt: ClothingBeltHolsterFilled diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 9be98be950..d68edb3571 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -30,6 +30,7 @@ - Reporter - Visitor - Zookeeper + - Detective - ServiceWorker - type: department @@ -79,7 +80,6 @@ - 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 fca34fb229..9b52e0e68b 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 3b749d582a..e0f5c64557 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