diff --git a/tgstation.dme b/tgstation.dme index f61256862c..da8d11a14d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1491,7 +1491,9 @@ #include "code\modules\mining\equipment\kinetic_crusher.dm" #include "code\modules\mining\equipment\lazarus_injector.dm" #include "code\modules\mining\equipment\mineral_scanner.dm" +#include "code\modules\mining\equipment\mining_tools.dm" #include "code\modules\mining\equipment\resonator.dm" +#include "code\modules\mining\equipment\survival_pod.dm" #include "code\modules\mining\equipment\vendor_items.dm" #include "code\modules\mining\equipment\wormhole_jaunter.dm" #include "code\modules\mining\laborcamp\laborshuttle.dm" diff --git a/tgstation.dme.rej b/tgstation.dme.rej deleted file mode 100644 index 4fc8ceb63d..0000000000 --- a/tgstation.dme.rej +++ /dev/null @@ -1,11 +0,0 @@ -diff a/tgstation.dme b/tgstation.dme (rejected hunks) -@@ -1449,7 +1449,9 @@ - #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\mining_tools.dm" - #include "code\modules\mining\equipment\resonator.dm" -+#include "code\modules\mining\equipment\survival_pod.dm" - #include "code\modules\mining\equipment\vendor_items.dm" - #include "code\modules\mining\equipment\wormhole_jaunter.dm" - #include "code\modules\mining\laborcamp\laborshuttle.dm"