From a61437232292ecf9e949ef9fa87dfc652866526b Mon Sep 17 00:00:00 2001 From: Geeves Date: Thu, 7 Jan 2021 14:30:37 +0200 Subject: [PATCH] Psionic Energistics Fix (#10914) --- code/modules/psionics/faculties/energistics.dm | 13 +++++++------ html/changelogs/geeves-psionic_fix.yml | 6 ++++++ 2 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 html/changelogs/geeves-psionic_fix.yml diff --git a/code/modules/psionics/faculties/energistics.dm b/code/modules/psionics/faculties/energistics.dm index aa6dedac52f..55a31c92388 100644 --- a/code/modules/psionics/faculties/energistics.dm +++ b/code/modules/psionics/faculties/energistics.dm @@ -101,15 +101,16 @@ use_description = "Target a non-living target in melee range on harm intent to cause some sparks to appear. This can light fires." /datum/psionic_power/energistics/spark/invoke(var/mob/living/user, var/mob/living/target) - if(isnull(target) || istype(target)) return FALSE + if(isnull(target) || istype(target)) + return FALSE . = ..() if(.) if(istype(target,/obj/item/clothing/mask/smokable/cigarette)) var/obj/item/clothing/mask/smokable/cigarette/S = target S.light(SPAN_NOTICE("\The [user] snaps [user.get_pronoun("his")] fingers and \the [S] lights up.")) playsound(S.loc, /decl/sound_category/spark_sound, 50, 1) - else - var/datum/effect_system/sparks/spark_system - spark_system = bind_spark(src, 3) - spark_system.queue() - return TRUE + return TRUE + if(!isturf(target)) + return FALSE + spark(target, 3) + return TRUE \ No newline at end of file diff --git a/html/changelogs/geeves-psionic_fix.yml b/html/changelogs/geeves-psionic_fix.yml new file mode 100644 index 00000000000..bc67df02f43 --- /dev/null +++ b/html/changelogs/geeves-psionic_fix.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "The sparks psionic ability now properly generates sparks, and no longer disallows you from operating your inventory." \ No newline at end of file