From 73510a18ab7a7b6ee5cc4be0d23056c3470adbb4 Mon Sep 17 00:00:00 2001 From: Silverplate <118299273+silverplatedelta@users.noreply.github.com> Date: Sun, 21 May 2023 13:10:02 -0400 Subject: [PATCH] Allows proximity mine signs to be used by all traitors (#20977) * Removes jani mind requirement * makes arm/disarm of jani sighs traitor only * Adds mindslaves to usable mind states * adds prox sign to surplus, standard proability * Removes thralls from using sign (hacky method) * allows mindslave useage (not hacky way) --- code/datums/uplink_items/uplink_traitor.dm | 1 - code/game/objects/items/weapons/caution.dm | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/code/datums/uplink_items/uplink_traitor.dm b/code/datums/uplink_items/uplink_traitor.dm index b1b0e3c3325..5ca12d454f3 100644 --- a/code/datums/uplink_items/uplink_traitor.dm +++ b/code/datums/uplink_items/uplink_traitor.dm @@ -123,7 +123,6 @@ item = /obj/item/caution/proximity_sign cost = 2 job = list("Janitor") - surplus = 0 //Virology diff --git a/code/game/objects/items/weapons/caution.dm b/code/game/objects/items/weapons/caution.dm index 03f878d08ec..fb1dd7c72fe 100644 --- a/code/game/objects/items/weapons/caution.dm +++ b/code/game/objects/items/weapons/caution.dm @@ -24,7 +24,7 @@ /obj/item/caution/proximity_sign/attack_self(mob/user as mob) if(ishuman(user)) var/mob/living/carbon/human/H = user - if(H.mind.assigned_role != "Janitor") + if(!H.mind.has_antag_datum(/datum/antagonist/traitor) && !ismindslave(H)) return if(armed) armed = FALSE