diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 5c056077..bd4d1ee8 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -3,7 +3,7 @@ /var/const/access_security = 1 // Security equipment /var/const/access_brig = 2 // Brig timers and permabrig /var/const/access_armory = 3 -/var/const/access_forensics_lockers= 4 +/var/const/access_forensics = 4 //Forensic tech access /var/const/access_medical = 5 /var/const/access_morgue = 6 /var/const/access_tox = 7 @@ -65,6 +65,7 @@ /var/const/access_sec_doors = 63 // Security front doors /var/const/access_psychiatrist = 64 // Psychiatrist's office /var/const/access_xenoarch = 65 +/var/const/access_detective = 66 //Detective access //BEGIN CENTCOM ACCESS /*Should leave plenty of room if we need to add more access levels. @@ -193,7 +194,7 @@ return get_all_centcom_access() /proc/get_all_accesses() - return list(access_security, access_sec_doors, access_brig, access_armory, access_forensics_lockers, access_court, + return list(access_security, access_sec_doors, access_brig, access_armory, access_forensics, access_court, access_medical, access_genetics, access_morgue, access_rd, access_tox, access_tox_storage, access_chemistry, access_engine, access_engine_equip, access_maint_tunnels, access_external_airlocks, access_change_ids, access_ai_upload, @@ -203,7 +204,7 @@ access_hydroponics, access_library, access_lawyer, access_virology, access_psychiatrist, access_cmo, access_qm, access_clown, access_mime, access_surgery, access_theatre, access_research, access_mining, access_mailsorting, access_heads_vault, access_mining_station, access_xenobiology, access_ce, access_hop, access_hos, access_RC_announce, - access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch) + access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_detective) /proc/get_all_centcom_access() return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_medical, access_cent_living, access_cent_storage, access_cent_teleporter, access_cent_creed, access_cent_captain) @@ -219,7 +220,7 @@ if(0) return get_all_accesses() if(1) //security - return list(access_sec_doors, access_security, access_brig, access_armory, access_forensics_lockers, access_court, access_hos) + return list(access_sec_doors, access_security, access_brig, access_armory, access_forensics, access_court, access_hos) if(2) //medbay return list(access_medical, access_genetics, access_morgue, access_chemistry, access_psychiatrist, access_virology, access_surgery, access_cmo) if(3) //research @@ -265,7 +266,7 @@ return "Holding Cells" if(access_court) return "Courtroom" - if(access_forensics_lockers) + if(access_forensics) return "Forensics" if(access_medical) return "Medical" @@ -385,6 +386,8 @@ return "Gateway" if(access_sec_doors) return "Brig" + if(access_detective) + return "Detective" /proc/get_centcom_access_desc(A) switch(A) diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index acc7c3e8..3facb542 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -58,18 +58,18 @@ idtype = /obj/item/weapon/card/id/silver req_admin_notify = 1 minimal_player_age = 10 - access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers, + access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics, access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads, access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue, access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer, access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station, - access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway) - minimal_access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers, + access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_detective) + minimal_access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics, access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads, access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue, access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer, access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station, - access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway) + access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_detective) equip(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 7202443b..79fc512e 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -10,13 +10,13 @@ idtype = /obj/item/weapon/card/id/silver req_admin_notify = 1 access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, - access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers, + access_forensics, 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_sec_doors, access_brig, access_armory, access_court, - access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers, + access_forensics, 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) @@ -96,8 +96,9 @@ supervisors = "the head of security" selection_color = "#ffeeee" - access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court) - minimal_access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court) + access = list(access_security, access_sec_doors, access_morgue, access_maint_tunnels, access_court, access_detective) + minimal_access = list(access_security, access_sec_doors, access_morgue, access_maint_tunnels, access_court, access_detective) + alt_titles = list("Investigator") minimal_player_age = 3 equip(var/mob/living/carbon/human/H) if(!H) return 0 @@ -135,8 +136,8 @@ supervisors = "the head of security" selection_color = "#ffeeee" - access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court) - minimal_access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court) + access = list(access_security, access_sec_doors, access_forensics, access_morgue, access_maint_tunnels, access_court) + minimal_access = list(access_security, access_sec_doors, access_forensics, access_morgue, access_maint_tunnels, access_court) alt_titles = list("Crime Scene Investigator") minimal_player_age = 3 equip(var/mob/living/carbon/human/H) diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index 6e084931..94815c9f 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -7,7 +7,7 @@ density = 1 anchored = 0 // weight = 1.0E7 - req_one_access = list(access_security, access_forensics_lockers) + req_one_access = list(access_security, access_forensics, access_detective) health = 100 maxhealth = 100 fire_dam_coeff = 0.7 diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index 587ca17e..6d4eab3f 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -11,7 +11,7 @@ fire_dam_coeff = 0.7 brute_dam_coeff = 0.5 // weight = 1.0E7 - req_one_access = list(access_security, access_forensics_lockers) + req_one_access = list(access_security, access_forensics, access_detective) var/mob/target var/oldtarget_name var/threatlevel = 0 diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 77212d64..e27b80d7 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -4,7 +4,7 @@ name = "Medical Records" desc = "This can be used to check medical records." icon_state = "medcomp" - req_one_access = list(access_medical, access_forensics_lockers) + req_one_access = list(access_medical, access_forensics, access_detective) circuit = "/obj/item/weapon/circuitboard/med_data" var/obj/item/weapon/card/id/scan = null var/authenticated = null diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index fb22780c..702c3f53 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -4,7 +4,7 @@ name = "Security Records" desc = "Used to view and edit personnel's security records" icon_state = "security" - req_one_access = list(access_security, access_forensics_lockers) + req_one_access = list(access_security, access_forensics, access_detective) circuit = "/obj/item/weapon/circuitboard/secure_data" var/obj/item/weapon/card/id/scan = null var/authenticated = null diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index af39be1e..89a56a56 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -9,7 +9,7 @@ for reference: access_security = 1 access_brig = 2 access_armory = 3 - access_forensics_lockers= 4 + access_forensics= 4 access_medical = 5 access_morgue = 6 access_tox = 7 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 7d7d21f8..be8ffaa3 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -234,7 +234,7 @@ /obj/structure/closet/secure_closet/forensics name = "Forensic tech's closet" - req_access = list(access_forensics_lockers) + req_access = list(access_forensics) icon_state = "sec1" icon_closed = "sec" icon_locked = "sec1" @@ -260,7 +260,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" diff --git a/code/modules/detectivework/detective_work.dm b/code/modules/detectivework/detective_work.dm index bb650b02..8b54e6f1 100644 --- a/code/modules/detectivework/detective_work.dm +++ b/code/modules/detectivework/detective_work.dm @@ -76,7 +76,7 @@ obj/machinery/computer/forensic_scanning var/scan_name = "" var/scan_process = 0 - req_access = list(access_forensics_lockers) + req_access = list(access_forensics) New() diff --git a/maps/tgstation2.dmm b/maps/tgstation2.dmm index a212c1b9..559795f5 100644 --- a/maps/tgstation2.dmm +++ b/maps/tgstation2.dmm @@ -890,7 +890,7 @@ "arf" = (/obj/machinery/door/airlock/maintenance{name = "Firefighting equipment"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "arg" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "arh" = (/turf/simulated/wall,/area/security/detectives_office) -"ari" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_security{name = "Detective's Office"; req_access_txt = "4"},/turf/simulated/floor,/area/security/detectives_office) +"ari" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_security{name = "Detective's Office"; req_access_txt = "66"},/turf/simulated/floor,/area/security/detectives_office) "arj" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/security/detectives_office) "ark" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/security/detectives_office) "arl" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/security/detectives_office) @@ -1142,7 +1142,7 @@ "avX" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/wall,/area/maintenance/fpmaint) "avY" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/turf/simulated/wall,/area/security/detectives_office) "avZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/wall,/area/security/detectives_office) -"awa" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/airlock/maintenance{name = "Detective Maintenance"; req_access_txt = "4"},/turf/simulated/floor/plating,/area/security/detectives_office) +"awa" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/airlock/maintenance{name = "Detective Maintenance"; req_access_txt = "66"},/turf/simulated/floor/plating,/area/security/detectives_office) "awb" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/turf/simulated/wall,/area/security/detectives_office) "awc" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/wall,/area/lawoffice) "awd" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/wall,/area/lawoffice)