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-10-27 23:56:50 -05:00
committed by GitHub
parent 985fdcd22d
commit 6901dba147
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
@@ -29,11 +29,8 @@
#include "code\__DEFINES\atom_hud.dm"
#include "code\__DEFINES\callbacks.dm"
#include "code\__DEFINES\cinematics.dm"
<<<<<<< HEAD
#include "code\__DEFINES\citadel_defines.dm"
=======
#include "code\__DEFINES\cleaning.dm"
>>>>>>> 5dde2e3... Merge pull request #31864 from ninjanomnom/thermite
#include "code\__DEFINES\clockcult.dm"
#include "code\__DEFINES\combat.dm"
#include "code\__DEFINES\components.dm"