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

Update tgstation.dme

Browse Source
This commit is contained in:
LetterJay
2017-09-26 14:02:02 -05:00
committed by GitHub
parent fd0bc465cc
commit f8c02be1b5
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tgstation.dme
-3
View File
@@ -28,11 +28,8 @@
#include "code\__DEFINES\atmospherics.dm"
#include "code\__DEFINES\atom_hud.dm"
#include "code\__DEFINES\callbacks.dm"
<<<<<<< HEAD
#include "code\__DEFINES\citadel_defines.dm"
=======
#include "code\__DEFINES\cinematics.dm"
>>>>>>> 1304e83... Refactors cinematics. (#30888)
#include "code\__DEFINES\clockcult.dm"
#include "code\__DEFINES\combat.dm"
#include "code\__DEFINES\components.dm"