Traitorbro gamemode

This commit is contained in:
pubby
2017-09-17 18:03:12 -05:00
committed by CitadelStationBot
parent 3144e56730
commit a01f3213f5
17 changed files with 471 additions and 267 deletions
+1
View File
@@ -18,3 +18,4 @@
#define ANTAG_DATUM_IAA_HUMAN_CUSTOM /datum/antagonist/traitor/human/internal_affairs/custom
#define ANTAG_DATUM_IAA_AI_CUSTOM /datum/antagonist/traitor/AI/internal_affairs/custom
#define ANTAG_DATUM_IAA_AI /datum/antagonist/traitor/AI/internal_affairs
#define ANTAG_DATUM_BROTHER /datum/antagonist/brother
+4
View File
@@ -40,7 +40,11 @@
#define ANTAG_HUD_SINTOUCHED 16
#define ANTAG_HUD_SOULLESS 17
#define ANTAG_HUD_CLOCKWORK 18
<<<<<<< HEAD
#define ANTAG_HUD_BORER 19
=======
#define ANTAG_HUD_BROTHER 19
>>>>>>> 1e4d1ca... Traitorbro gamemode (#30344)
// Notification action types
#define NOTIFY_JUMP "jump"
+6 -1
View File
@@ -22,13 +22,18 @@
#define ROLE_REVENANT "revenant"
#define ROLE_DEVIL "devil"
#define ROLE_SERVANT_OF_RATVAR "servant of Ratvar"
<<<<<<< HEAD
#define ROLE_BORER "borer"
=======
#define ROLE_BROTHER "blood brother"
>>>>>>> 1e4d1ca... Traitorbro gamemode (#30344)
//Missing assignment means it's not a gamemode specific role, IT'S NOT A BUG OR ERROR.
//The gamemode specific ones are just so the gamemodes can query whether a player is old enough
//(in game days played) to play that role
GLOBAL_LIST_INIT(special_roles, list(
ROLE_TRAITOR = /datum/game_mode/traitor,
ROLE_BROTHER = /datum/game_mode/traitor/bros,
ROLE_OPERATIVE = /datum/game_mode/nuclear,
ROLE_CHANGELING = /datum/game_mode/changeling,
ROLE_WIZARD = /datum/game_mode/wizard,
@@ -50,4 +55,4 @@ GLOBAL_LIST_INIT(special_roles, list(
//Job defines for what happens when you fail to qualify for any job during job selection
#define BEASSISTANT 1
#define BERANDOMJOB 2
#define RETURNTOLOBBY 3
#define RETURNTOLOBBY 3