cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-27 06:00:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update vorestation.dme

Browse Source
This commit is contained in:
Novacat
2019-09-26 03:05:38 -04:00
committed by GitHub
parent 0b31dcace5
commit bd284351d8
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
@@ -2968,7 +2968,6 @@
#include "code\modules\research\designs\subspace_parts.dm"
#include "code\modules\research\designs\tech_disks.dm"
#include "code\modules\research\designs\weapons.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\modules\resleeving\circuitboards.dm"
#include "code\modules\resleeving\computers.dm"
#include "code\modules\resleeving\designer.dm"
@@ -2986,12 +2985,10 @@
#include "code\modules\rogueminer_vr\wrappers.dm"
#include "code\modules\rogueminer_vr\zone_console.dm"
#include "code\modules\rogueminer_vr\zonemaster.dm"
=======
#include "code\modules\research\designs\xenoarch_toys.dm"
#include "code\modules\research\designs\xenobio_toys.dm"
#include "code\modules\research\designs\circuits\ai_modules.dm"
#include "code\modules\research\designs\circuits\circuits.dm"
>>>>>>> 8ccac5f... Merge pull request #6459 from Heroman3003/re-sort-ch:polaris.dme
#include "code\modules\scripting\Errors.dm"
#include "code\modules\scripting\IDE.dm"
#include "code\modules\scripting\Options.dm"