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
2018-02-16 23:37:02 -06:00
committed by GitHub
parent a5650cccc4
commit 0eb053e0d3
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
@@ -2029,12 +2029,9 @@
#include "code\modules\mob\living\simple_animal\hostile\megafauna\blood_drunk_miner.dm"
#include "code\modules\mob\living\simple_animal\hostile\megafauna\bubblegum.dm"
#include "code\modules\mob\living\simple_animal\hostile\megafauna\colossus.dm"
<<<<<<< HEAD
#include "code\modules\mob\living\simple_animal\hostile\megafauna\dragon.dm"
#include "code\modules\mob\living\simple_animal\hostile\megafauna\dragon_vore.dm"
=======
#include "code\modules\mob\living\simple_animal\hostile\megafauna\drake.dm"
>>>>>>> a2ccca5... All medal methods are handled on SSmedals as opposed to global procs and also have proper defines. Killing with a crusher grants special medals. (#35673)
#include "code\modules\mob\living\simple_animal\hostile\megafauna\hierophant.dm"
#include "code\modules\mob\living\simple_animal\hostile\megafauna\legion.dm"
#include "code\modules\mob\living\simple_animal\hostile\megafauna\megafauna.dm"