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

code/modules/admin/NewBan.dm

@@ -58,6 +58,9 @@ var/savefile/Banlist
 	CMinutes = (world.realtime / 10) / 60
 	return 1
 
+/hook/startup/proc/loadBans()
+	return LoadBans()
+
 /proc/LoadBans()
 
 	Banlist = new("data/banlist.bdb")

code/modules/admin/admin.dm

@@ -1014,14 +1014,6 @@ var/global/floorIsLava = 0
 	message_admins("\blue [key_name_admin(usr)] toggled guests game entering [guests_allowed?"":"dis"]allowed.", 1)
 	feedback_add_details("admin_verb","TGU") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-/client/proc/unjobban_panel()
-	set name = "Unjobban Panel"
-	set category = "Admin"
-	if (src.holder)
-		src.holder.unjobbanpanel()
-	feedback_add_details("admin_verb","UJBP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-	return
-
 /datum/admins/proc/output_ai_laws()
 	var/ai_number = 0
 	for(var/mob/living/silicon/S in mob_list)

code/modules/admin/admin_investigate.dm

@@ -11,6 +11,10 @@
 /proc/investigate_subject2file(var/subject)
 	return file("[INVESTIGATE_DIR][subject].html")
 
+/hook/startup/proc/resetInvestigate()
+	investigate_reset()
+	return 1
+
 /proc/investigate_reset()
 	if(fdel(INVESTIGATE_DIR))	return 1
 	return 0

code/modules/admin/admin_ranks.dm

@@ -53,6 +53,10 @@ var/list/admin_ranks = list()								//list of all ranks with associated rights
 	#endif
 
 
+/hook/startup/proc/loadAdmins()
+	load_admins()
+	return 1
+
 /proc/load_admins()
 	//clear the datums references
 	admin_datums.Cut()

code/modules/admin/admin_verbs.dm

@@ -76,9 +76,7 @@ var/list/admin_verbs_admin = list(
 )
 var/list/admin_verbs_ban = list(
 	/client/proc/unban_panel,
-	/client/proc/jobbans,
-	/client/proc/unjobban_panel,
-	// /client/proc/DB_ban_panel
+	/client/proc/jobbans
 	)
 var/list/admin_verbs_sounds = list(
 	/client/proc/play_local_sound,

code/modules/admin/banjob.dm

@@ -50,6 +50,10 @@ DEBUG
 	jobban_loadbanfile()
 */
 
+/hook/startup/proc/loadJobBans()
+	jobban_loadbanfile()
+	return 1
+
 /proc/jobban_loadbanfile()
 	if(config.ban_legacy_system)
 		var/savefile/S=new("data/job_full.ban")
@@ -101,15 +105,6 @@ DEBUG
 	text2file(formatted_log,"data/ban_unban_log.txt")
 
 
-/proc/jobban_updatelegacybans()
-	if(!jobban_runonce)
-		log_admin("Updating jobbanfile!")
-		// Updates bans.. Or fixes them. Either way.
-		for(var/T in jobban_keylist)
-			if(!T)	continue
-		jobban_runonce++	//don't run this update again
-
-
 /proc/jobban_remove(X)
 	for (var/i = 1; i <= length(jobban_keylist); i++)
 		if( findtext(jobban_keylist[i], "[X]") )

code/modules/admin/topic.dm

@@ -891,19 +891,6 @@
 			if("Cancel")
 				return
 
-	else if(href_list["unjobbanf"])
-		if(!check_rights(R_BAN))	return
-
-		var/banfolder = href_list["unjobbanf"]
-		Banlist.cd = "/base/[banfolder]"
-		var/key = Banlist["key"]
-		if(alert(usr, "Are you sure you want to unban [key]?", "Confirmation", "Yes", "No") == "Yes")
-			if (RemoveBanjob(banfolder))
-				unjobbanpanel()
-			else
-				alert(usr,"This ban has already been lifted / does not exist.","Error","Ok")
-				unjobbanpanel()
-
 	else if(href_list["mute"])
 		if(!check_rights(R_MOD,0) && !check_rights(R_ADMIN))  return
 

code/modules/ext_scripts/irc.dm

@@ -4,11 +4,16 @@
 	return
 
 /proc/send2mainirc(var/msg)
-	if(config.use_irc_bot && config.main_irc && config.irc_bot_host)
-		ext_python("ircbot_message.py", "[config.comms_password] [config.irc_bot_host] [config.main_irc] [msg]")
+	if(config.main_irc)
+		send2irc(config.main_irc, msg)
 	return
 
 /proc/send2adminirc(var/msg)
-	if(config.use_irc_bot && config.admin_irc && config.irc_bot_host)
-		ext_python("ircbot_message.py", "[config.comms_password] [config.irc_bot_host] [config.admin_irc] [msg]")
+	if(config.admin_irc)
+		send2irc(config.admin_irc, msg)
 	return
+
+
+/hook/startup/proc/ircNotify()
+	send2mainirc("Server starting up on [config.server? "byond://[config.server]" : "byond://[world.address]:[world.port]"]")
+	return 1

code/modules/food/recipes_microwave.dm

@@ -1142,4 +1142,19 @@ I said no!
 
 /datum/recipe/cracker
 	reagents = list("flour" = 5, "sodiumchloride" = 1)
-	result = /obj/item/weapon/reagent_containers/food/snacks/cracker
+	result = /obj/item/weapon/reagent_containers/food/snacks/cracker
+
+/datum/recipe/stuffing
+	reagents = list("water" = 5, "sodiumchloride" = 1, "blackpepper" = 1)
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/sliceable/bread,
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/stuffing
+
+/datum/recipe/tofurkey
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/tofu,
+		/obj/item/weapon/reagent_containers/food/snacks/tofu,
+		/obj/item/weapon/reagent_containers/food/snacks/stuffing,
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/tofurkey

code/modules/mob/living/silicon/pai/recruit.dm

@@ -13,6 +13,10 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 	var/ready = 0
 
 
+/hook/startup/proc/paiControllerSetup()
+	paiController = new /datum/paiController()
+	return 1
+
 
 /datum/paiController
 	var/list/pai_candidates = list()

code/modules/power/power.dm

@@ -79,6 +79,9 @@
 
 // rebuild all power networks from scratch
 
+/hook/startup/proc/buildPowernets()
+	return makepowernets()
+
 /proc/makepowernets()
 	for(var/datum/powernet/PN in powernets)
 		del(PN)
@@ -101,6 +104,8 @@
 		if(!M.powernet)	continue	// APCs have powernet=0 so they don't count as network nodes directly
 		M.powernet.nodes[M] = M
 
+	return 1
+
 
 // returns a list of all power-related objects (nodes, cable, junctions) in turf,
 // excluding source, that match the direction d

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -542,6 +542,24 @@
 		reagents.add_reagent("nutriment", 3)
 		src.bitesize = 3
 
+/obj/item/weapon/reagent_containers/food/snacks/tofurkey
+	name = "Tofurkey"
+	desc = "A fake turkey made from tofu."
+	icon_state = "tofurkey"
+	New()
+		..()
+		reagents.add_reagent("nutriment", 12)
+		reagents.add_reagent("stoxin", 3)
+		bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/stuffing
+	name = "Stuffing"
+	desc = "Moist, peppery breadcrumbs for filling the body cavities of dead birds. Dig in!"
+	icon_state = "stuffing"
+	New()
+		..()
+		reagents.add_reagent("nutriment", 3)
+		bitesize = 1
 
 /obj/item/weapon/reagent_containers/food/snacks/carpmeat
 	name = "carp fillet"