From c7bf483f8952cdaa791849bca6665a728d042af0 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 9 Sep 2020 14:50:47 -0500 Subject: [PATCH] mindshields now properly stop enslavement --- code/game/objects/items/implants/implant_slave.dm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/implants/implant_slave.dm b/code/game/objects/items/implants/implant_slave.dm index babba2af..018a031c 100644 --- a/code/game/objects/items/implants/implant_slave.dm +++ b/code/game/objects/items/implants/implant_slave.dm @@ -1,6 +1,6 @@ /obj/item/implant/slave name = "slave implant" - desc = "Turns you into security's new pet." + desc = "Turns criminals into security's new pet." resistance_flags = INDESTRUCTIBLE activated = 0 @@ -8,7 +8,7 @@ var/dat = {"Implant Specifications:
Name: Alternative Criminal Reassignment Implant
Life: Ten years.
- Important Notes: Personnel injected with this device are forced to be fully subservient to security personnel. Incompatible with mindshield-class implants.
+ Important Notes: Incompatible with mindshield-class implants. Implant should be reserved for criminal punishment only. Recreational use is heavily frowned upon.
Implant Details:
Function: Overrides the host's mental functions with an innate desire to serve security personnel, obeying nearly any command.
@@ -19,17 +19,13 @@ /obj/item/implant/slave/implant(mob/living/target, mob/user, silent = FALSE) if(..()) - /* if(!target.mind) - ADD_TRAIT(target, TRAIT_MINDSHIELD, "implant") - target.sec_hud_set_implants() - return TRUE - Can't be a pet without having a mind! */ + return FALSE //Can't be a pet without having a mind! if(target.mind.has_antag_datum(/datum/antagonist/brainwashed)) target.mind.remove_antag_datum(/datum/antagonist/brainwashed) - if(target.mind.has_antag_datum(/datum/antagonist/rev/head) || target.mind.unconvertable || target.mind.has_antag_datum(/datum/antagonist/gang/boss) || target.mind.assigned_role == "Security Officer" || target.mind.assigned_role == "Detective" || target.mind.assigned_role == "Warden" || target.mind.assigned_role == "Head of Security") + if(target.mind.has_antag_datum(/datum/antagonist/rev/head) || target.mind.unconvertable || target.mind.has_antag_datum(/datum/antagonist/gang/boss) || target.mind.assigned_role == "Security Officer" || target.mind.assigned_role == "Detective" || target.mind.assigned_role == "Warden" || target.mind.assigned_role == "Head of Security" || HAS_TRAIT(target, TRAIT_MINDSHIELD)) if(!silent) if(target.mind.assigned_role == "Security Officer" || target.mind.assigned_role == "Detective" || target.mind.assigned_role == "Warden" || target.mind.assigned_role == "Head of Security") target.visible_message("[target] seems to resist the implant! You can't enslave a member of security!", "You feel something interfering with your mental conditioning, but you resist it!")