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

Browse Source
This commit is contained in:
Joe Schmoe
2018-08-29 20:23:50 +02:00
parent 19512961c0 3649e81e78
commit 064a4999ee
386 changed files with 4336 additions and 3639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/__DEFINES/role_preferences.dm
View File

@@ -26,6 +26,7 @@
#define ROLE_SERVANT_OF_RATVAR "servant of Ratvar"
#define ROLE_BROTHER "blood brother"
#define ROLE_BRAINWASHED "brainwashed victim"
#define ROLE_OVERTHROW "syndicate mutineer",
#define ROLE_SHADOWLING "shadowling" // Yogs
//Missing assignment means it's not a gamemode specific role, IT'S NOT A BUG OR ERROR.
@@ -49,7 +50,11 @@ GLOBAL_LIST_INIT(special_roles, list(
ROLE_ABDUCTOR,
ROLE_DEVIL = /datum/game_mode/devil,
ROLE_SERVANT_OF_RATVAR = /datum/game_mode/clockwork_cult,
<<<<<<< HEAD
ROLE_SHADOWLING = /datum/game_mode/shadowling //yogs
=======
ROLE_OVERTHROW = /datum/game_mode/overthrow
>>>>>>> 3649e81e78f8cde4a7dc59b442a0b1074ff617c9
))
//Job defines for what happens when you fail to qualify for any job during job selection