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:
zeroisthebiggay
2021-06-20 03:33:57 -04:00
committed by GitHub
parent fb32aa1248
commit 7e20f4f884
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tgstation.dme
-6
View File
@@ -1733,11 +1733,8 @@
#include "code\modules\antagonists\slaughter\slaughter.dm"
#include "code\modules\antagonists\slaughter\slaughter_antag.dm"
#include "code\modules\antagonists\slaughter\slaughterevent.dm"
<<<<<<< HEAD
#include "code\modules\antagonists\space_ninja\space_ninja.dm"
=======
#include "code\modules\antagonists\space_dragon\space_dragon.dm"
>>>>>>> 0a1f0d3e66ef5293cde8201f68199d30a6794968
#include "code\modules\antagonists\survivalist\survivalist.dm"
#include "code\modules\antagonists\swarmer\swarmer.dm"
#include "code\modules\antagonists\swarmer\swarmer_event.dm"
@@ -2107,11 +2104,8 @@
#include "code\modules\events\radiation_storm.dm"
#include "code\modules\events\sentience.dm"
#include "code\modules\events\shuttle_loan.dm"
<<<<<<< HEAD
#include "code\modules\events\space_ninja.dm"
=======
#include "code\modules\events\space_dragon.dm"
>>>>>>> 0a1f0d3e66ef5293cde8201f68199d30a6794968
#include "code\modules\events\spacevine.dm"
#include "code\modules\events\spider_infestation.dm"
#include "code\modules\events\spontaneous_appendicitis.dm"