cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update vorestation.dme

Browse Source
This commit is contained in:
Novacat
2019-05-13 22:42:45 -04:00
committed by GitHub
parent 318a2f3d09
commit 842f3a63ae
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vorestation.dme
View File

@@ -218,10 +218,7 @@
#include "code\controllers\subsystems\air.dm"
#include "code\controllers\subsystems\airflow.dm"
#include "code\controllers\subsystems\atoms.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\controllers\subsystems\bellies_vr.dm"
=======
>>>>>>> 59c8446... Merge pull request #6164 from Novacat/nova-runtimes:polaris.dme
#include "code\controllers\subsystems\character_setup.dm"
#include "code\controllers\subsystems\circuits.dm"
#include "code\controllers\subsystems\events.dm"