]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Detectives gain independency (#23114)
authorUbaser <134914314+UbaserB@users.noreply.github.com>
Mon, 29 Jan 2024 06:45:26 +0000 (17:45 +1100)
committerGitHub <noreply@github.com>
Mon, 29 Jan 2024 06:45:26 +0000 (17:45 +1100)
* add

* fix

* civilian-ise

* update headset name

* aspid det door

* add

Resources/Locale/en-US/job/job-description.ftl
Resources/Maps/aspid.yml
Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
Resources/Prototypes/Roles/Jobs/Civilian/detective.yml [moved from Resources/Prototypes/Roles/Jobs/Security/detective.yml with 67% similarity]
Resources/migration.yml

index 53e00591b44f379f1638c151456d14b682b29988..01f588897b267ec9b3902472b8cf966a575801ae 100644 (file)
@@ -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 = Investigate crime scenes using forensic tools, ensure that the guilty party is found, and have a couple smokes.
+job-description-detective = Answer requests for help, investigate crime scenes using forensic tools, 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.
index 6eea12939b0c753397acf4f844e59454f79dd050..7c6e21f0451ab2ee3108ae059c27e6077a3fd607 100644 (file)
@@ -10715,6 +10715,13 @@ entities:
       rot: 1.5707963267948966 rad\r
       pos: -0.5,1.5\r
       parent: 8756\r
+- proto: AirlockDetectiveGlassLocked\r
+  entities:\r
+  - uid: 3192\r
+    components:\r
+    - type: Transform\r
+      pos: 39.5,48.5\r
+      parent: 1\r
 - proto: AirlockEngineeringGlassLocked\r
   entities:\r
   - uid: 9075\r
@@ -12484,11 +12491,6 @@ entities:
       parent: 1\r
 - proto: AirlockSecurityGlassLocked\r
   entities:\r
-  - uid: 3192\r
-    components:\r
-    - type: Transform\r
-      pos: 39.5,48.5\r
-      parent: 1\r
   - uid: 8211\r
     components:\r
     - type: Transform\r
index b961659c0825103f06272e569775b7ddda872e17..ebadce5ada41849dcf32a629bbe774c3ffcb1449 100644 (file)
 
 - type: entity
   noSpawn: true
-  parent: ClothingBackpackSecurity
-  id: ClothingBackpackSecurityFilledDetective
+  parent: ClothingBackpack
+  id: ClothingBackpackFilledDetective
   components:
   - type: StorageFill
     contents:
       - id: BoxSurvivalSecurity
-      - id: Flash
       - id: ForensicPad
       - id: ForensicScanner
 
index 504054dc27882e31bb949d3507b8fd680d81bd9b..e8448714997e02f81ad15551f313953deb6348e3 100644 (file)
 
 - type: entity
   noSpawn: true
-  parent: ClothingBackpackDuffelSecurity
-  id: ClothingBackpackDuffelSecurityFilledDetective
+  parent: ClothingBackpackDuffel
+  id: ClothingBackpackDuffelFilledDetective
   components:
   - type: StorageFill
     contents:
       - id: BoxSurvivalSecurity
-      - id: Flash
       - id: ForensicPad
       - id: ForensicScanner
 
index a17d49127d8b443429eb50731f758ca489f303a4..87fa5c5322b48eb2582669dbe3b4a38b1e608118 100644 (file)
 
 - type: entity
   noSpawn: true
-  parent: ClothingBackpackSatchelSecurity
-  id: ClothingBackpackSatchelSecurityFilledDetective
+  parent: ClothingBackpackSatchel
+  id: ClothingBackpackSatchelFilledDetective
   components:
   - type: StorageFill
     contents:
       - id: BoxSurvivalSecurity
-      - id: Flash
       - id: ForensicPad
       - id: ForensicScanner
 
similarity index 67%
rename from Resources/Prototypes/Roles/Jobs/Security/detective.yml
rename to Resources/Prototypes/Roles/Jobs/Civilian/detective.yml
index e8d6299f48b817e612c95a968f4b26da50c21ddd..a7e54d88566d33a4acfa8fe3256954bc6f2990ad 100644 (file)
@@ -1,38 +1,39 @@
-- type: job\r
-  id: Detective\r
-  name: job-name-detective\r
-  description: job-description-detective\r
-  playTimeTracker: JobDetective\r
-  requirements:\r
-  - !type:DepartmentTimeRequirement\r
-    department: Security\r
-    time: 54000 # 15 hours\r
-  startingGear: DetectiveGear\r
-  icon: "JobIconDetective"\r
-  supervisors: job-supervisors-hos\r
-  canBeAntag: false\r
-  access:\r
-  - Security\r
-  - Brig\r
-  - Maintenance\r
-  - Service\r
-  - Detective\r
-  special:\r
-  - !type:AddImplantSpecial\r
-    implants: [ MindShieldImplant ]\r
-\r
-- type: startingGear\r
-  id: DetectiveGear\r
-  equipment:\r
-    jumpsuit: ClothingUniformJumpsuitDetective\r
-    back: ClothingBackpackSecurityFilledDetective\r
-    shoes: ClothingShoesBootsCombatFilled\r
-    eyes: ClothingEyesGlassesSunglasses\r
-    head: ClothingHeadHatFedoraBrown\r
-    outerClothing: ClothingOuterVestDetective\r
-    id: DetectivePDA\r
-    ears: ClothingHeadsetSecurity\r
-    belt: ClothingBeltHolsterFilled\r
-  innerClothingSkirt: ClothingUniformJumpskirtDetective\r
-  satchel: ClothingBackpackSatchelSecurityFilledDetective\r
-  duffelbag: ClothingBackpackDuffelSecurityFilledDetective\r
+- 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
+    back: ClothingBackpackFilledDetective
+    shoes: ClothingShoesBootsCombatFilled
+    eyes: ClothingEyesGlassesSunglasses
+    head: ClothingHeadHatFedoraBrown
+    outerClothing: ClothingOuterVestDetective
+    id: DetectivePDA
+    ears: ClothingHeadsetSecurity
+    belt: ClothingBeltHolsterFilled
+  innerClothingSkirt: ClothingUniformJumpskirtDetective
+  satchel: ClothingBackpackSatchelFilledDetective
+  duffelbag: ClothingBackpackDuffelFilledDetective
index e859bbc7fe6d37ba2ecf9616c6a6aa47c8e47157..b295e37b653a91beda0c24f0bf9cb9497bd09187 100644 (file)
@@ -165,3 +165,8 @@ ClothingHeadHelmetVoidParamed: null
 
 # 2024-01-19
 DefaultStationBeaconTeslaEngine: null
+
+#2024-01-27
+ClothingBackpackSecurityFilledDetective: ClothingBackpackFilledDetective
+ClothingBackpackDuffelSecurityFilledDetective: ClothingBackpackDuffelFilledDetective
+ClothingBackpackSatchelSecurityFilledDetective: ClothingBackpackSatchelFilledDetective