cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix out-of-order role candidate options

Browse Source 
fixup pol commit
This commit is contained in:
Aronai Sieyes
2020-05-04 20:04:30 -04:00
parent e24410ccce
commit 538e85283b
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/__defines/gamemode.dm
View File

@@ -35,8 +35,8 @@
#define BE_RAIDER 0x800 #define BE_RAIDER 0x800
#define BE_PLANT 0x1000 #define BE_PLANT 0x1000
#define BE_MUTINEER 0x2000 #define BE_MUTINEER 0x2000
#define BE_PAI 0x4000 #define BE_LOYALIST 0x4000
#define BE_LOYALIST 0x8000 #define BE_PAI 0x8000
var/list/be_special_flags = list( var/list/be_special_flags = list(
"Traitor" = BE_TRAITOR, "Traitor" = BE_TRAITOR,
@@ -45,7 +45,6 @@ var/list/be_special_flags = list(
"Wizard" = BE_WIZARD, "Wizard" = BE_WIZARD,
"Malf AI" = BE_MALF, "Malf AI" = BE_MALF,
"Revolutionary" = BE_REV, "Revolutionary" = BE_REV,
"Loyalist" = BE_LOYALIST,
"Xenomorph" = BE_ALIEN, "Xenomorph" = BE_ALIEN,
"Positronic Brain" = BE_AI, "Positronic Brain" = BE_AI,
"Cultist" = BE_CULTIST, "Cultist" = BE_CULTIST,
@@ -54,7 +53,8 @@ var/list/be_special_flags = list(
"Raider" = BE_RAIDER, "Raider" = BE_RAIDER,
"Diona" = BE_PLANT, "Diona" = BE_PLANT,
"Mutineer" = BE_MUTINEER, "Mutineer" = BE_MUTINEER,
"pAI" = BE_PAI "Loyalist" = BE_LOYALIST,
"pAI" = BE_PAI,
) )

13
code/modules/client/preference_setup/antagonism/02_candidacy.dm
View File

@@ -5,17 +5,18 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
"operative" = 1, // 1 "operative" = 1, // 1
"changeling" = 1, // 2 "changeling" = 1, // 2
"wizard" = 1, // 3 "wizard" = 1, // 3
"malf AI" = 1, // 4 "malf AI" = 1, // 4
"revolutionary" = 1, // 5 "revolutionary" = 1, // 5
"alien candidate" = 1, // 6 "alien candidate" = 1, // 6
"positronic brain" = 1, // 7 "positronic brain" = 1, // 7
"cultist" = 1, // 8 "cultist" = 1, // 8
"renegade" = 1, // 9 "renegade" = 1, // 9
"ninja" = 1, // 10 "ninja" = 1, // 10
"raider" = 1, // 11 "raider" = 1, // 11
"diona" = 1, // 12 "diona" = 1, // 12
"loyalist" = 1, // 13 "mutineer" = 1, // 13
"pAI candidate" = 1, // -- TLE // 14 "loyalist" = 1, // 14
"pAI candidate" = 1, // 15
) )
/datum/category_item/player_setup_item/antagonism/candidacy /datum/category_item/player_setup_item/antagonism/candidacy