Merge branch 'master' of github.com:Baystation12/Baystation12 into dev

code/controllers/configuration.dm

@@ -22,6 +22,7 @@
 	var/sql_enabled = 1					// for sql switching
 	var/allow_admin_ooccolor = 0		// Allows admins with relevant permissions to have their own ooc colour
 	var/allow_vote_restart = 0 			// allow votes to restart
+	var/ert_admin_call_only = 0
 	var/allow_vote_mode = 0				// allow votes to change mode
 	var/allow_admin_jump = 1			// allows admin jumping
 	var/allow_admin_spawning = 1		// allows admin item spawning
@@ -138,7 +139,7 @@
 	var/main_irc = ""
 	var/admin_irc = ""
 	var/python_path = "" //Path to the python executable.  Defaults to "python" on windows and "/usr/bin/env python2" on unix
-
+	var/use_lib_nudge = 0 //Use the C library nudge instead of the python nudge.
 
 /datum/configuration/New()
 	var/list/L = typesof(/datum/game_mode) - /datum/game_mode
@@ -290,6 +291,9 @@
 				if ("vote_autogamemode_timeleft")
 					config.vote_autogamemode_timeleft = text2num(value)
 
+				if("ert_admin_only")
+					config.ert_admin_call_only = 1
+
 				if ("allow_ai")
 					config.allow_ai = 1
 
@@ -470,6 +474,9 @@
 						else //probably windows, if not this should work anyway
 							config.python_path = "python"
 
+				if("use_lib_nudge")
+					config.use_lib_nudge = 1
+
 				if("allow_cult_ghostwriter")
 					config.cult_ghostwriter = 1