Changes loyalty implants to mind shields (#8398)

This commit is contained in:
Alberyk
2020-03-12 22:01:42 +01:00
committed by GitHub
parent 847da5071b
commit 3c96cc70e6
27 changed files with 92 additions and 73 deletions
@@ -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
+2 -2
View File
@@ -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"
+2 -2
View File
@@ -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, "<span class='warning'>Your host's mind is shielded!</span>")
return
@@ -543,7 +543,7 @@ var/controlling
to_chat(src, "<span class='warning'>You cannot do that in your current state.</span>")
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, "<span class='warning'>Your host's mind is shielded!</span>")
return
@@ -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)