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

removes rej

Browse Source
This commit is contained in:
LetterJay
2017-04-24 20:10:31 -05:00
parent 8c56134f56
commit 29f441e255
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tgstation.dme.rej
-11
View File
@@ -1,11 +0,0 @@
diff a/tgstation.dme b/tgstation.dme (rejected hunks)
@@ -657,8 +657,8 @@
#include "code\game\objects\effects\mines.dm"
#include "code\game\objects\effects\misc.dm"
#include "code\game\objects\effects\overlays.dm"
-#include "code\game\objects\effects\proximity.dm"
#include "code\game\objects\effects\portals.dm"
+#include "code\game\objects\effects\proximity.dm"
#include "code\game\objects\effects\spiders.dm"
#include "code\game\objects\effects\step_triggers.dm"
#include "code\game\objects\effects\wanted_poster.dm"