Merge branch 'master' of https://github.com/Baystation12/Baystation12

code/game/gamemodes/autotraitor/autotraitor.dm

@@ -4,7 +4,7 @@
 
 /datum/game_mode/traitor/autotraitor
 	name = "AutoTraitor"
-	config_tag = "Extend-A-Traitormongous"
+	config_tag = "extend-a-traitormongous"
 
 	var/list/possible_traitors
 	var/num_players = 0

code/game/gamemodes/game_mode.dm

@@ -17,7 +17,7 @@
 	var/config_tag = null
 	var/intercept_hacked = 0
 	var/votable = 1
-	var/probability = 1
+	var/probability = 0
 	var/station_was_nuked = 0 //see nuclearbomb.dm and malfunction.dm
 	var/explosion_in_progress = 0 //sit back and relax
 	var/list/datum/mind/modePlayer = new

code/modules/mob/new_player/new_player.dm

@@ -106,7 +106,7 @@
 
 		if(href_list["observe"])
 
-			if(alert(src,"Are you sure you wish to observe? You will not be able to play this round!","Player Setup","Yes","No") == "Yes")
+			if(alert(src,"Are you sure you wish to observe? You will have to wait 30 minutes before being able to respawn!","Player Setup","Yes","No") == "Yes")
 				if(!client)	return 1
 				var/mob/dead/observer/observer = new()
 

config/config.txt

@@ -74,25 +74,13 @@ LOG_PDA
 ## 
 ## default probablity is 1, increase to make that mode more likely to be picked
 ## set to 0 to disable that mode
-## Cult mode is in alpha test, enable at your own risk
 PROBABILITY EXTENDED 1
-PROBABILITY TRAITOR 0
-PROBABILITY METEOR 0
 PROBABILITY MALFUNCTION 1
-PROBABILITY BLOB 0
 PROBABILITY NUCLEAR 1
-PROBABILITY SANDBOX 0
 PROBABILITY WIZARD 1
-PROBABILITY RESTRUCTURING 0
-PROBABILITY REVOLUTION 0
 PROBABILITY CHANGELING 1
 PROBABILITY CULT 1
-PROBABILITY MONKEY 0
-PROBABILITY TRAITORCHAN 0
 PROBABILITY EXTEND-A-TRAITORMONGOUS 6
-PROBABILITY EPIDEMIC 0
-PROBABILITY MEME 0
-PROBABILITY RP-REVOLUTION 0
 
 ## Hash out to disable random events during the round.
 ALLOW_RANDOM_EVENTS