cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2680 from yogstation13/upstream-merge-40296

Browse Source 
[MIRROR] [READY] [Gamemode Bounty] Assimilation
This commit is contained in:
Ling
2018-10-01 11:19:09 +02:00
committed by GitHub
parent 1944301716 cb1e668b4e
commit a513010e4b
16 changed files with 989 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tgstation.dme
View File

@@ -531,6 +531,8 @@
#include "code\game\gamemodes\devil\objectives.dm"
#include "code\game\gamemodes\devil\devil agent\devil_agent.dm"
#include "code\game\gamemodes\extended\extended.dm"
#include "code\game\gamemodes\hivemind\hivemind.dm"
#include "code\game\gamemodes\hivemind\objectives.dm"
#include "code\game\gamemodes\meteor\meteor.dm"
#include "code\game\gamemodes\meteor\meteors.dm"
#include "code\game\gamemodes\monkey\monkey.dm"
@@ -1254,6 +1256,7 @@
#include "code\modules\antagonists\ert\ert.dm"
#include "code\modules\antagonists\greentext\greentext.dm"
#include "code\modules\antagonists\highlander\highlander.dm"
#include "code\modules\antagonists\hivemind\hivemind.dm"
#include "code\modules\antagonists\magic_servant\servant.dm"
#include "code\modules\antagonists\monkey\monkey.dm"
#include "code\modules\antagonists\morph\morph.dm"
@@ -2576,6 +2579,7 @@
#include "code\modules\spells\spell_types\forcewall.dm"
#include "code\modules\spells\spell_types\genetic.dm"
#include "code\modules\spells\spell_types\godhand.dm"
#include "code\modules\spells\spell_types\hivemind.dm"
#include "code\modules\spells\spell_types\infinite_guns.dm"
#include "code\modules\spells\spell_types\inflict_handler.dm"
#include "code\modules\spells\spell_types\knock.dm"