diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 101e699507..ed27d779ff 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -347,14 +347,17 @@ Class Procs: if(is_assess_emagged()) return 10 //if emagged, always return 10. - threatcount += on_assess_perp(perp) - if(threatcount >= 10) - return threatcount - //Agent cards lower threatlevel. var/obj/item/weapon/card/id/id = GetIdCard(perp) if(id && istype(id, /obj/item/weapon/card/id/syndicate)) threatcount -= 2 + // A proper CentCom id is hard currency. + else if(id && istype(id, /obj/item/weapon/card/id/centcom)) + return 0 + + threatcount += on_assess_perp(perp) + if(threatcount >= 10) + return threatcount if(auth_weapons && !src.allowed(perp)) if(istype(perp.l_hand, /obj/item/weapon/gun) || istype(perp.l_hand, /obj/item/weapon/melee)) diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 9f95abdc8c..918a1656cd 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -294,3 +294,11 @@ New() access = get_all_centcom_access() ..() + +/obj/item/weapon/card/id/centcom/ERT + name = "\improper Emergency Response Team ID" + assignment = "Emergency Response Team" + +/obj/item/weapon/card/id/centcom/ERT/New() + ..() + access += get_all_accesses() diff --git a/code/game/response_team.dm b/code/game/response_team.dm index dfaec22189..dafd819016 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -313,13 +313,10 @@ proc/trigger_armed_response_team(var/force = 0) equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(src), slot_in_backpack) equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/regular(src), slot_in_backpack) */ - var/obj/item/weapon/card/id/W = new(src) + var/obj/item/weapon/card/id/centcom/ERT/W = new(src) W.assignment = "Emergency Response Team[leader_selected ? " Leader" : ""]" W.registered_name = real_name W.name = "[real_name]'s ID Card ([W.assignment])" - W.icon_state = "centcom" - W.access = get_all_accesses() - W.access += get_all_centcom_access() equip_to_slot_or_del(W, slot_wear_id) return 1