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:
deathride58
2018-05-06 03:12:14 -04:00
committed by GitHub
parent 474d980a9b
commit 083fa00a14
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
@@ -323,11 +323,8 @@
#include "code\datums\components\cleaning.dm"
#include "code\datums\components\construction.dm"
#include "code\datums\components\decal.dm"
<<<<<<< HEAD
=======
#include "code\datums\components\earhealing.dm"
#include "code\datums\components\earprotection.dm"
>>>>>>> fd4c753... replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2 (#37597)
#include "code\datums\components\forensics.dm"
#include "code\datums\components\infective.dm"
#include "code\datums\components\jousting.dm"