rej cleanup

code/game/mecha/mecha.dm.rej

@@ -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

tgstation.dme.rej

@@ -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"