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

Merge pull request #9421 from Ty-Omaha/cool-colors

Browse Source 
Makes punching / harm intent attack animations red
This commit is contained in:
Crazy Lemon
2018-08-27 18:45:11 -07:00
committed by GitHub
parent 350db19979 24e4846fd7
commit 0dd40d2ea3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/atoms_movable.dm
+6 -3
View File
@@ -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