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
+4
View File
@@ -6,6 +6,10 @@
message_admins("[usr.key] has attempted to override the admin panel!")
return
if(ticker.mode && ticker.mode.check_antagonists_topic(href, href_list))
check_antagonists()
return
if(href_list["makeAntag"])
switch(href_list["makeAntag"])
if("1")