Decal rotation fix

2017-12-17 21:49:15 -05:00
parent 77b792d69a
commit e026115045
1 changed files with 4 additions and 0 deletions
@@ -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)