Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

# Conflicts:
#	code/__DEFINES/misc.dm
#	code/game/dna/genes/goon_powers.dm
#	code/game/dna/genes/vg_powers.dm
#	code/game/objects/effects/overlays.dm
#	code/game/objects/structures/crates_lockers/closets.dm
#	code/game/objects/structures/crates_lockers/closets/statue.dm
#	code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
#	icons/mob/back.dmi
#	icons/obj/storage.dmi

code/controllers/configuration.dm

@@ -139,6 +139,7 @@
 	var/list/irc_bot_host = list()
 	var/main_irc = ""
 	var/admin_irc = ""
+	var/admin_notify_irc = ""
 	var/python_path = "" //Path to the python executable.  Defaults to "python" on windows and "/usr/bin/env python2" on unix
 
 	var/default_laws = 0 //Controls what laws the AI spawns with.
@@ -468,6 +469,9 @@
 				if("admin_irc")
 					config.admin_irc = value
 
+				if("admin_notify_irc")
+					config.admin_notify_irc = value
+
 				if("python_path")
 					if(value)
 						config.python_path = value