From 0a77dfcce553c35ea3d0f1286f81f3f50a32fce1 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 25 Apr 2017 20:23:00 -0500 Subject: [PATCH] manual merge for slime.dm --- code/modules/mob/living/simple_animal/slime/slime.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index 4ff8904625..d9c6ed54c7 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -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