From 4cecb15ffc7bfec94f42f10dbb9122de945a1ea1 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Tue, 30 May 2017 14:23:25 -0500
Subject: [PATCH] beacons

---
 tgstation.dme     | 1 +
 tgstation.dme.rej | 9 ---------
 2 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 tgstation.dme.rej

diff --git a/tgstation.dme b/tgstation.dme
index f61256862c..328469038f 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1490,6 +1490,7 @@
 #include "code\modules\mining\equipment\explorer_gear.dm"
 #include "code\modules\mining\equipment\kinetic_crusher.dm"
 #include "code\modules\mining\equipment\lazarus_injector.dm"
+#include "code\modules\mining\equipment\marker_beacons.dm"
 #include "code\modules\mining\equipment\mineral_scanner.dm"
 #include "code\modules\mining\equipment\resonator.dm"
 #include "code\modules\mining\equipment\vendor_items.dm"
diff --git a/tgstation.dme.rej b/tgstation.dme.rej
deleted file mode 100644
index 1c849ddc28..0000000000
--- a/tgstation.dme.rej
+++ /dev/null
@@ -1,9 +0,0 @@
-diff a/tgstation.dme b/tgstation.dme	(rejected hunks)
-@@ -1444,6 +1444,7 @@
- #include "code\modules\mining\ores_coins.dm"
- #include "code\modules\mining\satchel_ore_boxdm.dm"
- #include "code\modules\mining\shelters.dm"
-+#include "code\modules\mining\equipment\marker_beacons.dm"
- #include "code\modules\mining\laborcamp\laborshuttle.dm"
- #include "code\modules\mining\laborcamp\laborstacker.dm"
- #include "code\modules\mining\lavaland\ash_flora.dm"