Mutiny Mode

Conflicts:
	code/__HELPERS/time.dm
	code/controllers/hooks-defs.dm
	code/controllers/hooks.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/podmen.dm
	code/modules/admin/player_panel.dm
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/login.dm
	code/modules/mob/mob.dm
	code/modules/security levels/keycard authentication.dm
	code/setup.dm
	icons/mob/mob.dmi
This commit is contained in:
Jeremy Liberman
2014-05-15 01:01:54 -04:00
committed by ZomgPonies
parent 5ffb4a15ed
commit bd249e3a53
44 changed files with 2556 additions and 766 deletions
+2 -1
View File
@@ -17,7 +17,8 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
"ninja" = "true", // 10
"vox raider" = IS_MODE_COMPILED("heist"), // 11
"slime" = 1, // 12
"vampire" = IS_MODE_COMPILED("vampire") // 13
"vampire" = IS_MODE_COMPILED("vampire"), // 13
"mutineer" = IS_MODE_COMPILED("mutiny") // 14
)
var/const/MAX_SAVE_SLOTS = 10