manual merge for slime.dm

This commit is contained in:
LetterJay
2017-04-25 20:23:00 -05:00
parent d931e5801c
commit 0a77dfcce5
@@ -92,7 +92,7 @@
E.Grant(src)
create_reagents(100)
set_colour(new_colour)
..()
. = ..()
/mob/living/simple_animal/slime/proc/set_colour(new_colour)
colour = new_colour