From e2ccf1f52f38f69794913aa6fdea1a21f62cb209 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 26 Jun 2017 23:19:17 -0500 Subject: [PATCH] rej cleanup --- code/game/mecha/mecha.dm.rej | 10 ---------- tgstation.dme.rej | 9 --------- 2 files changed, 19 deletions(-) delete mode 100644 code/game/mecha/mecha.dm.rej delete mode 100644 tgstation.dme.rej diff --git a/code/game/mecha/mecha.dm.rej b/code/game/mecha/mecha.dm.rej deleted file mode 100644 index 1f2aa905dc..0000000000 --- a/code/game/mecha/mecha.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm (rejected hunks) -@@ -146,7 +146,7 @@ - /obj/mecha/get_cell() - return cell - --/obj/mecha/deconstruct(disassembled = TRUE) -+/obj/mecha/Destroy() - go_out() - var/mob/living/silicon/ai/AI - for(var/mob/M in src) //Let's just be ultra sure diff --git a/tgstation.dme.rej b/tgstation.dme.rej deleted file mode 100644 index f8575768ad..0000000000 --- a/tgstation.dme.rej +++ /dev/null @@ -1,9 +0,0 @@ -diff a/tgstation.dme b/tgstation.dme (rejected hunks) -@@ -1383,6 +1383,7 @@ - #include "code\modules\hydroponics\grown\misc.dm" - #include "code\modules\hydroponics\grown\mushrooms.dm" - #include "code\modules\hydroponics\grown\nettle.dm" -+#include "code\modules\hydroponics\grown\onion.dm" - #include "code\modules\hydroponics\grown\potato.dm" - #include "code\modules\hydroponics\grown\pumpkin.dm" - #include "code\modules\hydroponics\grown\random.dm"