cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes electrocution effect (#30204)

Browse Source 
* Fixes electrocution effect

* Purges spare effect
This commit is contained in:
PollardTheDragon
2025-08-22 15:19:49 +00:00
committed by GitHub
parent 9b735ec3fe
commit edeea0af27
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon_procs.dm
+7 -4
View File
@@ -188,6 +188,7 @@
// Moderate shock - Stun, knockdown, funny effect
var/should_stun = FALSE
var/stun_dur = 0 SECONDS
var/icon/overlay_icon = null
if(shock_damage >= SHOCK_MODERATE)
should_stun = (!(flags & SHOCK_TESLA) || siemens_coeff > 0.5) && !(flags & SHOCK_NOSTUN)
if(should_stun)
@@ -196,8 +197,8 @@
if(shock_damage >= SHOCK_FLASH) // Arc flash explosion is instant, don't wait for the secondary shock and bypass the effect
stun_dur = 0
else
var/obj/effect/temp_visual/electrocution/shock_effect = new /obj/effect/temp_visual/electrocution(loc, stun_dur)
shock_effect.setDir(dir)
overlay_icon = new('icons/effects/effects.dmi', "electrocution")
overlays += overlay_icon
emote("scream")
AdjustStuttering(4 SECONDS)
@@ -212,13 +213,15 @@
throw_dir = get_dir(shock_source.loc, src)
throw_distance = round(shock_damage / 10)
addtimer(CALLBACK(src, PROC_REF(secondary_shock), jitter_amount, should_stun, throw_dir, throw_distance), stun_dur)
addtimer(CALLBACK(src, PROC_REF(secondary_shock), jitter_amount, should_stun, throw_dir, throw_distance, overlay_icon), stun_dur)
return shock_damage
/// Called after electrocute_act to apply secondary effects
/mob/living/carbon/proc/secondary_shock(jitter_amount, should_stun, throw_dir, throw_distance)
/mob/living/carbon/proc/secondary_shock(jitter_amount, should_stun, throw_dir, throw_distance, overlay_icon)
if(jitter_amount)
AdjustJitter(jitter_amount)
if(overlay_icon)
overlays -= overlay_icon
if(should_stun)
KnockDown(6 SECONDS)
if(throw_dir && throw_distance && !HAS_TRAIT(src, TRAIT_MAGPULSE)) // Don't yeet if they're wearing magboots