cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 07:38:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Mindshielding now sends a signal, and is dealt by the antagonist (#7573)

Browse Source 
* Mindshielding now sends a signal, and is dealt by the antagonist (#60850)

Mindshielding people isn't hardcoded to the mindshield's implanting anymore, instead sending a signal, which I find better in the long run (especially for downstreams).

* Mindshielding now sends a signal, and is dealt by the antagonist

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-08-15 23:44:03 +01:00
committed by GitHub
co-authored by John Willard
parent b446046698
commit 40cb513cfd
6 changed files with 68 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/implants/implant_mindshield.dm
+26 -39
View File
@@ -1,7 +1,7 @@
/obj/item/implant/mindshield
name = "mindshield implant"
desc = "Protects against brainwashing."
activated = 0
activated = FALSE
/obj/item/implant/mindshield/get_data()
var/dat = {"<b>Implant Specifications:</b><BR>
@@ -17,50 +17,37 @@
/obj/item/implant/mindshield/implant(mob/living/target, mob/user, silent = FALSE, force = FALSE)
if(..())
if(!target.mind)
ADD_TRAIT(target, TRAIT_MINDSHIELD, IMPLANT_TRAIT)
target.sec_hud_set_implants()
return TRUE
var/deconverted = FALSE
if(target.mind.has_antag_datum(/datum/antagonist/brainwashed))
target.mind.remove_antag_datum(/datum/antagonist/brainwashed)
deconverted = TRUE
if(target.mind.has_antag_datum(/datum/antagonist/rev/head)|| target.mind.unconvertable)
. = ..()
if(!.)
return FALSE
if(target.mind)
if((SEND_SIGNAL(target.mind, COMSIG_PRE_MINDSHIELD_IMPLANT, user) & COMPONENT_MINDSHIELD_RESISTED) || target.mind.unconvertable)
if(!silent)
target.visible_message(span_warning("[target] seems to resist the implant!"), span_warning("You feel something interfering with your mental conditioning, but you resist it!"))
removed(target, 1)
removed(target, TRUE)
qdel(src)
return TRUE //the implant is still used
var/datum/antagonist/rev/rev = target.mind.has_antag_datum(/datum/antagonist/rev)
if(rev)
deconverted = TRUE
rev.remove_revolutionary(FALSE, user)
if(!silent)
if(target.mind.has_antag_datum(/datum/antagonist/cult))
to_chat(target, span_warning("You feel something interfering with your mental conditioning, but you resist it!"))
else
to_chat(target, span_notice("You feel a sense of peace and security. You are now protected from brainwashing."))
ADD_TRAIT(target, TRAIT_MINDSHIELD, IMPLANT_TRAIT)
target.sec_hud_set_implants()
if(deconverted)
return TRUE
if(SEND_SIGNAL(target.mind, COMSIG_MINDSHIELD_IMPLANTED, user) & COMPONENT_MINDSHIELD_DECONVERTED)
if(prob(1) || SSevents.holidays && SSevents.holidays[APRIL_FOOLS])
target.say("I'm out! I quit! Whose kidneys are these?", forced = "They're out! They quit! Whose kidneys do they have?")
return TRUE
return FALSE
/obj/item/implant/mindshield/removed(mob/target, silent = FALSE, special = 0)
if(..())
if(isliving(target))
var/mob/living/L = target
REMOVE_TRAIT(L, TRAIT_MINDSHIELD, IMPLANT_TRAIT)
L.sec_hud_set_implants()
if(target.stat != DEAD && !silent)
to_chat(target, span_boldnotice("Your mind suddenly feels terribly vulnerable. You are no longer safe from brainwashing."))
return TRUE
return FALSE
ADD_TRAIT(target, TRAIT_MINDSHIELD, IMPLANT_TRAIT)
target.sec_hud_set_implants()
if(!silent)
to_chat(target, span_notice("You feel a sense of peace and security. You are now protected from brainwashing."))
return TRUE
/obj/item/implant/mindshield/removed(mob/target, silent = FALSE, special = FALSE)
. = ..()
if(!.)
return FALSE
if(isliving(target))
var/mob/living/L = target
REMOVE_TRAIT(L, TRAIT_MINDSHIELD, IMPLANT_TRAIT)
L.sec_hud_set_implants()
if(target.stat != DEAD && !silent)
to_chat(target, span_boldnotice("Your mind suddenly feels terribly vulnerable. You are no longer safe from brainwashing."))
return TRUE
/obj/item/implanter/mindshield
name = "implanter (mindshield)"