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

code/controllers/configuration.dm

@@ -18,6 +18,7 @@
 	var/log_adminwarn = 0				// log warnings admins get about bomb construction and such
 	var/log_pda = 0						// log pda messages
 	var/log_hrefs = 0					// logs all links clicked in-game. Could be used for debugging and tracking down exploits
+	var/log_runtime = 0					// logs world.log to a file
 	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
@@ -44,7 +45,8 @@
 	var/Tickcomp = 0
 	var/socket_talk	= 0					// use socket_talk to communicate with other processes
 	var/list/resource_urls = null
-
+	var/antag_hud_allowed = 0			// Ghosts can turn on Antagovision to see a HUD of who is the bad guys this round.
+	var/antag_hud_restricted = 0                    // Ghosts that turn on Antagovision cannot rejoin the round.
 	var/list/mode_names = list()
 	var/list/modes = list()				// allowed modes
 	var/list/votable_modes = list()		// votable modes
@@ -62,6 +64,12 @@
 	var/automute_on = 0					//enables automuting/spam prevention
 	var/jobs_have_minimal_access = 0	//determines whether jobs use minimal access or expanded access.
 
+	var/cult_ghostwriter = 1               //Allows ghosts to write in blood in cult rounds...
+	var/cult_ghostwriter_req_cultists = 10 //...so long as this many cultists are active.
+
+	var/disable_player_mice = 0
+	var/uneducated_mice = 0 //Set to 1 to prevent newly-spawned mice from understanding human speech
+
 	var/usealienwhitelist = 0
 	var/limitalienplayers = 0
 	var/alien_to_human_ratio = 0.5
@@ -177,7 +185,7 @@
 		if(type == "config")
 			switch (name)
 				if ("resource_urls")
-					config.resource_urls = stringsplit(value, " ")
+					config.resource_urls = text2list(value, " ")
 
 				if ("admin_legacy_system")
 					config.admin_legacy_system = 1
@@ -239,6 +247,9 @@
 				if ("log_hrefs")
 					config.log_hrefs = 1
 
+				if ("log_runtime")
+					config.log_runtime = 1
+
 				if("allow_admin_ooccolor")
 					config.allow_admin_ooccolor = 1
 
@@ -389,6 +400,11 @@
 				if("ticklag")
 					Ticklag = text2num(value)
 
+				if("allow_antag_hud")
+					config.antag_hud_allowed = 1
+				if("antag_hud_restricted")
+					config.antag_hud_restricted = 1
+
 				if("socket_talk")
 					socket_talk = text2num(value)
 
@@ -423,6 +439,12 @@
 				if("ghost_interaction")
 					config.ghost_interaction = 1
 
+				if("disable_player_mice")
+					config.disable_player_mice = 1
+
+				if("uneducated_mice")
+					config.uneducated_mice = 1
+
 				if("comms_password")
 					config.comms_password = value
 
@@ -444,10 +466,15 @@
 						else //probably windows, if not this should work anyway
 							config.python_path = "python"
 
+				if("allow_cult_ghostwriter")
+					config.cult_ghostwriter = 1
+
+				if("req_cult_ghostwriter")
+					config.cult_ghostwriter_req_cultists = value
+
 				else
 					diary << "Unknown setting in configuration: '[name]'"
 
-
 		else if(type == "game_options")
 			if(!value)
 				diary << "Unknown value for setting [name] in [filename]."

code/controllers/hooks-defs.dm

@@ -0,0 +1,17 @@
+/**
+ * Startup hook.
+ * Called in world.dm when the server starts.
+ */
+/hook/startup
+
+/**
+ * Roundstart hook.
+ * Called in gameticker.dm when a round starts.
+ */
+/hook/roundstart
+
+/**
+ * Roundend hook.
+ * Called in gameticker.dm when a round ends.
+ */
+/hook/roundend

code/controllers/hooks.dm

@@ -0,0 +1,39 @@
+/**
+ * @file hooks.dm
+ * Implements hooks, a simple way to run code on pre-defined events.
+ */
+
+/** @page hooks Code hooks
+ * @section hooks Hooks
+ * A hook is defined under /hook in the type tree.
+ *
+ * To add some code to be called by the hook, define a proc under the type, as so:
+ * @code
+	/hook/foo/proc/bar()
+		if(1)
+			return 1 //Sucessful
+		else
+			return 0 //Error, or runtime.
+ * @endcode
+ * All hooks must return nonzero on success, as runtimes will force return null.
+ */
+
+/**
+ * Calls a hook, executing every piece of code that's attached to it.
+ * @param hook	Identifier of the hook to call.
+ * @returns		1 if all hooked code runs successfully, 0 otherwise.
+ */
+/proc/callHook(hook)
+	var/hook_path = text2path("/hook/[hook]")
+	if(!hook_path)
+		error("Invalid hook '/hook/[hook]' called.")
+		return 0
+
+	var/caller = new hook_path
+	var/status = 1
+	for(var/P in typesof("[hook_path]/proc"))
+		if(!call(caller, P)())
+			error("Hook '[P]' failed or runtimed.")
+			status = 0
+
+	return status

code/controllers/master_controller.dm

@@ -66,6 +66,7 @@ datum/controller/game_controller/proc/setup()
 	setupgenetics()
 	setupfactions()
 	setup_economy()
+	SetupXenoarch()
 
 	transfer_controller = new
 
@@ -296,7 +297,7 @@ datum/controller/game_controller/proc/process_nano()
 	var/i = 1
 	while(i<=nanomanager.processing_uis.len)
 		var/datum/nanoui/ui = nanomanager.processing_uis[i]
-		if(ui && ui.src_object && ui.user)
+		if(ui)
 			ui.process()
 			i++
 			continue