shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update crayon.dm

Browse Source
This commit is contained in:
LetterJay
2017-11-08 02:22:48 -06:00
committed by GitHub
parent 5bcaf7a3b1
commit a297f4bc7f
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/crayon.dm
-6
View File
@@ -25,12 +25,6 @@
var/matrix/M = matrix() var/matrix/M = matrix()
M.Turn(rotation) M.Turn(rotation)
src.transform = M src.transform = M
<<<<<<< HEAD
add_atom_colour(main, FIXED_COLOUR_PRIORITY)
=======
if(main) if(main)
paint_colour = main paint_colour = main
add_atom_colour(paint_colour, FIXED_COLOUR_PRIORITY) add_atom_colour(paint_colour, FIXED_COLOUR_PRIORITY)
>>>>>>> 8c3948b... Crayon rotation as a type var (#32441)