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 ebadce5ada41849dcf32a629bbe774c3ffcb1449..6a27229af9bac68420b9d23b4740c3d24ff800a0 100644 (file)
--- 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 e8448714997e02f81ad15551f313953deb6348e3..44a1c88de3534d52a663193cf9d8d7c2e546b1fb 100644 (file)
--- 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 87fa5c5322b48eb2582669dbe3b4a38b1e608118..eab3a9243c98036930b7d5f4398a32a4f7b2f29c 100644 (file)
--- 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 a7e54d88566d33a4acfa8fe3256954bc6f2990ad..d4b18697bdc0d0e077246dde2d7cb0281e56dd2d 100644 (file)
--- 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 9be98be950c6bf675771cf5ec4f3f210da9fab55..d68edb357121c0e561d0f63cfea2bef9fbffbdfe 100644 (file)
--- 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 fca34fb229322330d0d953e95c46731b53166d9f..9b52e0e68b73d5d128318e752b4553cfc169b63f 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 3b749d582a5a02cef8a3a38ad01aab30ad129526..e0f5c645576b72afe3638268346ed349a56e0c83 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