Update decal.dm

2017-12-18 15:14:55 -06:00
parent e026115045
commit ed91ccdeff
1 changed files with 1 additions and 6 deletions
@@ -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)
+	to_chat(user, description)