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

Fix merge conflicts and yogstation.dme

Browse Source
This commit is contained in:
Ling
2018-09-25 20:05:38 +02:00
parent 270d2bcd96
commit cb1e668b4e
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/__DEFINES/role_preferences.dm
View File

@@ -61,11 +61,8 @@ GLOBAL_LIST_INIT(special_roles, list(
ROLE_SERVANT_OF_RATVAR = /datum/game_mode/clockwork_cult,
ROLE_VAMPIRE = /datum/game_mode/vampire, // Yogs
ROLE_OVERTHROW = /datum/game_mode/overthrow,
<<<<<<< HEAD
ROLE_SHADOWLING = /datum/game_mode/shadowling, //yogs
=======
ROLE_HIVE = /datum/game_mode/hivemind,
>>>>>>> 9e8d7509b6... [READY] [Gamemode Bounty] Assimilation (#40296)
ROLE_INTERNAL_AFFAIRS = /datum/game_mode/traitor/internal_affairs,
ROLE_SENTIENCE
))

3
code/datums/hud.dm
View File

@@ -27,11 +27,8 @@ GLOBAL_LIST_INIT(huds, list(
ANTAG_HUD_SOULLESS = new/datum/atom_hud/antag/hidden(),
ANTAG_HUD_CLOCKWORK = new/datum/atom_hud/antag(),
ANTAG_HUD_BROTHER = new/datum/atom_hud/antag/hidden(),
<<<<<<< HEAD
ANTAG_HUD_VAMPIRE = new/datum/atom_hud/antag/hidden(), // Yogs
=======
ANTAG_HUD_HIVE = new/datum/atom_hud/antag/hidden(),
>>>>>>> 9e8d7509b6... [READY] [Gamemode Bounty] Assimilation (#40296)
))
/datum/atom_hud

4
yogstation.dme
View File

@@ -540,6 +540,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"
@@ -1257,6 +1259,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"
@@ -2566,6 +2569,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"