shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

beacons

Browse Source
This commit is contained in:
LetterJay
2017-05-30 14:23:25 -05:00
parent 6fb8aa7ee1
commit 4cecb15ffc
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tgstation.dme
+1
View File
@@ -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"
tgstation.dme.rej
-9
View File
@@ -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"