From f4cd2cd4affc29bbecdd1d800f039213622785c9 Mon Sep 17 00:00:00 2001 From: paprka Date: Mon, 2 Feb 2015 06:22:07 -0800 Subject: [PATCH] fixes ert access --- code/game/jobs/access.dm | 11 +++++++++++ code/game/objects/items/weapons/cards_ids.dm | 9 ++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 11d280c0663..1cbffbab51d 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -218,6 +218,17 @@ /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_captain) +/proc/get_ert_access(var/class) + switch(class) + if("commander") + return get_all_centcom_access() + if("sec") + return list(access_cent_general, access_cent_specops) + if("eng") + return list(access_cent_general, access_cent_storage) + if("med") + return list(access_cent_general, access_cent_medical) + /proc/get_all_syndicate_access() return list(access_syndicate, access_syndicate) diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 009d1d2bc9f..60fc902e23e 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -196,23 +196,22 @@ update_label("John Doe", "Clowny") icon_state = "centcom" registered_name = "Emergency Response Team Commander" assignment = "Emergency Response Team Commander" - New() access = get_all_accesses() - New() access = list(access_cent_captain, access_cent_specops, access_cent_storage, access_cent_medical) + New() access = get_all_accesses()+get_ert_access("commander") /obj/item/weapon/card/id/ert/Security registered_name = "Security Response Officer" assignment = "Security Response Officer" - New() access = list(access_cent_specops) + New() access = get_all_accesses()+get_ert_access("sec") /obj/item/weapon/card/id/ert/Engineer registered_name = "Engineer Response Officer" assignment = "Engineer Response Officer" - New() access = list(access_cent_storage) + New() access = get_all_accesses()+get_ert_access("eng") /obj/item/weapon/card/id/ert/Medical registered_name = "Medical Response Officer" assignment = "Medical Response Officer" - New() access = list(access_cent_medical) + New() access = get_all_accesses()+get_ert_access("med") /obj/item/weapon/card/id/prisoner name = "prisoner ID card"