From fbdaee449216a1972db7ea7e1c23a4f1bcfb6c7a Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 28 Dec 2023 16:54:25 +0100 Subject: [PATCH] [MIRROR] Fix some incorrect uses of "src" in energized component [MDB IGNORE] (#25882) * Fix some incorrect uses of "src" in energized component (#80613) ## About The Pull Request Fixes this: ![image](https://github.com/tgstation/tgstation/assets/35135081/d4265136-9324-4057-992b-fbc9a6f6eb46) Untested ## Changelog :cl: fix: Fixed "was shocked by /datum/component/energized" message. /:cl: * Fix some incorrect uses of "src" in energized component --------- Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com> --- code/datums/components/energized.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/components/energized.dm b/code/datums/components/energized.dm index 97ff670113f..d637bc2eb76 100644 --- a/code/datums/components/energized.dm +++ b/code/datums/components/energized.dm @@ -76,7 +76,7 @@ if(prob(100 - toast_prob)) if(prob(25)) do_sparks(1, FALSE, source) - playsound(src, SFX_SPARKS, 40, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(parent, SFX_SPARKS, 40, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) source.audible_message(span_danger("[parent] makes an electric crackle...")) return FALSE @@ -116,10 +116,10 @@ header = "Electrifying!", ) do_sparks(4, FALSE, source) - playsound(src, SFX_SPARKS, 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(parent, SFX_SPARKS, 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) source.audible_message(span_danger("[parent] makes a loud electric crackle!")) to_chat(future_tram_victim, span_userdanger("You hear a loud electric crackle!")) - future_tram_victim.electrocute_act(15, src, 1) + future_tram_victim.electrocute_act(15, parent, 1) return TRUE #undef NORMAL_TOAST_PROB