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

don't inherit transform

Browse Source
This commit is contained in:
mochi
2021-02-25 19:36:03 +01:00
parent 89c7e12d89
commit 3c015ffeda
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/atoms_movable.dm
+2 -1
View File
@@ -569,11 +569,12 @@
if(M.client && M.client.prefs.toggles2 & PREFTOGGLE_2_ITEMATTACK)
viewing |= M.client
I.appearance_flags |= RESET_TRANSFORM | KEEP_APART
flick_overlay(I, viewing, 7) // 7 ticks/half a second
// And animate the attack!
var/t_color = "#ffffff"
if(ismob(src) && ismob(A) && (!used_item))
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 = 0.3 SECONDS, color = t_color)