From 8c84bb2ff1982c9c01caa6596e760f653cd5182e Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 27 Nov 2022 16:56:23 +0100 Subject: [PATCH] [MIRROR] the shocks from spell packets now have SHOCK_NOGLOVES [MDB IGNORE] (#17773) * the shocks from spell packets now have SHOCK_NOGLOVES (#71506) ## About The Pull Request See title. ## Why It's Good For The Game Atomized from https://github.com/tgstation/tgstation/pull/71426. The shocks come from you being hit in the chest by a packet of enchanted birdseed, not from touching something with your hands. ## Changelog :cl: ATHATH fix: The shocks from the spell packets spell are no longer blocked by insulated gloves. /:cl: * the shocks from spell packets now have SHOCK_NOGLOVES Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com> --- code/modules/spells/spell_types/conjure_item/lighting_packet.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/spells/spell_types/conjure_item/lighting_packet.dm b/code/modules/spells/spell_types/conjure_item/lighting_packet.dm index 0713446c432..5901c268c2c 100644 --- a/code/modules/spells/spell_types/conjure_item/lighting_packet.dm +++ b/code/modules/spells/spell_types/conjure_item/lighting_packet.dm @@ -29,7 +29,7 @@ if(isliving(hit_atom)) var/mob/living/hit_living = hit_atom if(!hit_living.can_block_magic()) - hit_living.electrocute_act(80, src, flags = SHOCK_ILLUSION) + hit_living.electrocute_act(80, src, flags = SHOCK_ILLUSION | SHOCK_NOGLOVES) qdel(src) /obj/item/spellpacket/lightningbolt/throw_at(atom/target, range, speed, mob/thrower, spin = TRUE, diagonals_first = FALSE, datum/callback/callback, force = INFINITY, quickstart = TRUE)