From ed91ccdeff967d7cd948a630bd942fbdd98c3551 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 18 Dec 2017 15:14:55 -0600 Subject: [PATCH] Update decal.dm --- code/datums/components/decal.dm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/code/datums/components/decal.dm b/code/datums/components/decal.dm index 4a4087d37e..a79de32898 100644 --- a/code/datums/components/decal.dm +++ b/code/datums/components/decal.dm @@ -48,12 +48,7 @@ if(old_dir == new_dir) return remove() -<<<<<<< HEAD - var/rotation = SimplifyDegrees(dir2angle(new_dir)-dir2angle(old_dir)) - pic.dir = turn(pic.dir, rotation) -======= pic.dir = turn(pic.dir, dir2angle(old_dir) - dir2angle(new_dir)) ->>>>>>> 3ce9bd7... decal rotation fix (#33614) apply() /datum/component/decal/proc/clean_react(strength) @@ -61,4 +56,4 @@ qdel(src) /datum/component/decal/proc/examine(mob/user) - to_chat(user, description) \ No newline at end of file + to_chat(user, description)