mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
Fixes #9065.
Central Command ids now at least makes security equipment respect you.
This commit is contained in:
@@ -347,14 +347,17 @@ Class Procs:
|
|||||||
if(is_assess_emagged())
|
if(is_assess_emagged())
|
||||||
return 10 //if emagged, always return 10.
|
return 10 //if emagged, always return 10.
|
||||||
|
|
||||||
threatcount += on_assess_perp(perp)
|
|
||||||
if(threatcount >= 10)
|
|
||||||
return threatcount
|
|
||||||
|
|
||||||
//Agent cards lower threatlevel.
|
//Agent cards lower threatlevel.
|
||||||
var/obj/item/weapon/card/id/id = GetIdCard(perp)
|
var/obj/item/weapon/card/id/id = GetIdCard(perp)
|
||||||
if(id && istype(id, /obj/item/weapon/card/id/syndicate))
|
if(id && istype(id, /obj/item/weapon/card/id/syndicate))
|
||||||
threatcount -= 2
|
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(auth_weapons && !src.allowed(perp))
|
||||||
if(istype(perp.l_hand, /obj/item/weapon/gun) || istype(perp.l_hand, /obj/item/weapon/melee))
|
if(istype(perp.l_hand, /obj/item/weapon/gun) || istype(perp.l_hand, /obj/item/weapon/melee))
|
||||||
|
|||||||
@@ -294,3 +294,11 @@
|
|||||||
New()
|
New()
|
||||||
access = get_all_centcom_access()
|
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()
|
||||||
|
|||||||
@@ -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/box/engineer(src), slot_in_backpack)
|
||||||
equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/regular(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.assignment = "Emergency Response Team[leader_selected ? " Leader" : ""]"
|
||||||
W.registered_name = real_name
|
W.registered_name = real_name
|
||||||
W.name = "[real_name]'s ID Card ([W.assignment])"
|
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)
|
equip_to_slot_or_del(W, slot_wear_id)
|
||||||
|
|
||||||
return 1
|
return 1
|
||||||
|
|||||||
Reference in New Issue
Block a user