cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-30 00:35:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update vorestation.dme

Browse Source
This commit is contained in:
Novacat
2019-07-13 23:01:19 -04:00
committed by GitHub
parent 22c5967269
commit cc2b7e30c0
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vorestation.dme
-3
View File
@@ -2030,11 +2030,8 @@
#include "code\modules\mining\machine_stacking.dm"
#include "code\modules\mining\machine_unloading.dm"
#include "code\modules\mining\mine_items.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\modules\mining\mine_items_vr.dm"
=======
#include "code\modules\mining\mine_outcrops.dm"
>>>>>>> 887804e... Merge pull request #6245 from Ketrai/ROCKSDOJUSTROCK:polaris.dme
#include "code\modules\mining\mine_turfs.dm"
#include "code\modules\mining\mine_turfs_vr.dm"
#include "code\modules\mining\mineral_effect.dm"