From e02611504547fd03b97a19f52edda59cfcac3730 Mon Sep 17 00:00:00 2001
From: Emmett Gaines <ninjanomnom@gmail.com>
Date: Sun, 17 Dec 2017 21:49:15 -0500
Subject: [PATCH] Decal rotation fix

---
 code/datums/components/decal.dm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/datums/components/decal.dm b/code/datums/components/decal.dm
index a28213b0b5..4a4087d37e 100644
--- a/code/datums/components/decal.dm
+++ b/code/datums/components/decal.dm
@@ -48,8 +48,12 @@
 	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)