From fdb4badc6579ad9f77f8ee005c61144cd8a794c5 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Sun, 14 May 2017 07:22:22 -0300 Subject: [PATCH] Adds detective access and tweaks the explorer's belt (#2260) -adds detective access, only used in his own locker -adds some mining items to the list of things that one could store into the explorer's belt --- code/game/jobs/access_datum.dm | 6 ++++++ code/game/jobs/job/security.dm | 10 ++++++---- code/game/jobs/jobs.dm | 1 + code/game/objects/items/weapons/storage/belt.dm | 11 ++++++++++- .../crates_lockers/closets/secure/security.dm | 2 +- 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/code/game/jobs/access_datum.dm b/code/game/jobs/access_datum.dm index 04474a56d40..03562b5e164 100644 --- a/code/game/jobs/access_datum.dm +++ b/code/game/jobs/access_datum.dm @@ -386,6 +386,12 @@ id = access_paramedic desc = "Paramedic Equipment" region = ACCESS_REGION_MEDBAY + +/var/const/access_detective = 68 +/datum/access/access_detective + id = access_detective + desc = "Detective Equipment" + region = ACCESS_REGION_SECURITY /****************** * Central Command * diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index cd1955fd45d..b81dbb52e95 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -15,11 +15,13 @@ access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory, access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers, access_research, access_engine, access_mining, access_medical, access_construction, access_mailsorting, - access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks) + access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks, + access_detective) minimal_access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory, access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers, access_research, access_engine, access_mining, access_medical, access_construction, access_mailsorting, - access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks) + access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks, + access_detective) minimal_player_age = 14 equip(var/mob/living/carbon/human/H) @@ -103,8 +105,8 @@ supervisors = "the head of security" selection_color = "#ffeeee" economic_modifier = 5 - access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels) - minimal_access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels) + access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_detective) + minimal_access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_detective) minimal_player_age = 7 equip(var/mob/living/carbon/human/H) if(!H) return 0 diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 1ad2c4fccdf..72cffda4c56 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -115,6 +115,7 @@ var/list/security_positions = list( "Head of Security", "Warden", "Detective", + "Forensic Technician", "Security Officer", "Security Cadet" ) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 2fe400c7bd7..94f8b519072 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -140,7 +140,8 @@ /obj/item/taperoll/police, /obj/item/weapon/material/sword/trench, /obj/item/weapon/shield/energy, - /obj/item/weapon/shield/riot/tact + /obj/item/weapon/shield/riot/tact, + /obj/item/device/holowarrant ) /obj/item/weapon/storage/belt/soulstone @@ -265,14 +266,22 @@ /obj/item/weapon/weldingtool, /obj/item/weapon/wirecutters, /obj/item/weapon/wrench, + /obj/item/weapon/resonator, + /obj/item/weapon/oreportal, + /obj/item/weapon/plastique/seismic, + /obj/item/weapon/extraction_pack, + /obj/item/weapon/ore_radar, /obj/item/device/flashlight, /obj/item/stack/cable_coil, + /obj/item/stack/flag, + /obj/item/device/wormhole_jaunter, /obj/item/device/analyzer, /obj/item/weapon/extinguisher/mini, /obj/item/device/radio, /obj/item/clothing/gloves, /obj/item/clothing/glasses/material, /obj/item/weapon/pickaxe, + /obj/item/weapon/shovel, /obj/item/stack/material/animalhide, /obj/item/weapon/flame/lighter, /obj/item/weapon/storage/fancy/cigarettes, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 432f0d01cdd..4208f7b7059 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -299,7 +299,7 @@ /obj/structure/closet/secure_closet/detective name = "detective's cabinet" - req_access = list(access_forensics_lockers) + req_access = list(access_detective) icon_state = "cabinetdetective_locked" icon_closed = "cabinetdetective" icon_locked = "cabinetdetective_locked"