From 24e4846fd7edeaa92564bd68780e455a0aef1e2b Mon Sep 17 00:00:00 2001 From: Ty-Omaha Date: Sun, 26 Aug 2018 11:30:39 -0400 Subject: [PATCH] harm red --- code/game/atoms_movable.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 4e467e4eb18..50a578cc3b3 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -428,8 +428,11 @@ flick_overlay(I, viewing, 5) // 5 ticks/half a second // And animate the attack! - animate(I, alpha = 175, pixel_x = 0, pixel_y = 0, pixel_z = 0, time = 3) - - + var/t_color = "#ffffff" + if(ismob(src) && ismob(A) && (!used_item)) + var/mob/M = src + t_color = M.a_intent == INTENT_HARM ? "#ff0000" : "#ffffff" + animate(I, alpha = 175, pixel_x = 0, pixel_y = 0, pixel_z = 0, time = 3, color = t_color) + /atom/movable/proc/portal_destroyed(obj/effect/portal/P) return