From 6fa7305e270da31a20f4f43a1e98cd9de849ef3b Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 25 Apr 2017 20:33:07 -0500 Subject: [PATCH] Delete slime.dm.rej --- .../mob/living/simple_animal/slime/slime.dm.rej | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 code/modules/mob/living/simple_animal/slime/slime.dm.rej diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm.rej b/code/modules/mob/living/simple_animal/slime/slime.dm.rej deleted file mode 100644 index f6ce7b21a8..0000000000 --- a/code/modules/mob/living/simple_animal/slime/slime.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm (rejected hunks) -@@ -92,7 +92,7 @@ - create_reagents(100) - set_colour(new_colour) - grant_language(/datum/language/slime) -- ..() -+ . = ..() - - /mob/living/simple_animal/slime/proc/set_colour(new_colour) - colour = new_colour