From 1941a8fcfac186e7f0f1fa540c262ea3547817de Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 13 Oct 2017 10:13:24 -0400 Subject: [PATCH] Merge pull request #31614 from AnturK/zap Fixes electrocution animation --- code/game/machinery/doors/airlock.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index c3af2043ad..18c8e1d209 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -274,7 +274,7 @@ var/image/electrocution_skeleton_anim = image('icons/mob/human.dmi', user, icon_state = "electrocuted_base", layer=ABOVE_MOB_LAYER) shock_image.color = rgb(0,0,0) shock_image.override = TRUE - electrocution_skeleton_anim.appearance_flags = RESET_COLOR + electrocution_skeleton_anim.appearance_flags |= RESET_COLOR|KEEP_APART to_chat(user, "You feel a powerful shock course through your body!") if(user.client) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 63b84b9cf3..d1e363bb90 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -710,7 +710,7 @@ var/static/mutable_appearance/electrocution_skeleton_anim if(!electrocution_skeleton_anim) electrocution_skeleton_anim = mutable_appearance(icon, "electrocuted_base") - electrocution_skeleton_anim.appearance_flags |= RESET_COLOR + electrocution_skeleton_anim.appearance_flags |= RESET_COLOR|KEEP_APART add_overlay(electrocution_skeleton_anim) addtimer(CALLBACK(src, .proc/end_electrocution_animation, electrocution_skeleton_anim), anim_duration)