diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 5870912d3d5..f2c943a7d23 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -361,7 +361,7 @@
switch(href_list["implant"])
if("remove")
- for(var/obj/item/implant/loyalty/I in H.contents)
+ for(var/obj/item/implant/mindshield/I in H.contents)
for(var/obj/item/organ/external/organs in H.organs)
if(I in organs.implants)
qdel(I)
diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm
index fdcf0dcc813..30d81fded5a 100644
--- a/code/datums/outfits/outfit_admin.dm
+++ b/code/datums/outfits/outfit_admin.dm
@@ -187,7 +187,7 @@
)
implants = list(
- /obj/item/implant/loyalty
+ /obj/item/implant/mindshield
)
/datum/outfit/admin/nt/protection_detail/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -229,7 +229,7 @@
)
implants = list(
- /obj/item/implant/loyalty
+ /obj/item/implant/mindshield
)
/datum/outfit/admin/nt/tcfl_legate
@@ -301,7 +301,7 @@
)
implants = list(
- /obj/item/implant/loyalty
+ /obj/item/implant/mindshield
)
/datum/outfit/admin/nt/odinsec/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -330,7 +330,7 @@
r_pocket = /obj/item/flame/lighter/zippo
implants = list(
- /obj/item/implant/loyalty
+ /obj/item/implant/mindshield
)
id_access = "Death Commando"
diff --git a/code/game/antagonist/antagonist_factions.dm b/code/game/antagonist/antagonist_factions.dm
index 403fe6d15a9..25c812f9dfd 100644
--- a/code/game/antagonist/antagonist_factions.dm
+++ b/code/game/antagonist/antagonist_factions.dm
@@ -3,7 +3,7 @@
set category = "Abilities"
if(!M.mind)
return
- for (var/obj/item/implant/loyalty/I in M)
+ for (var/obj/item/implant/mindshield/I in M)
if (I.implanted)
to_chat(src, "[M] is too loyal to the company!")
return
diff --git a/code/game/antagonist/station/cultist.dm b/code/game/antagonist/station/cultist.dm
index 5b4cd377e1d..61b21911ca8 100644
--- a/code/game/antagonist/station/cultist.dm
+++ b/code/game/antagonist/station/cultist.dm
@@ -102,7 +102,7 @@ var/datum/antagonist/cultist/cult
/datum/antagonist/cultist/can_become_antag(var/datum/mind/player, ignore_role = 1)
if(!..())
return FALSE
- for(var/obj/item/implant/loyalty/L in player.current)
+ for(var/obj/item/implant/mindshield/L in player.current)
if(L?.imp_in == player.current)
return FALSE
return TRUE
\ No newline at end of file
diff --git a/code/game/antagonist/station/revolutionary.dm b/code/game/antagonist/station/revolutionary.dm
index 73af51ad318..70341a34048 100644
--- a/code/game/antagonist/station/revolutionary.dm
+++ b/code/game/antagonist/station/revolutionary.dm
@@ -51,7 +51,7 @@ var/datum/antagonist/revolutionary/revs
/datum/antagonist/revolutionary/can_become_antag(var/datum/mind/player)
if(!..())
return FALSE
- for(var/obj/item/implant/loyalty/L in player.current)
+ for(var/obj/item/implant/mindshield/L in player.current)
if(L?.imp_in == player.current)
return FALSE
return TRUE
diff --git a/code/game/gamemodes/cult/runes/conversion.dm b/code/game/gamemodes/cult/runes/conversion.dm
index 6f0cbc84125..ec505a127c8 100644
--- a/code/game/gamemodes/cult/runes/conversion.dm
+++ b/code/game/gamemodes/cult/runes/conversion.dm
@@ -67,7 +67,7 @@
to_chat(target, span("cult", "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind, something sinister takes root."))
to_chat(target, span("cult", "And you were able to force it out of your mind. Though the memory of that dark, horrible vision will surely haunt you for decades to come."))
var/has_implant // we don't want people with loy implants to just get gibbed
- for(var/obj/item/implant/loyalty/L in target)
+ for(var/obj/item/implant/mindshield/L in target)
if(L?.imp_in == target)
has_implant = TRUE
if(!has_implant)
diff --git a/code/game/gamemodes/vampire/vampire_helpers.dm b/code/game/gamemodes/vampire/vampire_helpers.dm
index a38d34effc3..f446182a7a9 100644
--- a/code/game/gamemodes/vampire/vampire_helpers.dm
+++ b/code/game/gamemodes/vampire/vampire_helpers.dm
@@ -91,10 +91,10 @@
to_chat(src, "\The [T]'s mind is too strong to be affected by our powers!")
return FALSE
if (account_loyalty_implant)
- for (var/obj/item/implant/loyalty/I in T)
+ for (var/obj/item/implant/mindshield/I in T)
if (I.implanted)
if (notify)
- to_chat(src, "You feel that [T]'s mind is unreachable due to forced loyalty.")
+ to_chat(src, "You feel that [T]'s mind is protected from our powers.")
return FALSE
return TRUE
diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm
index c5cb2b21ac2..6dd92c2112a 100644
--- a/code/game/jobs/job/captain.dm
+++ b/code/game/jobs/job/captain.dm
@@ -40,7 +40,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
)
implants = list(
- /obj/item/implant/loyalty
+ /obj/item/implant/mindshield
)
backpack = /obj/item/storage/backpack/captain
diff --git a/code/game/jobs/job/outsider/representative.dm b/code/game/jobs/job/outsider/representative.dm
index 062bc5dc554..c37c82a5be5 100644
--- a/code/game/jobs/job/outsider/representative.dm
+++ b/code/game/jobs/job/outsider/representative.dm
@@ -46,7 +46,7 @@
)
implants = list(
- /obj/item/implant/loyalty
+ /obj/item/implant/mindshield
)
diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
index 5f5ae8ba51e..21a828477eb 100644
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -44,7 +44,7 @@
)
implants = list(
- /obj/item/implant/loyalty
+ /obj/item/implant/mindshield
)
backpack = /obj/item/storage/backpack/security
diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index 7085119818f..15974c2608e 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -239,7 +239,7 @@
/obj/machinery/body_scanconsole
var/obj/machinery/bodyscanner/connected
- var/known_implants = list(/obj/item/implant/chem, /obj/item/implant/death_alarm, /obj/item/implant/loyalty, /obj/item/implant/tracking)
+ var/known_implants = list(/obj/item/implant/chem, /obj/item/implant/death_alarm, /obj/item/implant/mindshield, /obj/item/implant/tracking)
var/collapse_desc = ""
var/broken_desc = ""
name = "Body Scanner Console"
diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm
index 00711071b1d..425a764a4f8 100644
--- a/code/game/objects/items/weapons/implants/implant.dm
+++ b/code/game/objects/items/weapons/implants/implant.dm
@@ -350,35 +350,23 @@ the implant may become unstable and either pre-maturely inject the subject or si
spawn(20)
malfunction--
-/obj/item/implant/loyalty
- name = "loyalty implant"
- desc = "Makes you loyal or such."
+/obj/item/implant/mindshield
+ name = "mind shield implant"
+ desc = "A controversial and debatably unethical neurostimulator and autohypnosis device. When implanted against the amygdala, it ensures the host maintains a consistent personality, preventing outside interference through brainwashing or hypnotic suggestion."
-/obj/item/implant/loyalty/get_data()
+/obj/item/implant/mindshield/get_data()
. = {"
Implant Specifications:
Name: [current_map.company_name] Employee Management Implant
Life: Ten years.
-Important Notes: Personnel injected with this device tend to be much more loyal to the company.
+Important Notes: Personnel injected with this device tend to be much more resistant to brain washing and other external influences.
Implant Details:
Function: Contains a small pod of nanobots that manipulate the host's mental functions.
Special Features: Will prevent and cure most forms of brainwashing.
Integrity: Implant will last so long as the nanobots are inside the bloodstream."}
-/obj/item/implant/loyalty/implanted(mob/M)
- if(!istype(M, /mob/living/carbon/human)) return 0
- var/mob/living/carbon/human/H = M
- var/datum/antagonist/antag_data = get_antag_data(H.mind.special_role)
- if(antag_data && (antag_data.flags & ANTAG_IMPLANT_IMMUNE))
- H.visible_message("[H] seems to resist the implant!", "You feel the corporate tendrils of [current_map.company_name] try to invade your mind!")
- return 0
- else
- clear_antag_roles(H.mind, 1)
- to_chat(H, "You feel a surge of loyalty towards [current_map.company_name].")
- return 1
-
-/obj/item/implant/loyalty/emp_act(severity)
+/obj/item/implant/mindshield/emp_act(severity)
if (malfunction)
return
malfunction = MALFUNCTION_TEMPORARY
@@ -393,22 +381,21 @@ the implant may become unstable and either pre-maturely inject the subject or si
spawn(20)
malfunction--
-/obj/item/implant/loyalty/ipc
- name = "loyalty chip"
- desc = "A device that sets directives programmed for loyalty to NanoTrasen on the synthetic subject. Will not work on organics."
-
-/obj/item/implant/loyalty/ipc/implanted(mob/M)
+/obj/item/implant/mindshield/ipc
+ name = "software protection chip"
+ desc = "A dedicated processor core designed to identify and terminate malignant software, ensuring a synthetics protection from outside hacking."
+/obj/item/implant/mindshield/ipc/implanted(mob/M)
if (!isipc(M))
return
..()
-/obj/item/implant/loyalty/sol
+/obj/item/implant/mindshield/sol
name = "loyalty implant"
desc = "Makes you loyal to the Sol Alliance, or to a certain individual."
-/obj/item/implant/loyalty/sol/implanted(mob/M)
+/obj/item/implant/mindshield/sol/implanted(mob/M)
if(!istype(M, /mob/living/carbon/human)) return 0
var/mob/living/carbon/human/H = M
var/datum/antagonist/antag_data = get_antag_data(H.mind.special_role)
@@ -594,9 +581,9 @@ the implant may become unstable and either pre-maturely inject the subject or si
var/mob/living/carbon/human/H = M
- for(var/obj/item/implant/loyalty/I in H)
+ for(var/obj/item/implant/mindshield/I in H)
if(I.implanted)
- to_chat(H, span("danger", "Rage surges through your body, but the nanobots from your loyalty implant stop it soon after it starts!"))
+ to_chat(H, span("danger", "Rage surges through your body, but the nanobots from your mind shield implant stop it soon after it starts!"))
return TRUE
var/datum/antagonist/antag_data = get_antag_data(H.mind.special_role)
diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm
index 1cf50ec3d5b..be316f88a07 100644
--- a/code/game/objects/items/weapons/implants/implantcase.dm
+++ b/code/game/objects/items/weapons/implants/implantcase.dm
@@ -96,12 +96,12 @@
/obj/item/implantcase/loyalty
- name = "glass case - 'loyalty'"
- desc = "A case containing a loyalty implant."
+ name = "glass case - 'mind shield'"
+ desc = "A case containing a mind shield implant."
icon_state = "implantcase-r"
/obj/item/implantcase/loyalty/New()
- src.imp = new /obj/item/implant/loyalty( src )
+ src.imp = new /obj/item/implant/mindshield( src )
..()
return
diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm
index bd625726af0..d5fa38a06eb 100644
--- a/code/game/objects/items/weapons/implants/implanter.dm
+++ b/code/game/objects/items/weapons/implants/implanter.dm
@@ -66,7 +66,7 @@
name = "implanter-loyalty"
/obj/item/implanter/loyalty/New()
- src.imp = new /obj/item/implant/loyalty( src )
+ src.imp = new /obj/item/implant/mindshield( src )
..()
update()
return
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index cebbe1c1b4e..84f82433b3d 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -265,7 +265,7 @@
/obj/item/storage/box/loyaltypins
name = "box of firing pins"
- desc = "A box of specialised \"loyalty\" authentication pins produced by Nanotrasen; these check to see if the user of the gun it's installed in has been implanted with a loyalty implant. Often used in ERTs."
+ desc = "A box of specialised \"loyalty\" authentication pins produced by Nanotrasen; these check to see if the user of the gun it's installed in has been implanted with a mind shield implant. Often used in ERTs."
starts_with = list(/obj/item/device/firing_pin/implant/loyalty = 7)
/obj/item/storage/box/loyaltypins/fill()
diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm
index 63471a4a499..2aac1e716ee 100644
--- a/code/game/objects/items/weapons/storage/lockbox.dm
+++ b/code/game/objects/items/weapons/storage/lockbox.dm
@@ -72,7 +72,7 @@
return 1
/obj/item/storage/lockbox/loyalty
- name = "lockbox of loyalty implants"
+ name = "lockbox of mind shield implants"
req_access = list(access_security)
starts_with = list(
/obj/item/implantcase/loyalty = 3,
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index cfe8cd79362..880b30c9f14 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -293,11 +293,11 @@
/mob/living/carbon/human/proc/implant_loyalty(mob/living/carbon/human/M, override = FALSE) // Won't override by default.
if(!config.use_loyalty_implants && !override) return // Nuh-uh.
- var/obj/item/implant/loyalty/L
+ var/obj/item/implant/mindshield/L
if(isipc(M))
- L = new/obj/item/implant/loyalty/ipc(M)
+ L = new/obj/item/implant/mindshield/ipc(M)
else
- L = new/obj/item/implant/loyalty(M)
+ L = new/obj/item/implant/mindshield(M)
L.imp_in = M
L.implanted = 1
var/obj/item/organ/external/affected = M.organs_by_name[BP_HEAD]
@@ -307,7 +307,7 @@
/mob/living/carbon/human/proc/is_loyalty_implanted(mob/living/carbon/human/M)
for(var/L in M.contents)
- if(istype(L, /obj/item/implant/loyalty))
+ if(istype(L, /obj/item/implant/mindshield))
for(var/obj/item/organ/external/O in M.organs)
if(L in O.implants)
return 1
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index e8c27769d7f..f7d38172da6 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -1120,7 +1120,7 @@
custom_pain("[pick("The pain is excruciating", "Please, just end the pain", "Your whole body is going numb")]!", 40, nohalloss = TRUE)
if (shock_stage >= 60)
- if(shock_stage == 60)
+ if(shock_stage == 60)
visible_message("[src]'s body becomes limp.", "Your body becomes limp.")
if (prob(2))
custom_pain("[pick("The pain is excruciating", "Please, just end the pain", "Your whole body is going numb")]!", shock_stage, nohalloss = TRUE)
@@ -1252,7 +1252,7 @@
if(I.implanted)
if(istype(I,/obj/item/implant/tracking))
holder1.icon_state = "hud_imp_tracking"
- if(istype(I,/obj/item/implant/loyalty))
+ if(istype(I,/obj/item/implant/mindshield))
holder2.icon_state = "hud_imp_loyal"
if(istype(I,/obj/item/implant/chem))
holder3.icon_state = "hud_imp_chem"
diff --git a/code/modules/mob/living/parasite/meme.dm b/code/modules/mob/living/parasite/meme.dm
index 421935f0228..d3925bfea48 100644
--- a/code/modules/mob/living/parasite/meme.dm
+++ b/code/modules/mob/living/parasite/meme.dm
@@ -490,7 +490,7 @@ var/controlling
if(!host) return
- for (var/obj/item/implant/loyalty/I in host)
+ for (var/obj/item/implant/mindshield/I in host)
if (I.implanted)
to_chat(src, "Your host's mind is shielded!")
return
@@ -543,7 +543,7 @@ var/controlling
to_chat(src, "You cannot do that in your current state.")
return
- for (var/obj/item/implant/loyalty/I in host)
+ for (var/obj/item/implant/mindshield/I in host)
if (I.implanted)
to_chat(src, "Your host's mind is shielded!")
return
diff --git a/code/modules/mob/living/simple_animal/borer/borer_powers.dm b/code/modules/mob/living/simple_animal/borer/borer_powers.dm
index 3019ee8f031..159e3d88254 100644
--- a/code/modules/mob/living/simple_animal/borer/borer_powers.dm
+++ b/code/modules/mob/living/simple_animal/borer/borer_powers.dm
@@ -250,6 +250,11 @@
to_chat(src, span("warning", "You cannot infest someone who is already infested!"))
return
+ for (var/obj/item/implant/mindshield/I in M)
+ if (I.implanted)
+ to_chat(src, span("warning", "\The [host]'s mind is shielded against your powers."))
+ return
+
to_chat(src, span("warning", "You focus your psionic lance on [M] and freeze their limbs with a wave of terrible dread."))
to_chat(M, span("warning", "You feel a creeping, horrible sense of dread come over you, freezing your limbs and setting your heart racing."))
M.Weaken(10)
@@ -268,6 +273,11 @@
to_chat(src, span("notice", "You cannot do that in your current state."))
return
+ for (var/obj/item/implant/mindshield/I in host)
+ if (I.implanted)
+ to_chat(src, span("warning", "\The [host]'s mind is shielded against your powers."))
+ return
+
to_chat(src, span("warning", "You begin delicately adjusting your connection to the host brain..."))
to_chat(host, span("warning", "You feel a tingling sensation at the back of your head."))
@@ -419,6 +429,11 @@
to_chat(src, span("warning", "You don't have enough chemicals!"))
return
+ for (var/obj/item/implant/mindshield/I in host)
+ if (I.implanted)
+ to_chat(src, span("warning", "\The [host]'s mind is shielded against your powers."))
+ return
+
chemicals -= 150
to_chat(src, span("notice", "You probe your tendrils deep within your host's zona bovinae, seeking to unleash their potential."))
to_chat(host, span("danger", "You feel some tendrils probe at the back of your head..."))
@@ -446,6 +461,11 @@
to_chat(src, span("warning", "You don't have enough chemicals!"))
return
+ for (var/obj/item/implant/mindshield/I in host)
+ if (I.implanted)
+ to_chat(src, span("warning", "\The [host]'s mind is shielded against your powers."))
+ return
+
var/list/faculties = list(capitalize(PSI_COERCION), capitalize(PSI_REDACTION), capitalize(PSI_ENERGISTICS), capitalize(PSI_PSYCHOKINESIS))
var/selected_faculty = input(src, "Choose a faculty to upgrade.") as null|anything in faculties
if(!selected_faculty)
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index b76ed483fa5..ce44c61c2b4 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -768,6 +768,9 @@
to_chat(H, "The APC power currents surge eratically, damaging your chassis!")
H.adjustFireLoss(10, 0)
if(infected)
+ for (var/obj/item/implant/mindshield/ipc/I in H)
+ if (I.implanted)
+ return
if(SOFTREF(H) in hacked_ipcs)
return
LAZYADD(hacked_ipcs, SOFTREF(H))
diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm
index 68bcc1dbf5d..6e745f9096e 100644
--- a/code/modules/projectiles/pins.dm
+++ b/code/modules/projectiles/pins.dm
@@ -118,10 +118,10 @@ Pins Below.
return 0
/obj/item/device/firing_pin/implant/loyalty
- name = "loyalty firing pin"
- desc = "This implant-locked firing pin authorizes the weapon for only loyalty-implanted users."
+ name = "mind shield firing pin"
+ desc = "This implant-locked firing pin authorizes the weapon for only mind shielded users."
icon_state = "firing_pin_loyalty"
- req_implant = /obj/item/implant/loyalty
+ req_implant = /obj/item/implant/mindshield
// Honk pin, clown joke item.
// Can replace other pins. Replace a pin in cap's laser for extra fun! This is generally adminbus only unless someone thinks of a use for it.
diff --git a/code/modules/psionics/faculties/coercion.dm b/code/modules/psionics/faculties/coercion.dm
index b51c62e36e8..b0ff84bab18 100644
--- a/code/modules/psionics/faculties/coercion.dm
+++ b/code/modules/psionics/faculties/coercion.dm
@@ -58,9 +58,14 @@
return
if(target.stat == DEAD || (target.status_flags & FAKEDEATH) || !target.client)
- to_chat(user, span("warning", "\The [target] is in no state for a mind-ream."))
+ to_chat(user, span("warning", "\The [target] is in no state for a mind-read."))
return TRUE
+ for (var/obj/item/implant/mindshield/I in target)
+ if (I.implanted)
+ to_chat(user, span("warning", "\The [target]'s mind is protected from the mind-read."))
+ return TRUE
+
user.visible_message(span("warning", "\The [user] touches \the [target]'s temple..."))
var/question = input(user, "Say something?", "Read Mind", "Penny for your thoughts?") as null|text
if(!question || user.incapacitated() || !do_after(user, 20))
@@ -146,6 +151,11 @@
if(!target.mind || !target.key)
to_chat(user, "\The [target] is mindless!")
return TRUE
+ for (var/obj/item/implant/mindshield/I in target)
+ if (I.implanted)
+ to_chat(user, span("warning", "\The [target]'s mind is protected from the mindslaving."))
+ return TRUE
+
user.visible_message("\The [user] seizes the head of \the [target] in both hands...")
to_chat(user, "You plunge your mentality into that of \the [target]...")
to_chat(target, "Your mind is invaded by the presence of \the [user]! They are trying to make you a slave!")
@@ -251,6 +261,11 @@
to_chat (user, "You feel your thoughts pass right through a mind empty of psychic energy.")
return
+ for (var/obj/item/implant/mindshield/I in target)
+ if (I.implanted)
+ to_chat(user, span("warning", "\The [target]'s mind rejects your attempt to communicate."))
+ return TRUE
+
log_say("[key_name(user)] communed to [key_name(target)]: [text]",ckey=key_name(src))
for (var/mob/M in player_list)
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index d1f1e4275fd..96b4100f766 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -163,14 +163,6 @@ other types of metals and chemistry for reagents).
build_path = /obj/item/implantcase/freedom
sort_string = "MFAAB"
-/datum/design/item/implant/loyalty
- name = "loyalty"
- id = "implant_loyal"
- req_tech = list(TECH_MATERIAL = 2, TECH_BIO = 3)
- materials = list(DEFAULT_WALL_MATERIAL = 7000, "glass" = 7000)
- build_path = /obj/item/implantcase/loyalty
- sort_string = "MFAAC"
-
/datum/design/item/advanced_light_replacer
name = "Advanced Light Replacer"
desc = "A specialised light replacer which stores more lights, refills faster from boxes, and sucks up broken bulbs."
diff --git a/code/modules/spells/targeted/mindcontrol.dm b/code/modules/spells/targeted/mindcontrol.dm
index c6e732bab3d..64a9fe846ae 100644
--- a/code/modules/spells/targeted/mindcontrol.dm
+++ b/code/modules/spells/targeted/mindcontrol.dm
@@ -42,7 +42,7 @@
to_chat(user, "\The [H] is brainless!")
return FALSE
- for (var/obj/item/implant/loyalty/I in H)
+ for (var/obj/item/implant/mindshield/I in H)
if (I.implanted)
to_chat(src, "[H]'s mind is shielded against your powers!")
return FALSE
diff --git a/html/changelogs/alberyk-loyalty.yml b/html/changelogs/alberyk-loyalty.yml
new file mode 100644
index 00000000000..dfcb0fbbf75
--- /dev/null
+++ b/html/changelogs/alberyk-loyalty.yml
@@ -0,0 +1,6 @@
+author: Alberyk
+
+delete-after: True
+
+changes:
+ - tweak: "Loyalty implants have been rebranded to be mind shield implants instead."
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index 049a84d05eb..684fc915495 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -5814,10 +5814,6 @@
pixel_y = 4
},
/obj/item/storage/box/trackimp,
-/obj/item/storage/lockbox/loyalty{
- pixel_x = 4;
- pixel_y = -4
- },
/turf/simulated/floor/tiled/dark,
/area/security/armoury)
"alG" = (