cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

compile fix

Browse Source
This commit is contained in:
ZomgPonies
2014-03-21 09:51:54 -04:00
parent cff01f9df6
commit b575663473
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
baystation12.dme
-4
View File
@@ -1403,11 +1403,7 @@
#include "code\WorkInProgress\Aryn\Lighting\Engine.dm"
#include "code\WorkInProgress\Aryn\Lighting\Light.dm"
#include "code\WorkInProgress\Aryn\Lighting\Lightpoint.dm"
<<<<<<< HEAD
#include "code\WorkInProgress\Aryn\Lighting\Math.dm"
#include "code\WorkInProgress\Cael_Aislinn\sculpture.dm"
=======
>>>>>>> 9007aed... Fixed an annoying bug with giving another player a flashlight,
#include "code\WorkInProgress\Cael_Aislinn\Jungle\falsewall.dm"
#include "code\WorkInProgress\Cael_Aislinn\Jungle\jungle.dm"
#include "code\WorkInProgress\Cael_Aislinn\Jungle\jungle_animals.dm"