diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index 623d38612dc..8a89f82caac 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -54732,7 +54732,7 @@ /obj/machinery/door/airlock/security{ name = "Evidence Storage" }, -/obj/effect/mapping_helpers/airlock/access/all/security/doors, +/obj/effect/mapping_helpers/airlock/access/all/security/evidence, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -67782,7 +67782,7 @@ dir = 8; name = "Evidence Storage" }, -/obj/effect/mapping_helpers/airlock/windoor/access/any/security/doors{ +/obj/effect/mapping_helpers/airlock/windoor/access/any/security/evidence{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -75096,7 +75096,7 @@ /obj/machinery/door/airlock/security{ name = "Evidence Storage" }, -/obj/effect/mapping_helpers/airlock/access/all/security/doors, +/obj/effect/mapping_helpers/airlock/access/all/security/evidence, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -81932,7 +81932,7 @@ dir = 8; name = "Evidence Storage" }, -/obj/effect/mapping_helpers/airlock/windoor/access/any/security/doors{ +/obj/effect/mapping_helpers/airlock/windoor/access/any/security/evidence{ dir = 8 }, /turf/simulated/floor/plasteel{ diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 1fbc02fbf21..af88e2577dd 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -22947,7 +22947,7 @@ dir = 8; name = "Evidence Storage" }, -/obj/effect/mapping_helpers/airlock/windoor/access/any/security/doors{ +/obj/effect/mapping_helpers/airlock/windoor/access/any/security/evidence{ dir = 8 }, /turf/simulated/floor/plasteel{ @@ -28335,7 +28335,7 @@ dir = 8 }, /obj/machinery/door/airlock/security, -/obj/effect/mapping_helpers/airlock/access/all/security/doors, +/obj/effect/mapping_helpers/airlock/access/all/security/evidence, /obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -59314,7 +59314,7 @@ dir = 8; name = "Evidence Storage" }, -/obj/effect/mapping_helpers/airlock/windoor/access/any/security/doors{ +/obj/effect/mapping_helpers/airlock/windoor/access/any/security/evidence{ dir = 8 }, /turf/simulated/floor/plasteel{ diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 03d378d793e..760d51e39ce 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -19146,7 +19146,7 @@ }, /area/station/security/main) "boS" = ( -/obj/effect/mapping_helpers/airlock/windoor/access/any/security/doors, +/obj/effect/mapping_helpers/airlock/windoor/access/any/security/evidence, /obj/machinery/door/window/reinforced/normal{ name = "Evidence Storage" }, @@ -23407,7 +23407,7 @@ }, /area/station/command/bridge) "bCM" = ( -/obj/effect/mapping_helpers/airlock/access/all/security/doors, +/obj/effect/mapping_helpers/airlock/access/all/security/evidence, /obj/machinery/door/airlock/security, /obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel{ @@ -56725,7 +56725,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/mapping_helpers/airlock/access/all/security/doors, +/obj/effect/mapping_helpers/airlock/access/all/security/evidence, /obj/machinery/door/airlock/security, /obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel{ diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index 306a9e4442d..9709f24f91d 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -24858,7 +24858,7 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/security/doors, +/obj/effect/mapping_helpers/airlock/access/all/security/evidence, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -33031,7 +33031,7 @@ name = "Evidence Storage" }, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/security/doors, +/obj/effect/mapping_helpers/airlock/access/all/security/evidence, /turf/simulated/floor/plasteel, /area/station/security/processing) "gDm" = ( @@ -41859,7 +41859,7 @@ dir = 4; name = "Evidence Storage" }, -/obj/effect/mapping_helpers/airlock/windoor/access/any/security/doors{ +/obj/effect/mapping_helpers/airlock/windoor/access/any/security/evidence{ dir = 4 }, /turf/simulated/floor/plasteel{ diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index fce3b01e570..a60f5c7d990 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -86489,7 +86489,7 @@ }, /obj/machinery/door/airlock/security, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/security/doors, +/obj/effect/mapping_helpers/airlock/access/all/security/evidence, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, diff --git a/code/__DEFINES/access_defines.dm b/code/__DEFINES/access_defines.dm index 30a4f5c4dc8..ffc66d841de 100644 --- a/code/__DEFINES/access_defines.dm +++ b/code/__DEFINES/access_defines.dm @@ -1,7 +1,7 @@ #define ACCESS_SECURITY 1 //! Security equipment. #define ACCESS_BRIG 2 //! Brig timers and permabrig. #define ACCESS_ARMORY 3 -#define ACCESS_FORENSICS_LOCKERS 4 +#define ACCESS_FORENSICS_LOCKERS 4 //! Detective office and locker #define ACCESS_MEDICAL 5 #define ACCESS_MORGUE 6 #define ACCESS_TOX 7 @@ -66,6 +66,7 @@ #define ACCESS_CARGO_BAY 78 #define ACCESS_SUPPLY_SHUTTLE 79 #define ACCESS_TRAINER 80 +#define ACCESS_EVIDENCE 81 //! Security evidence room #define ACCESS_WEAPONS 99 //! Weapon authorization for secbots. diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 4bd7839054f..781421e38ae 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -107,7 +107,7 @@ ACCESS_INTERNAL_AFFAIRS, ACCESS_LIBRARY, ACCESS_MAGISTRATE, ACCESS_MAINT_TUNNELS, ACCESS_HEADS_VAULT, ACCESS_MEDICAL, ACCESS_MIME, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_MORGUE, ACCESS_NTREP, ACCESS_PARAMEDIC, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_ENGINE_EQUIP, ACCESS_PSYCHIATRIST, ACCESS_QM, ACCESS_RD, ACCESS_RC_ANNOUNCE, ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_RESEARCH, ACCESS_SECURITY, - ACCESS_SURGERY, ACCESS_TECH_STORAGE, ACCESS_TELEPORTER, ACCESS_THEATRE, ACCESS_TCOMSAT, ACCESS_TOX_STORAGE, ACCESS_VIROLOGY, ACCESS_WEAPONS, ACCESS_XENOBIOLOGY, ACCESS_TRAINER) + ACCESS_SURGERY, ACCESS_TECH_STORAGE, ACCESS_TELEPORTER, ACCESS_THEATRE, ACCESS_TCOMSAT, ACCESS_TOX_STORAGE, ACCESS_VIROLOGY, ACCESS_WEAPONS, ACCESS_XENOBIOLOGY, ACCESS_TRAINER, ACCESS_EVIDENCE) /proc/get_all_centcom_access() return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_SECURITY, ACCESS_CENT_SHUTTLES, ACCESS_CENT_SPECOPS, ACCESS_CENT_SPECOPS_COMMANDER, ACCESS_CENT_COMMANDER) @@ -128,7 +128,7 @@ if(REGION_GENERAL) //station general return list(ACCESS_KITCHEN, ACCESS_BAR, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_THEATRE, ACCESS_INTERNAL_AFFAIRS, ACCESS_MAGISTRATE, ACCESS_CLOWN, ACCESS_MIME, ACCESS_TRAINER) if(REGION_SECURITY) //security - return list(ACCESS_SEC_DOORS, ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, ACCESS_HOS) + return list(ACCESS_SEC_DOORS, ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_EVIDENCE, ACCESS_COURT, ACCESS_HOS) if(REGION_MEDBAY) //medbay return list(ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_PSYCHIATRIST, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_CMO, ACCESS_PARAMEDIC) if(REGION_RESEARCH) //research @@ -181,7 +181,7 @@ if(ACCESS_COURT) return "Courtroom" if(ACCESS_FORENSICS_LOCKERS) - return "Forensics" + return "Forensics Office" if(ACCESS_MEDICAL) return "Medical" if(ACCESS_GENETICS) @@ -304,6 +304,8 @@ return "Weapon Permit" if(ACCESS_TRAINER) return "Nanotrasen Career Trainer" + if(ACCESS_EVIDENCE) + return "Evidence Lockers" /proc/get_centcom_access_desc(A) switch(A) diff --git a/code/game/jobs/job/security_jobs.dm b/code/game/jobs/job/security_jobs.dm index bd7bedd7e48..383841ec667 100644 --- a/code/game/jobs/job/security_jobs.dm +++ b/code/game/jobs/job/security_jobs.dm @@ -20,6 +20,7 @@ ACCESS_COURT, ACCESS_ENGINE, ACCESS_EVA, + ACCESS_EVIDENCE, ACCESS_EXPEDITION, ACCESS_FORENSICS_LOCKERS, ACCESS_HEADS, @@ -83,6 +84,7 @@ ACCESS_ARMORY, ACCESS_BRIG, ACCESS_COURT, + ACCESS_EVIDENCE, ACCESS_MAINT_TUNNELS, ACCESS_SEC_DOORS, ACCESS_SECURITY, @@ -133,6 +135,7 @@ access = list( ACCESS_BRIG, ACCESS_COURT, + ACCESS_EVIDENCE, ACCESS_FORENSICS_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, @@ -199,6 +202,7 @@ access = list( ACCESS_BRIG, ACCESS_COURT, + ACCESS_EVIDENCE, ACCESS_MAINT_TUNNELS, ACCESS_SEC_DOORS, ACCESS_SECURITY, diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm index abe6d0bd962..2ff840cb60f 100644 --- a/code/game/jobs/job/supervisor.dm +++ b/code/game/jobs/job/supervisor.dm @@ -217,6 +217,7 @@ ACCESS_CARGO, ACCESS_CONSTRUCTION, ACCESS_ENGINE, + ACCESS_EVIDENCE, ACCESS_HEADS, ACCESS_KEYCARD_AUTH, ACCESS_MAILSORTING, @@ -270,6 +271,7 @@ access = list( ACCESS_BRIG, ACCESS_COURT, + ACCESS_EVIDENCE, ACCESS_HEADS, ACCESS_INTERNAL_AFFAIRS, ACCESS_MAGISTRATE, diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index dfa081f7d09..34633e58432 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -514,19 +514,19 @@ name = "Security ID" registered_name = "Officer" icon_state = "security" - access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS) + access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_EVIDENCE, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS) /obj/item/card/id/detective name = "Detective ID" registered_name = "Detective" icon_state = "detective" - access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_COURT, ACCESS_WEAPONS) + access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_EVIDENCE, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_COURT, ACCESS_WEAPONS) /obj/item/card/id/warden name = "Warden ID" registered_name = "Warden" icon_state = "warden" - access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS) + access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_EVIDENCE, ACCESS_ARMORY, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS) /obj/item/card/id/internalaffairsagent name = "Internal Affairs Agent ID" @@ -602,7 +602,7 @@ name = "Head of Security ID" registered_name = "HoS" icon_state = "HoS" - access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, + access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_EVIDENCE, ACCESS_ARMORY, ACCESS_COURT, 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_EXPEDITION, ACCESS_WEAPONS) @@ -656,7 +656,7 @@ registered_name = "Blueshield" icon_state = "blueshield" access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS, - ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS, + ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_EVIDENCE, ACCESS_CHANGE_IDS, 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_INTERNAL_AFFAIRS, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, @@ -667,7 +667,7 @@ registered_name = "Magistrate" icon_state = "magistrate" access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS, - ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS, + ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_EVIDENCE, ACCESS_CHANGE_IDS, 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_INTERNAL_AFFAIRS, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, diff --git a/code/modules/mapping/access_helpers.dm b/code/modules/mapping/access_helpers.dm index e1e542aaf6e..cc60cc3eddd 100644 --- a/code/modules/mapping/access_helpers.dm +++ b/code/modules/mapping/access_helpers.dm @@ -170,6 +170,9 @@ /obj/effect/mapping_helpers/airlock/access/any/security/iaa access = ACCESS_INTERNAL_AFFAIRS +/obj/effect/mapping_helpers/airlock/access/any/security/evidence + access = ACCESS_EVIDENCE + // -------------------- Service access helpers /obj/effect/mapping_helpers/airlock/access/any/service icon_state = "access_helper_serv" @@ -389,6 +392,9 @@ /obj/effect/mapping_helpers/airlock/access/all/security/iaa access = ACCESS_INTERNAL_AFFAIRS +/obj/effect/mapping_helpers/airlock/access/all/security/evidence + access = ACCESS_EVIDENCE + // -------------------- Service access helpers /obj/effect/mapping_helpers/airlock/access/all/service icon_state = "access_helper_serv" diff --git a/code/modules/mapping/windoor_access_helpers.dm b/code/modules/mapping/windoor_access_helpers.dm index dca6f386b5a..c93c81dcad5 100644 --- a/code/modules/mapping/windoor_access_helpers.dm +++ b/code/modules/mapping/windoor_access_helpers.dm @@ -176,6 +176,9 @@ /obj/effect/mapping_helpers/airlock/windoor/access/any/security/iaa access = ACCESS_INTERNAL_AFFAIRS +/obj/effect/mapping_helpers/airlock/windoor/access/any/security/evidence + access = ACCESS_EVIDENCE + // -------------------- Service access helpers /obj/effect/mapping_helpers/airlock/windoor/access/any/service icon_state = "access_windoor_serv" @@ -385,6 +388,9 @@ /obj/effect/mapping_helpers/airlock/windoor/access/all/security/iaa access = ACCESS_INTERNAL_AFFAIRS +/obj/effect/mapping_helpers/airlock/windoor/access/all/security/evidence + access = ACCESS_EVIDENCE + // -------------------- Service access helpers /obj/effect/mapping_helpers/airlock/windoor/access/all/service icon_state = "access_windoor_serv"