From 15b91528cdcec6d4521a73ace9673d62d5390ffe Mon Sep 17 00:00:00 2001 From: Remuchi Date: Tue, 6 Feb 2024 11:19:58 +0700 Subject: [PATCH] Revert "detective patch (#24739)" This reverts commit 8ef69ff2e1f83b08c9585d2517e917075c8271cf. # Conflicts: # Resources/Prototypes/Roles/Jobs/Civilian/detective.yml --- .../Fills/Backpacks/StarterGear/backpack.yml | 2 +- .../Fills/Backpacks/StarterGear/duffelbag.yml | 2 +- .../Fills/Backpacks/StarterGear/satchel.yml | 2 +- Resources/Prototypes/Roles/Jobs/departments.yml | 2 +- .../Interface/Misc/job_icons.rsi/Detective.png | Bin 187 -> 122 bytes .../Objects/Misc/id_cards.rsi/iddetective.png | Bin 225 -> 197 bytes 6 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 6a27229af9..ebadce5ada 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: BoxSurvival + - id: BoxSurvivalSecurity - 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..e844871499 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: BoxSurvival + - id: BoxSurvivalSecurity - 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 eab3a9243c..87fa5c5322 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: BoxSurvival + - id: BoxSurvivalSecurity - id: ForensicPad - id: ForensicScanner diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 8e7e489e33..462c5ef56c 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -29,7 +29,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 GIT binary patch delta 104 zcmdnZST#W+iHVtkfnjH2m;{jG3GfMV{r~@eGXukE1_mJG&e3m+fZ~iLL4Lsu4$p3+ z0XZ_BE{-7_vdJP_)6cw0KU2oE*zTB3_A#wmx4>!!$9t^)v%~s61JyBjy85}Sb4q9e E0DFxkR{#J2 delta 170 zcmb>0%{W1#o`aczf#LH-znwseu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx|bfKP~P zaBy&5Uf%!z|A7MA=l5&^sVfQc3kHceXs!GL4nJ@ErzW#^d=bQhOfswbAp4zQDZDN+H8!u$bi8HL`43bMFR`?aqg8^Kcs-y&*&=n zx1_Qjnc&r(W=1n(_2IMg3Cyr$g7-IXc24nS@QKT>)C0000ggeWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx|bfKQ04 z+gyf-6Ab_V{|5?WMEG=o)RhGJ1%pH!v{rrr@;M7UB8wRq_zr_G