Datum antag wizard.

code/_compile_options.dm

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #define DEBUG					//Enables byond profiling and full runtime logs - note, this may also be defined in your .dme file
 								//Enables in-depth debug messages to runtime log (used for debugging)
 //#define TESTING				//By using the testing("message") proc you can create debug-feedback for people with this
@@ -73,3 +74,81 @@
 //make sure you add an update to the schema_version stable in the db changelog
 #define DB_MAJOR_VERSION 3
 #define DB_MINOR_VERSION 3
+=======
+#define DEBUG					//Enables byond profiling and full runtime logs - note, this may also be defined in your .dme file
+								//Enables in-depth debug messages to runtime log (used for debugging)
+//#define TESTING				//By using the testing("message") proc you can create debug-feedback for people with this
+								//uncommented, but not visible in the release version)
+
+#ifdef TESTING
+//#define GC_FAILURE_HARD_LOOKUP	//makes paths that fail to GC call find_references before del'ing.
+									//Also allows for recursive reference searching of datums.
+									//Sets world.loop_checks to false and prevents find references from sleeping
+
+//#define VISUALIZE_ACTIVE_TURFS	//Highlights atmos active turfs in green
+#endif
+
+#define PRELOAD_RSC	1			/*set to:
+								0 to allow using external resources or on-demand behaviour;
+								1 to use the default behaviour;
+								2 for preloading absolutely everything;
+								*/
+
+#define BACKGROUND_ENABLED 0    // The default value for all uses of set background. Set background can cause gradual lag and is recommended you only turn this on if necessary.
+								// 1 will enable set background. 0 will disable set background.
+
+//ADMIN STUFF
+#define ROUNDSTART_LOGOUT_REPORT_TIME	6000 //Amount of time (in deciseconds) after the rounds starts, that the player disconnect report is issued.
+
+#define SPAM_TRIGGER_WARNING	5	//Number of identical messages required before the spam-prevention will warn you to stfu
+#define SPAM_TRIGGER_AUTOMUTE	10	//Number of identical messages required before the spam-prevention will automute you
+
+//Don't set this very much higher then 1024 unless you like inviting people in to dos your server with message spam
+#define MAX_MESSAGE_LEN			1024
+#define MAX_NAME_LEN			42
+#define MAX_BROADCAST_LEN		512
+#define MAX_CHARTER_LEN			80
+
+//MINOR TWEAKS/MISC
+#define AGE_MIN				17	//youngest a character can be
+#define AGE_MAX				85	//oldest a character can be
+#define WIZARD_AGE_MIN		30	//youngest a wizard can be
+#define APPRENTICE_AGE_MIN	29	//youngest an apprentice can be
+#define SHOES_SLOWDOWN		0	//How much shoes slow you down by default. Negative values speed you up
+#define POCKET_STRIP_DELAY			40	//time taken (in deciseconds) to search somebody's pockets
+#define DOOR_CRUSH_DAMAGE	15	//the amount of damage that airlocks deal when they crush you
+
+#define	HUNGER_FACTOR		0.1	//factor at which mob nutrition decreases
+#define	REAGENTS_METABOLISM 0.4	//How many units of reagent are consumed per tick, by default.
+#define REAGENTS_EFFECT_MULTIPLIER (REAGENTS_METABOLISM / 0.4)	// By defining the effect multiplier this way, it'll exactly adjust all effects according to how they originally were with the 0.4 metabolism
+
+#define MAX_STACK_AMOUNT_METAL	50
+#define MAX_STACK_AMOUNT_GLASS	50
+#define MAX_STACK_AMOUNT_RODS	60
+
+// AI Toggles
+#define AI_CAMERA_LUMINOSITY	5
+#define AI_VOX 1 // Comment out if you don't want VOX to be enabled and have players download the voice sounds.
+
+//Additional code for the above flags.
+#ifdef TESTING
+#warn compiling in TESTING mode. testing() debug messages will be visible.
+#endif
+
+#ifdef TRAVISTESTING
+#define TESTING
+#endif
+
+//Update this whenever you need to take advantage of more recent byond features
+#define MIN_COMPILER_VERSION 511
+#if DM_VERSION < MIN_COMPILER_VERSION
+//Don't forget to update this part
+#error Your version of BYOND is too out-of-date to compile this project. Go to byond.com/download and update.
+#error You need version 511 or higher
+#endif
+
+//Update this whenever the db schema changes
+//make sure you add an update to the schema_version stable in the db changelog
+#define DB_MAJOR_VERSION 3
+#define DB_MINOR_VERSION 4
+>>>>>>> e8ff73e... Datum antag wizard. (#31449)

code/datums/antagonists/antag_datum.dm

@@ -1,20 +1,21 @@
+GLOBAL_LIST_EMPTY(antagonists)
+
 /datum/antagonist
 	var/name = "Antagonist"
-
 	var/datum/mind/owner						//Mind that owns this datum
-
 	var/silent = FALSE							//Silent will prevent the gain/lose texts to show
-
 	var/can_coexist_with_others = TRUE			//Whether or not the person will be able to have more than one datum
 	var/list/typecache_datum_blacklist = list()	//List of datums this type can't coexist with
-	var/delete_on_death = TRUE
+	var/delete_on_mind_deletion = TRUE
 
 /datum/antagonist/New(datum/mind/new_owner)
+	GLOB.antagonists += src
 	typecache_datum_blacklist = typecacheof(typecache_datum_blacklist)
 	if(new_owner)
 		owner = new_owner
 
 /datum/antagonist/Destroy()
+	GLOB.antagonists -= src
 	if(owner)
 		LAZYREMOVE(owner.antag_datums, src)
 	owner = null

code/datums/antagonists/datum_cult.dm

@@ -131,7 +131,7 @@
 /datum/antagonist/cult/master/on_gain()
 	. = ..()
 	var/mob/living/current = owner.current
-	SSticker.mode.set_antag_hud(current, "cultmaster")
+	set_antag_hud(current, "cultmaster")
 
 /datum/antagonist/cult/master/greet()
 	to_chat(owner.current, "<span class='cultlarge'>You are the cult's Master</span>. As the cult's Master, you have a unique title and loud voice when communicating, are capable of marking \

code/datums/antagonists/devil.dm

@@ -86,7 +86,7 @@ GLOBAL_LIST_INIT(devil_syllable, list("hal", "ve", "odr", "neit", "ci", "quon",
 GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", ", the Lord of all things", ", Jr."))
 /datum/antagonist/devil
 	//Don't delete upon mind destruction, otherwise soul re-selling will break.
-	delete_on_death = FALSE
+	delete_on_mind_deletion = FALSE
 	var/obligation
 	var/ban
 	var/bane

code/datums/antagonists/wizard.dm

@@ -0,0 +1,273 @@
+#define APPRENTICE_DESTRUCTION "destruction"
+#define APPRENTICE_BLUESPACE "bluespace"
+#define APPRENTICE_ROBELESS "robeless"
+#define APPRENTICE_HEALING "healing"
+
+/datum/antagonist/wizard
+	name = "Space Wizard"
+	var/give_objectives = TRUE
+	var/strip = TRUE //strip before equipping
+	var/allow_rename = TRUE
+	var/hud_version = "wizard"
+	var/datum/objective_team/wizard/wiz_team //Only created if wizard summons apprentices
+	var/list/objectives = list() //this should be base datum antag proc and list, todo make lazy
+	var/move_to_lair = TRUE
+	var/outfit_type = /datum/outfit/wizard
+	var/wiz_age = WIZARD_AGE_MIN /* Wizards by nature cannot be too young. */
+
+/datum/antagonist/wizard/on_gain()
+	register()
+	if(give_objectives)
+		create_objectives()
+	equip_wizard()
+	if(move_to_lair)
+		send_to_lair()
+	. = ..()
+	if(allow_rename)
+		rename_wizard()
+
+/datum/antagonist/wizard/proc/register()
+	SSticker.mode.wizards |= owner
+
+/datum/antagonist/wizard/proc/unregister()
+	SSticker.mode.wizards -= src
+
+/datum/objective_team/wizard
+	name = "wizard team"
+
+/datum/antagonist/wizard/proc/create_wiz_team()
+	wiz_team = new(owner)
+	wiz_team.name = "[owner.current.real_name] team"
+	update_wiz_icons_added(owner.current)
+
+/datum/antagonist/wizard/proc/send_to_lair()
+	if(!owner || !owner.current)
+		return
+	if(!GLOB.wizardstart.len)
+		SSjob.SendToLateJoin(owner.current)
+		to_chat(owner, "HOT INSERTION, GO GO GO")
+	owner.current.forceMove(pick(GLOB.wizardstart))
+
+/datum/antagonist/wizard/proc/create_objectives()
+	switch(rand(1,100))
+		if(1 to 30)
+			var/datum/objective/assassinate/kill_objective = new
+			kill_objective.owner = owner
+			kill_objective.find_target()
+			objectives += kill_objective
+
+			if (!(locate(/datum/objective/escape) in owner.objectives))
+				var/datum/objective/escape/escape_objective = new
+				escape_objective.owner = owner
+				objectives += escape_objective
+		
+		if(31 to 60)
+			var/datum/objective/steal/steal_objective = new
+			steal_objective.owner = owner
+			steal_objective.find_target()
+			objectives += steal_objective
+
+			if (!(locate(/datum/objective/escape) in owner.objectives))
+				var/datum/objective/escape/escape_objective = new
+				escape_objective.owner = owner
+				objectives += escape_objective
+
+		if(61 to 85)
+			var/datum/objective/assassinate/kill_objective = new
+			kill_objective.owner = owner
+			kill_objective.find_target()
+			objectives += kill_objective
+
+			var/datum/objective/steal/steal_objective = new
+			steal_objective.owner = owner
+			steal_objective.find_target()
+			objectives += steal_objective
+
+			if (!(locate(/datum/objective/survive) in owner.objectives))
+				var/datum/objective/survive/survive_objective = new
+				survive_objective.owner = owner
+				objectives += survive_objective
+
+		else
+			if (!(locate(/datum/objective/hijack) in owner.objectives))
+				var/datum/objective/hijack/hijack_objective = new
+				hijack_objective.owner = owner
+				objectives += hijack_objective	
+	
+	for(var/datum/objective/O in objectives)
+		owner.objectives += O
+
+/datum/antagonist/wizard/on_removal()
+	unregister()
+	owner.RemoveAllSpells() // TODO keep track which spells are wizard spells which innate stuff
+	return ..()
+
+/datum/antagonist/wizard/proc/equip_wizard()
+	if(!owner)
+		return
+	var/mob/living/carbon/human/H = owner.current
+	if(!istype(H))
+		return
+	if(strip)
+		H.delete_equipment()
+	//Wizards are human by default. Use the mirror if you want something else.
+	H.set_species(/datum/species/human)
+	if(H.age < wiz_age)
+		H.age = wiz_age
+	H.equipOutfit(outfit_type)
+	
+/datum/antagonist/wizard/greet()
+	to_chat(owner, "<span class='boldannounce'>You are the Space Wizard!</span>")
+	to_chat(owner, "<B>The Space Wizards Federation has given you the following tasks:</B>")
+	owner.announce_objectives()
+	to_chat(owner, "You will find a list of available spells in your spell book. Choose your magic arsenal carefully.")
+	to_chat(owner, "The spellbook is bound to you, and others cannot use it.")
+	to_chat(owner, "In your pockets you will find a teleport scroll. Use it as needed.")
+	to_chat(owner,"<B>Remember:</B> do not forget to prepare your spells.")
+
+/datum/antagonist/wizard/farewell()
+	to_chat(owner, "<span class='userdanger'>You have been brainwashed! You are no longer a wizard!</span>")
+
+/datum/antagonist/wizard/proc/rename_wizard()
+	set waitfor = FALSE
+
+	var/wizard_name_first = pick(GLOB.wizard_first)
+	var/wizard_name_second = pick(GLOB.wizard_second)
+	var/randomname = "[wizard_name_first] [wizard_name_second]"
+	var/mob/living/wiz_mob = owner.current
+	var/newname = copytext(sanitize(input(wiz_mob, "You are the [name]. Would you like to change your name to something else?", "Name change", randomname) as null|text),1,MAX_NAME_LEN)
+
+	if (!newname)
+		newname = randomname
+
+	wiz_mob.fully_replace_character_name(wiz_mob.real_name, newname)
+
+/datum/antagonist/wizard/apply_innate_effects(mob/living/mob_override)
+	var/mob/living/M = mob_override || owner.current
+	if(wiz_team) //Don't bother with the icon if you're solo wizard
+		update_wiz_icons_added(M)
+	M.faction |= "wizard"
+
+/datum/antagonist/wizard/remove_innate_effects(mob/living/mob_override)
+	var/mob/living/M = mob_override || owner.current
+	update_wiz_icons_removed(M)
+	M.faction -= "wizard"
+
+/datum/antagonist/wizard/apprentice
+	name = "Wizard Apprentice"
+	hud_version = "apprentice"
+	var/datum/mind/master
+	var/school = APPRENTICE_DESTRUCTION
+	outfit_type = /datum/outfit/wizard/apprentice
+	wiz_age = APPRENTICE_AGE_MIN
+
+/datum/antagonist/wizard/apprentice/greet()
+	to_chat(owner, "<B>You are [master.current.real_name]'s apprentice! You are bound by magic contract to follow their orders and help them in accomplishing their goals.")
+	owner.announce_objectives()
+
+/datum/antagonist/wizard/apprentice/register()
+	SSticker.mode.apprentices |= src
+
+/datum/antagonist/wizard/apprentice/unregister()
+	SSticker.mode.apprentices -= src
+
+/datum/antagonist/wizard/apprentice/equip_wizard()
+	. = ..()
+	if(!owner)
+		return
+	var/mob/living/carbon/human/H = owner.current
+	if(!istype(H))
+		return
+	switch(school)
+		if(APPRENTICE_DESTRUCTION)
+			owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile(null))
+			owner.AddSpell(new /obj/effect/proc_holder/spell/aimed/fireball(null))
+			to_chat(owner, "<B>Your service has not gone unrewarded, however. Studying under [master.current.real_name], you have learned powerful, destructive spells. You are able to cast magic missile and fireball.")
+		if(APPRENTICE_BLUESPACE)
+			owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport(null))
+			owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(null))
+			to_chat(owner, "<B>Your service has not gone unrewarded, however. Studying under [master.current.real_name], you have learned reality bending mobility spells. You are able to cast teleport and ethereal jaunt.")
+		if(APPRENTICE_HEALING)
+			owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/charge(null))
+			owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/forcewall(null))
+			H.put_in_hands(new /obj/item/gun/magic/staff/healing(H))
+			to_chat(owner, "<B>Your service has not gone unrewarded, however. Studying under [master.current.real_name], you have learned livesaving survival spells. You are able to cast charge and forcewall.")
+		if(APPRENTICE_HEALING)
+			owner.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/knock(null))
+			owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/mind_transfer(null))
+			to_chat(owner, "<B>Your service has not gone unrewarded, however. Studying under [master.current.real_name], you have learned stealthy, robeless spells. You are able to cast knock and mindswap.")
+			
+/datum/antagonist/wizard/apprentice/create_objectives()
+	var/datum/objective/protect/new_objective = new /datum/objective/protect
+	new_objective.owner = owner
+	new_objective.target = master
+	new_objective.explanation_text = "Protect [master.current.real_name], the wizard."
+	owner.objectives += new_objective
+	objectives += new_objective
+
+//Random event wizard
+/datum/antagonist/wizard/apprentice/imposter
+	name = "Wizard Imposter"
+	allow_rename = FALSE
+
+/datum/antagonist/wizard/apprentice/imposter/greet()
+	to_chat(owner, "<B>You are an imposter! Trick and confuse the crew to misdirect malice from your handsome original!</B>")
+	owner.announce_objectives()
+
+/datum/antagonist/wizard/apprentice/imposter/equip_wizard()
+	var/mob/living/carbon/human/master_mob = master.current
+	var/mob/living/carbon/human/H = owner.current
+	if(!istype(master_mob) || !istype(H))
+		return
+	if(master_mob.ears)
+		H.equip_to_slot_or_del(new master_mob.ears.type, slot_ears)
+	if(master_mob.w_uniform)
+		H.equip_to_slot_or_del(new master_mob.w_uniform.type, slot_w_uniform)
+	if(master_mob.shoes)
+		H.equip_to_slot_or_del(new master_mob.shoes.type, slot_shoes)
+	if(master_mob.wear_suit)
+		H.equip_to_slot_or_del(new master_mob.wear_suit.type, slot_wear_suit)
+	if(master_mob.head)
+		H.equip_to_slot_or_del(new master_mob.head.type, slot_head)
+	if(master_mob.back)
+		H.equip_to_slot_or_del(new master_mob.back.type, slot_back)
+
+	//Operation: Fuck off and scare people
+	owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport(null))
+	owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/turf_teleport/blink(null))
+	owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(null))
+
+/datum/antagonist/wizard/proc/update_wiz_icons_added(mob/living/wiz)
+	var/datum/atom_hud/antag/wizhud = GLOB.huds[ANTAG_HUD_WIZ]
+	wizhud.join_hud(wiz)
+	set_antag_hud(wiz, hud_version)
+
+/datum/antagonist/wizard/proc/update_wiz_icons_removed(mob/living/wiz)
+	var/datum/atom_hud/antag/wizhud = GLOB.huds[ANTAG_HUD_WIZ]
+	wizhud.leave_hud(wiz)
+	set_antag_hud(wiz, null)
+
+
+/datum/antagonist/wizard/academy
+	name = "Academy Teacher"
+	outfit_type = /datum/outfit/wizard/academy
+
+/datum/antagonist/wizard/academy/equip_wizard()
+	. = ..()
+	
+	owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt)
+	owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile)
+	owner.AddSpell(new /obj/effect/proc_holder/spell/aimed/fireball)
+
+	var/mob/living/M = owner.current
+	if(!istype(M))
+		return
+	
+	var/obj/item/implant/exile/Implant = new/obj/item/implant/exile(M)
+	Implant.implant(M)
+
+/datum/antagonist/wizard/academy/create_objectives()
+	var/datum/objective/new_objective = new("Protect Wizard Academy from the intruders")
+	new_objective.owner = owner
+	owner.objectives += new_objective
+	objectives += new_objective

code/datums/mind.dm

@@ -75,7 +75,7 @@
 	if(islist(antag_datums))
 		for(var/i in antag_datums)
 			var/datum/antagonist/antag_datum = i
-			if(antag_datum.delete_on_death)
+			if(antag_datum.delete_on_mind_deletion)
 				qdel(i)
 		antag_datums = null
 	return ..()
@@ -133,10 +133,16 @@
 	memory = null
 
 // Datum antag mind procs
-/datum/mind/proc/add_antag_datum(datum_type, team)
-	if(!datum_type)
+/datum/mind/proc/add_antag_datum(datum_type_or_instance, team)
+	if(!datum_type_or_instance)
 		return
-	var/datum/antagonist/A = new datum_type(src, team)
+	var/datum/antagonist/A
+	if(!ispath(datum_type_or_instance))
+		A = datum_type_or_instance
+		if(!istype(A))
+			return
+	else
+		A = new datum_type_or_instance(src, team)
 	if(!A.can_be_owned(src))
 		qdel(A)
 		return
@@ -193,12 +199,12 @@
 
 /datum/mind/proc/remove_traitor()
 	if(src in SSticker.mode.traitors)
-		src.remove_antag_datum(ANTAG_DATUM_TRAITOR)
+		remove_antag_datum(ANTAG_DATUM_TRAITOR)
 	SSticker.mode.update_traitor_icons_removed(src)
 
 /datum/mind/proc/remove_brother()
 	if(src in SSticker.mode.brothers)
-		src.remove_antag_datum(ANTAG_DATUM_BROTHER)
+		remove_antag_datum(ANTAG_DATUM_BROTHER)
 	SSticker.mode.update_brother_icons_removed(src)
 
 /datum/mind/proc/remove_nukeop()
@@ -210,11 +216,8 @@
 	remove_antag_equip()
 
 /datum/mind/proc/remove_wizard()
-	if(src in SSticker.mode.wizards)
-		SSticker.mode.wizards -= src
-		RemoveAllSpells()
+	remove_antag_datum(/datum/antagonist/wizard)
 	special_role = null
-	remove_antag_equip()
 
 /datum/mind/proc/remove_cultist()
 	if(src in SSticker.mode.cult)
@@ -254,7 +257,6 @@
 	remove_rev()
 	SSticker.mode.update_changeling_icons_removed(src)
 	SSticker.mode.update_traitor_icons_removed(src)
-	SSticker.mode.update_wiz_icons_removed(src)
 	SSticker.mode.update_cult_icons_removed(src)
 	SSticker.mode.update_rev_icons_removed(src)
 
@@ -526,11 +528,9 @@
 		if (SSticker.mode.config_tag=="wizard")
 			text = uppertext(text)
 		text = "<i><b>[text]</b></i>: "
-		if ((src in SSticker.mode.wizards) || (src in SSticker.mode.apprentices))
+		if (has_antag_datum(/datum/antagonist/wizard))
 			text += "<b>YES</b> | <a href='?src=\ref[src];wizard=clear'>no</a>"
-			text += "<br><a href='?src=\ref[src];wizard=lair'>To lair</a>, <a href='?src=\ref[src];common=undress'>undress</a>, <a href='?src=\ref[src];wizard=dressup'>dress up</a>, <a href='?src=\ref[src];wizard=name'>let choose name</a>."
-			if (objectives.len==0)
-				text += "<br>Objectives are empty! <a href='?src=\ref[src];wizard=autoobjectives'>Randomize!</a>"
+			text += "<br><a href='?src=\ref[src];wizard=lair'>To lair</a>, <a href='?src=\ref[src];common=undress'>undress</a>"
 		else
 			text += "<a href='?src=\ref[src];wizard=wizard'>yes</a> | <b>NO</b>"
 
@@ -1049,27 +1049,15 @@
 		switch(href_list["wizard"])
 			if("clear")
 				remove_wizard()
-				to_chat(current, "<span class='userdanger'>You have been brainwashed! You are no longer a wizard!</span>")
 				log_admin("[key_name(usr)] has de-wizard'ed [current].")
-				SSticker.mode.update_wiz_icons_removed(src)
 			if("wizard")
-				if(!(src in SSticker.mode.wizards))
-					SSticker.mode.wizards += src
+				if(has_antag_datum(/datum/antagonist/wizard))
 					special_role = "Wizard"
-					//SSticker.mode.learn_basic_spells(current)
-					to_chat(current, "<span class='boldannounce'>You are the Space Wizard!</span>")
+					add_antag_datum(/datum/antagonist/wizard)
 					message_admins("[key_name_admin(usr)] has wizard'ed [current].")
 					log_admin("[key_name(usr)] has wizard'ed [current].")
-					SSticker.mode.update_wiz_icons_added(src)
 			if("lair")
 				current.forceMove(pick(GLOB.wizardstart))
-			if("dressup")
-				SSticker.mode.equip_wizard(current)
-			if("name")
-				SSticker.mode.name_wizard(current)
-			if("autoobjectives")
-				SSticker.mode.forge_wizard_objectives(src)
-				to_chat(usr, "<span class='notice'>The objectives for wizard [key] have been generated. You can edit them and anounce manually.</span>")
 
 	else if (href_list["changeling"])
 		switch(href_list["changeling"])
@@ -1440,20 +1428,10 @@
 		SSticker.mode.update_changeling_icons_added(src)
 
 /datum/mind/proc/make_Wizard()
-	if(!(src in SSticker.mode.wizards))
-		SSticker.mode.wizards += src
+	if(!has_antag_datum(/datum/antagonist/wizard))
 		special_role = "Wizard"
 		assigned_role = "Wizard"
-		if(!GLOB.wizardstart.len)
-			SSjob.SendToLateJoin(current)
-			to_chat(current, "HOT INSERTION, GO GO GO")
-		else
-			current.forceMove(pick(GLOB.wizardstart))
-
-		SSticker.mode.equip_wizard(current)
-		SSticker.mode.name_wizard(current)
-		SSticker.mode.forge_wizard_objectives(src)
-		SSticker.mode.greet_wizard(src)
+		add_antag_datum(/datum/antagonist/wizard)
 
 
 /datum/mind/proc/make_Cultist()

code/game/gamemodes/antag_hud.dm

@@ -29,7 +29,7 @@
 
 //GAME_MODE PROCS
 //called to set a mob's antag icon state
-/datum/game_mode/proc/set_antag_hud(mob/M, new_icon_state)
+/proc/set_antag_hud(mob/M, new_icon_state)
 	if(!istype(M))
 		CRASH("set_antag_hud(): [M] ([M.type]) is not a mob!")
 	var/image/holder = M.hud_list[ANTAG_HUD]
@@ -43,7 +43,7 @@
 //these are called by mind.transfer_to()
 /datum/mind/proc/transfer_antag_huds(datum/atom_hud/antag/newhud)
 	leave_all_antag_huds()
-	SSticker.mode.set_antag_hud(current, antag_hud_icon_state)
+	set_antag_hud(current, antag_hud_icon_state)
 	if(newhud)
 		newhud.join_hud(current)
 

code/game/gamemodes/antag_spawner.dm

@@ -29,13 +29,13 @@
 		dat += "<I>Using this contract, you may summon an apprentice to aid you on your mission.</I><BR>"
 		dat += "<I>If you are unable to establish contact with your apprentice, you can feed the contract back to the spellbook to refund your points.</I><BR>"
 		dat += "<B>Which school of magic is your apprentice studying?:</B><BR>"
-		dat += "<A href='byond://?src=\ref[src];school=destruction'>Destruction</A><BR>"
+		dat += "<A href='byond://?src=\ref[src];school=[APPRENTICE_DESTRUCTION]'>Destruction</A><BR>"
 		dat += "<I>Your apprentice is skilled in offensive magic. They know Magic Missile and Fireball.</I><BR>"
-		dat += "<A href='byond://?src=\ref[src];school=bluespace'>Bluespace Manipulation</A><BR>"
+		dat += "<A href='byond://?src=\ref[src];school=[APPRENTICE_BLUESPACE]'>Bluespace Manipulation</A><BR>"
 		dat += "<I>Your apprentice is able to defy physics, melting through solid objects and travelling great distances in the blink of an eye. They know Teleport and Ethereal Jaunt.</I><BR>"
-		dat += "<A href='byond://?src=\ref[src];school=healing'>Healing</A><BR>"
+		dat += "<A href='byond://?src=\ref[src];school=[APPRENTICE_HEALING]'>Healing</A><BR>"
 		dat += "<I>Your apprentice is training to cast spells that will aid your survival. They know Forcewall and Charge and come with a Staff of Healing.</I><BR>"
-		dat += "<A href='byond://?src=\ref[src];school=robeless'>Robeless</A><BR>"
+		dat += "<A href='byond://?src=\ref[src];school=[APPRENTICE_ROBELESS]'>Robeless</A><BR>"
 		dat += "<I>Your apprentice is training to cast spells without their robes. They know Knock and Mindswap.</I><BR>"
 	user << browse(dat, "window=radio")
 	onclose(user, "radio")
@@ -63,73 +63,31 @@
 					return
 				used = 1
 				var/mob/dead/observer/theghost = pick(candidates)
-				spawn_antag(theghost.client, get_turf(src), href_list["school"])
-				if(H && H.mind)
-					SSticker.mode.update_wiz_icons_added(H.mind)
+				spawn_antag(theghost.client, get_turf(src), href_list["school"],H.mind)
 			else
 				to_chat(H, "Unable to reach your apprentice! You can either attack the spellbook with the contract to refund your points, or wait and try again later.")
 
-/obj/item/antag_spawner/contract/spawn_antag(client/C, turf/T, type = "")
+/obj/item/antag_spawner/contract/spawn_antag(client/C, turf/T, school,datum/mind/wizard)
 	new /obj/effect/particle_effect/smoke(T)
 	var/mob/living/carbon/human/M = new/mob/living/carbon/human(T)
 	C.prefs.copy_to(M)
 	M.key = C.key
-	var/wizard_name = "the wizard"
-	if(usr)
-		wizard_name = usr.real_name
-	to_chat(M, "<B>You are [wizard_name]'s apprentice! You are bound by magic contract to follow their orders and help them in accomplishing their goals.")
-	switch(type)
-		if("destruction")
-			M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile(null))
-			M.mind.AddSpell(new /obj/effect/proc_holder/spell/aimed/fireball(null))
-			to_chat(M, "<B>Your service has not gone unrewarded, however. Studying under [wizard_name], you have learned powerful, destructive spells. You are able to cast magic missile and fireball.")
-		if("bluespace")
-			M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport(null))
-			M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(null))
-			to_chat(M, "<B>Your service has not gone unrewarded, however. Studying under [wizard_name], you have learned reality bending mobility spells. You are able to cast teleport and ethereal jaunt.")
-		if("healing")
-			M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/charge(null))
-			M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/forcewall(null))
-			M.put_in_hands(new /obj/item/gun/magic/staff/healing(M), TRUE)
-			to_chat(M, "<B>Your service has not gone unrewarded, however. Studying under [wizard_name], you have learned livesaving survival spells. You are able to cast charge and forcewall.")
-		if("robeless")
-			M.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/knock(null))
-			M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mind_transfer(null))
-			to_chat(M, "<B>Your service has not gone unrewarded, however. Studying under [wizard_name], you have learned stealthy, robeless spells. You are able to cast knock and mindswap.")
-
-	equip_antag(M)
-	var/wizard_name_first = pick(GLOB.wizard_first)
-	var/wizard_name_second = pick(GLOB.wizard_second)
-	var/randomname = "[wizard_name_first] [wizard_name_second]"
-	if(usr)
-		var/datum/objective/protect/new_objective = new /datum/objective/protect
-		new_objective.owner = M.mind
-		new_objective.target = usr.mind
-		new_objective.explanation_text = "Protect [usr.real_name], the wizard."
-		M.mind.objectives += new_objective
-	SSticker.mode.apprentices += M.mind
-	M.mind.assigned_role = "Apprentice"
-	M.mind.special_role = "apprentice"
-	SSticker.mode.update_wiz_icons_added(M.mind)
+	var/datum/mind/app_mind = M.mind
+	var/datum/antagonist/wizard/master_antag = wizard.has_antag_datum(/datum/antagonist/wizard)
+	if(!master_antag.wiz_team)
+		master_antag.create_wiz_team()
+	var/datum/antagonist/wizard/apprentice/app = new(app_mind)
+	app.wiz_team = master_antag.wiz_team
+	app.master = wizard
+	app.school = school
+	master_antag.wiz_team.members += app_mind
+	app_mind.add_antag_datum(app)
+	//TODO Kill these if possible
+	app_mind.assigned_role = "Apprentice"
+	app_mind.special_role = "apprentice"
+	//
 	SEND_SOUND(M, sound('sound/effects/magic.ogg'))
-	var/newname = copytext(sanitize(input(M, "You are [wizard_name]'s apprentice. Would you like to change your name to something else?", "Name change", randomname) as null|text),1,MAX_NAME_LEN)
-	if (!newname)
-		newname = randomname
-	M.mind.name = newname
-	M.real_name = newname
-	M.name = newname
-	M.age = rand(AGE_MIN, WIZARD_AGE_MIN - 1)
-	M.dna.update_dna_identity()
 
-/obj/item/antag_spawner/contract/equip_antag(mob/target)
-	target.equip_to_slot_or_del(new /obj/item/device/radio/headset(target), slot_ears)
-	target.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(target), slot_w_uniform)
-	target.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/magic(target), slot_shoes)
-	target.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(target), slot_wear_suit)
-	target.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(target), slot_head)
-	target.equip_to_slot_or_del(new /obj/item/storage/backpack(target), slot_back)
-	target.equip_to_slot_or_del(new /obj/item/storage/box(target), slot_in_backpack)
-	target.equip_to_slot_or_del(new /obj/item/teleportation_scroll/apprentice(target), slot_r_store)
 ///////////BORGS AND OPERATIVES
 
 

code/game/gamemodes/wizard/spellbook.dm

@@ -737,7 +737,7 @@
 	for(var/obj/effect/proc_holder/spell/knownspell in user.mind.spell_list)
 		if(knownspell.type == S.type)
 			if(user.mind)
-				if(user.mind.special_role == "apprentice" || user.mind.special_role == "Wizard")
+				if(iswizard(user))
 					to_chat(user,"<span class='notice'>You're already far more versed in this spell than this flimsy how-to book can provide.</span>")
 				else
 					to_chat(user,"<span class='notice'>You've already read this one.</span>")

code/game/gamemodes/wizard/wizard.dm

@@ -16,160 +16,34 @@
 	announce_text = "There is a space wizard attacking the station!\n\
 	<span class='danger'>Wizard</span>: Accomplish your objectives and cause mayhem on the station.\n\
 	<span class='notice'>Crew</span>: Eliminate the wizard before they can succeed!"
-	var/use_huds = 0
 	var/finished = 0
 
 /datum/game_mode/wizard/pre_setup()
-
 	var/datum/mind/wizard = pick(antag_candidates)
 	wizards += wizard
 	modePlayer += wizard
 	wizard.assigned_role = "Wizard"
 	wizard.special_role = "Wizard"
+	log_game("[wizard.key] (ckey) has been selected as a Wizard") //TODO: Move these to base antag datum
 	if(GLOB.wizardstart.len == 0)
 		to_chat(wizard.current, "<span class='boldannounce'>A starting location for you could not be found, please report this bug!</span>")
 		return 0
 	for(var/datum/mind/wiz in wizards)
 		wiz.current.forceMove(pick(GLOB.wizardstart))
-
 	return 1
 
 
 /datum/game_mode/wizard/post_setup()
 	for(var/datum/mind/wizard in wizards)
-		log_game("[wizard.key] (ckey) has been selected as a Wizard")
-		equip_wizard(wizard.current)
-		forge_wizard_objectives(wizard)
-		if(use_huds)
-			update_wiz_icons_added(wizard)
-		greet_wizard(wizard)
-		name_wizard(wizard.current)
-	..()
-	return
+		wizard.add_antag_datum(/datum/antagonist/wizard)
+	return ..()
 
 /datum/game_mode/wizard/generate_report()
 	return "A dangerous Wizards' Federation individual by the name of [pick(GLOB.wizard_first)] [pick(GLOB.wizard_second)] has recently escaped confinement from an unlisted prison facility. This \
 		man is a dangerous mutant with the ability to alter himself and the world around him by what he and his leaders believe to be magic. If this man attempts an attack on your station, \
 		his execution is highly encouraged, as is the preservation of his body for later study."
 
-/datum/game_mode/proc/forge_wizard_objectives(datum/mind/wizard)
-	switch(rand(1,100))
-		if(1 to 30)
-
-			var/datum/objective/assassinate/kill_objective = new
-			kill_objective.owner = wizard
-			kill_objective.find_target()
-			wizard.objectives += kill_objective
-
-			if (!(locate(/datum/objective/escape) in wizard.objectives))
-				var/datum/objective/escape/escape_objective = new
-				escape_objective.owner = wizard
-				wizard.objectives += escape_objective
-		if(31 to 60)
-			var/datum/objective/steal/steal_objective = new
-			steal_objective.owner = wizard
-			steal_objective.find_target()
-			wizard.objectives += steal_objective
-
-			if (!(locate(/datum/objective/escape) in wizard.objectives))
-				var/datum/objective/escape/escape_objective = new
-				escape_objective.owner = wizard
-				wizard.objectives += escape_objective
-
-		if(61 to 85)
-			var/datum/objective/assassinate/kill_objective = new
-			kill_objective.owner = wizard
-			kill_objective.find_target()
-			wizard.objectives += kill_objective
-
-			var/datum/objective/steal/steal_objective = new
-			steal_objective.owner = wizard
-			steal_objective.find_target()
-			wizard.objectives += steal_objective
-
-			if (!(locate(/datum/objective/survive) in wizard.objectives))
-				var/datum/objective/survive/survive_objective = new
-				survive_objective.owner = wizard
-				wizard.objectives += survive_objective
-
-		else
-			if (!(locate(/datum/objective/hijack) in wizard.objectives))
-				var/datum/objective/hijack/hijack_objective = new
-				hijack_objective.owner = wizard
-				wizard.objectives += hijack_objective
-	return
-
-
-/datum/game_mode/proc/name_wizard(mob/living/carbon/human/wizard_mob)
-	//Allows the wizard to choose a custom name or go with a random one. Spawn 0 so it does not lag the round starting.
-	var/wizard_name_first = pick(GLOB.wizard_first)
-	var/wizard_name_second = pick(GLOB.wizard_second)
-	var/randomname = "[wizard_name_first] [wizard_name_second]"
-	spawn(0)
-		var/newname = copytext(sanitize(input(wizard_mob, "You are the Space Wizard. Would you like to change your name to something else?", "Name change", randomname) as null|text),1,MAX_NAME_LEN)
-
-		if (!newname)
-			newname = randomname
-
-		wizard_mob.fully_replace_character_name(wizard_mob.real_name, newname)
-
-		/* Wizards by nature cannot be too young. */
-		if(wizard_mob.age < WIZARD_AGE_MIN)
-			wizard_mob.age = WIZARD_AGE_MIN
-	return
-
-
-/datum/game_mode/proc/greet_wizard(datum/mind/wizard, you_are=1)
-	if (you_are)
-		to_chat(wizard.current, "<span class='boldannounce'>You are the Space Wizard!</span>")
-	to_chat(wizard.current, "<B>The Space Wizards Federation has given you the following tasks:</B>")
-
-	wizard.announce_objectives()
-	return
-
-
-/datum/game_mode/proc/learn_basic_spells(mob/living/carbon/human/wizard_mob)
-	if(!istype(wizard_mob) || !wizard_mob.mind)
-		return 0
-	wizard_mob.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile(null)) //Wizards get Magic Missile and Ethereal Jaunt by default
-	wizard_mob.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(null))
-
-
-/datum/game_mode/proc/equip_wizard(mob/living/carbon/human/wizard_mob)
-	if (!istype(wizard_mob))
-		return
-
-	//So zards properly get their items when they are admin-made.
-	qdel(wizard_mob.wear_suit)
-	qdel(wizard_mob.head)
-	qdel(wizard_mob.shoes)
-	for(var/obj/item/I in wizard_mob.held_items)
-		qdel(I)
-	qdel(wizard_mob.r_store)
-	qdel(wizard_mob.l_store)
-
-	wizard_mob.set_species(/datum/species/human)
-	wizard_mob.equip_to_slot_or_del(new /obj/item/device/radio/headset(wizard_mob), slot_ears)
-	wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(wizard_mob), slot_w_uniform)
-	wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/magic(wizard_mob), slot_shoes)
-	wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(wizard_mob), slot_wear_suit)
-	wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(wizard_mob), slot_head)
-	wizard_mob.equip_to_slot_or_del(new /obj/item/storage/backpack(wizard_mob), slot_back)
-	wizard_mob.equip_to_slot_or_del(new /obj/item/storage/box/survival(wizard_mob), slot_in_backpack)
-	wizard_mob.equip_to_slot_or_del(new /obj/item/teleportation_scroll(wizard_mob), slot_r_store)
-	var/obj/item/spellbook/spellbook = new /obj/item/spellbook(wizard_mob)
-	spellbook.owner = wizard_mob
-	wizard_mob.put_in_hands(spellbook, TRUE)
-
-	to_chat(wizard_mob, "You will find a list of available spells in your spell book. Choose your magic arsenal carefully.")
-	to_chat(wizard_mob, "The spellbook is bound to you, and others cannot use it.")
-	to_chat(wizard_mob, "In your pockets you will find a teleport scroll. Use it as needed.")
-	wizard_mob.mind.store_memory("<B>Remember:</B> do not forget to prepare your spells.")
-	return 1
-
-
 /datum/game_mode/wizard/check_finished()
-
 	for(var/datum/mind/wizard in wizards)
 		if(isliving(wizard.current) && wizard.current.stat!=DEAD)
 			return ..()
@@ -186,7 +60,6 @@
 		to_chat(world, "<span class='userdanger'>The wizard[(wizards.len>1)?"s":""] has been killed by the crew! The Space Wizards Federation has been taught a lesson they will not soon forget!</span>")
 
 		SSticker.news_report = WIZARD_KILLED
-
 	..()
 	return 1
 
@@ -247,20 +120,6 @@
 
 		to_chat(world, text)
 	return 1
-
-//OTHER PROCS
-
 //returns whether the mob is a wizard (or apprentice)
 /proc/iswizard(mob/living/M)
-	return istype(M) && M.mind && SSticker && SSticker.mode && ((M.mind in SSticker.mode.wizards) || (M.mind in SSticker.mode.apprentices))
-
-
-/datum/game_mode/proc/update_wiz_icons_added(datum/mind/wiz_mind)
-	var/datum/atom_hud/antag/wizhud = GLOB.huds[ANTAG_HUD_WIZ]
-	wizhud.join_hud(wiz_mind.current)
-	set_antag_hud(wiz_mind.current, ((wiz_mind in wizards) ? "wizard" : "apprentice"))
-
-/datum/game_mode/proc/update_wiz_icons_removed(datum/mind/wiz_mind)
-	var/datum/atom_hud/antag/wizhud = GLOB.huds[ANTAG_HUD_WIZ]
-	wizhud.leave_hud(wiz_mind.current)
-	set_antag_hud(wiz_mind.current, null)
+	return M.mind && M.mind.has_antag_datum(/datum/antagonist/wizard,TRUE)

code/modules/admin/verbs/randomverbs.dm

@@ -382,7 +382,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	switch(new_character.mind.special_role)
 		if("Wizard")
 			new_character.forceMove(pick(GLOB.wizardstart))
-			SSticker.mode.equip_wizard(new_character)
+			var/datum/antagonist/wizard/A = new_character.mind.has_antag_datum(/datum/antagonist/wizard,TRUE)
+			A.equip_wizard()
 		if("Syndicate")
 			new_character.forceMove(pick(GLOB.nukeop_start))
 			call(/datum/game_mode/proc/equip_syndicate)(new_character)

code/modules/awaymissions/mission_code/Academy.dm

@@ -108,27 +108,12 @@
 
 /obj/structure/academy_wizard_spawner/proc/summon_wizard()
 	var/turf/T = src.loc
-
 	var/mob/living/carbon/human/wizbody = new(T)
-	wizbody.equipOutfit(/datum/outfit/wizard/academy)
-	var/obj/item/implant/exile/Implant = new/obj/item/implant/exile(wizbody)
-	Implant.implant(wizbody)
-	wizbody.faction |= "wizard"
-	wizbody.real_name = "Academy Teacher"
-	wizbody.name = "Academy Teacher"
-
-	var/datum/mind/wizmind = new /datum/mind()
-	wizmind.name = "Wizard Defender"
+	wizbody.fully_replace_character_name("Academy Teacher")
+	wizbody.mind_initialize()
+	var/datum/mind/wizmind = wizbody.mind
 	wizmind.special_role = "Academy Defender"
-	var/datum/objective/O = new("Protect Wizard Academy from the intruders")
-	wizmind.objectives += O
-	wizmind.transfer_to(wizbody)
-	SSticker.mode.wizards |= wizmind
-
-	wizmind.AddSpell(new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt)
-	wizmind.AddSpell(new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile)
-	wizmind.AddSpell(new /obj/effect/proc_holder/spell/aimed/fireball)
-
+	wizmind.add_antag_datum(/datum/antagonist/wizard/academy)
 	current_wizard = wizbody
 
 	give_control()

code/modules/clothing/outfits/standard.dm

@@ -265,6 +265,20 @@
 	back = /obj/item/storage/backpack
 	backpack_contents = list(/obj/item/storage/box=1)
 
+/datum/outfit/wizard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+	if(visualsOnly)
+		return
+
+	var/obj/item/spellbook/S = locate() in H.held_items
+	if(S)
+		S.owner = H
+
+/datum/outfit/wizard/apprentice
+	name = "Wizard Apprentice"
+	r_hand = null
+	l_hand = null
+	r_pocket = /obj/item/teleportation_scroll/apprentice
+
 /datum/outfit/wizard/red
 	name = "Red Wizard"
 

code/modules/events/wizard/curseditems.dm

@@ -40,7 +40,7 @@
 	for(var/mob/living/carbon/human/H in GLOB.living_mob_list)
 		if(ruins_spaceworthiness && !(H.z in GLOB.station_z_levels) || isspaceturf(H.loc) || isplasmaman(H))
 			continue	//#savetheminers
-		if(ruins_wizard_loadout && H.mind && ((H.mind in SSticker.mode.wizards) || (H.mind in SSticker.mode.apprentices)))
+		if(ruins_wizard_loadout && iswizard(H))
 			continue
 		if(item_set == "catgirls2015") //Wizard code means never having to say you're sorry
 			H.gender = FEMALE

code/modules/events/wizard/imposter.dm

@@ -24,35 +24,18 @@
 		I.name = I.dna.real_name
 		I.updateappearance(mutcolor_update=1)
 		I.domutcheck()
-		if(W.ears)
-			I.equip_to_slot_or_del(new W.ears.type, slot_ears)
-		if(W.w_uniform)
-			I.equip_to_slot_or_del(new W.w_uniform.type	, slot_w_uniform)
-		if(W.shoes)
-			I.equip_to_slot_or_del(new W.shoes.type, slot_shoes)
-		if(W.wear_suit)
-			I.equip_to_slot_or_del(new W.wear_suit.type, slot_wear_suit)
-		if(W.head)
-			I.equip_to_slot_or_del(new W.head.type, slot_head)
-		if(W.back)
-			I.equip_to_slot_or_del(new W.back.type, slot_back)
 		I.key = C.key
-
-		//Operation: Fuck off and scare people
-		I.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport(null))
-		I.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/turf_teleport/blink(null))
-		I.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(null))
-
+		var/datum/antagonist/wizard/master = M.has_antag_datum(/datum/antagonist/wizard)
+		if(!master.wiz_team)
+			master.create_wiz_team()
+		var/datum/antagonist/wizard/apprentice/imposter = new(I.mind)
+		imposter.master = M
+		imposter.wiz_team = master.wiz_team
+		master.wiz_team += imposter
+		I.mind.add_antag_datum(imposter)
+		//Remove if possible
 		SSticker.mode.apprentices += I.mind
 		I.mind.special_role = "imposter"
-
-		var/datum/objective/protect/protect_objective = new /datum/objective/protect
-		protect_objective.owner = I.mind
-		protect_objective.target = W.mind
-		protect_objective.explanation_text = "Protect [W.real_name], the wizard."
-		I.mind.objectives += protect_objective
-		SSticker.mode.update_wiz_icons_added(I.mind)
-
-		I.log_message("<font color='red'>Is an imposter!</font>", INDIVIDUAL_ATTACK_LOG)
-		to_chat(I, "<B>You are an imposter! Trick and confuse the crew to misdirect malice from your handsome original!</B>")
+		//
+		I.log_message("<font color='red'>Is an imposter!</font>", INDIVIDUAL_ATTACK_LOG) //?
 		SEND_SOUND(I, sound('sound/effects/magic.ogg'))

code/modules/events/wizard/shuffle.dm

@@ -82,7 +82,7 @@
 	var/list/mobs	 = list()
 
 	for(var/mob/living/carbon/human/H in GLOB.living_mob_list)
-		if(H.stat || !H.mind || (H.mind in SSticker.mode.wizards) || (H.mind in SSticker.mode.apprentices))
+		if(H.stat || !H.mind || iswizard(H))
 			continue //the wizard(s) are spared on this one
 		mobs += H
 

code/modules/mob/mob_helpers.dm

@@ -363,7 +363,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 				if(M.mind in SSticker.mode.changelings)
 					return 2
 			if("wizard")
-				if(M.mind in SSticker.mode.wizards)
+				if(iswizard(M))
 					return 2
 			if("apprentice")
 				if(M.mind in SSticker.mode.apprentices)

code/modules/spells/spell_types/rightandwrong.dm

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 //In this file: Summon Magic/Summon Guns/Summon Events
 
 /proc/rightandwrong(summon_type, mob/user, survivor_probability) //0 = Summon Guns, 1 = Summon Magic
@@ -217,3 +218,226 @@
 		SSevents.reschedule()
 		message_admins("Summon Events intensifies, events will now occur every [SSevents.frequency_lower / 600] to [SSevents.frequency_upper / 600] minutes.")
 		log_game("Summon Events was increased!")
+=======
+//In this file: Summon Magic/Summon Guns/Summon Events
+
+/proc/rightandwrong(summon_type, mob/user, survivor_probability) //0 = Summon Guns, 1 = Summon Magic
+	var/list/gunslist 			= list("taser","gravgun","egun","laser","revolver","detective","c20r","nuclear","deagle","gyrojet","pulse","suppressed","cannon","doublebarrel","shotgun","combatshotgun","bulldog","mateba","sabr","crossbow","saw","car","boltaction","speargun","arg","uzi","alienpistol","dragnet","turret","pulsecarbine","decloner","mindflayer","hyperkinetic","advplasmacutter","wormhole","wt550","bulldog","grenadelauncher","goldenrevolver","sniper","medibeam","scatterbeam")
+	var/list/magiclist 			= list("fireball","smoke","blind","mindswap","forcewall","knock","horsemask","charge", "summonitem", "wandnothing", "wanddeath", "wandresurrection", "wandpolymorph", "wandteleport", "wanddoor", "wandfireball", "staffchange", "staffhealing", "armor", "scrying","staffdoor","voodoo", "whistle", "battlemage", "immortality", "ghostsword", "special")
+	var/list/magicspeciallist	= list("staffchange","staffanimation", "wandbelt", "contract", "staffchaos", "necromantic", "bloodcontract")
+
+	if(user) //in this case either someone holding a spellbook or a badmin
+		to_chat(user, "<B>You summoned [summon_type ? "magic" : "guns"]!</B>")
+		message_admins("[key_name_admin(user, 1)] summoned [summon_type ? "magic" : "guns"]!")
+		log_game("[key_name(user)] summoned [summon_type ? "magic" : "guns"]!")
+	for(var/mob/living/carbon/human/H in GLOB.player_list)
+		if(H.stat == DEAD || !(H.client))
+			continue
+		if(H.mind)
+			if(iswizard(H) || H.mind.special_role == "survivalist")
+				continue
+		if(prob(survivor_probability) && !(H.mind in SSticker.mode.traitors))
+			SSticker.mode.traitors += H.mind
+			if(!summon_type)
+				var/datum/objective/steal_five_of_type/summon_guns/guns = new
+				guns.owner = H.mind
+				H.mind.objectives += guns
+				H.mind.special_role = "survivalist"
+				to_chat(H, "<B>You are the survivalist! Your own safety matters above all else, and the only way to ensure your safety is to stockpile weapons! Grab as many guns as possible, by any means necessary. Kill anyone who gets in your way.</B>")
+			else
+				var/datum/objective/steal_five_of_type/summon_magic/magic = new
+				magic.owner = H.mind
+				H.mind.objectives += magic
+				H.mind.special_role = "amateur magician"
+				to_chat(H, "<B>You are the amateur magician! Grow your newfound talent! Grab as many magical artefacts as possible, by any means necessary. Kill anyone who gets in your way.</B>")
+			var/datum/objective/survive/survive = new
+			survive.owner = H.mind
+			H.mind.objectives += survive
+			H.log_message("<font color='red'>Was made into a survivalist, and trusts no one!</font>", INDIVIDUAL_ATTACK_LOG)
+			H.mind.announce_objectives()
+		var/randomizeguns 			= pick(gunslist)
+		var/randomizemagic 			= pick(magiclist)
+		var/randomizemagicspecial 	= pick(magicspeciallist)
+		if(!summon_type)
+			var/obj/item/gun/G
+			switch (randomizeguns)
+				if("taser")
+					G = new /obj/item/gun/energy/e_gun/advtaser(get_turf(H))
+				if("egun")
+					G = new /obj/item/gun/energy/e_gun(get_turf(H))
+				if("laser")
+					G = new /obj/item/gun/energy/laser(get_turf(H))
+				if("revolver")
+					G = new /obj/item/gun/ballistic/revolver(get_turf(H))
+				if("detective")
+					G = new /obj/item/gun/ballistic/revolver/detective(get_turf(H))
+				if("deagle")
+					G = new /obj/item/gun/ballistic/automatic/pistol/deagle/camo(get_turf(H))
+				if("gyrojet")
+					G = new /obj/item/gun/ballistic/automatic/gyropistol(get_turf(H))
+				if("pulse")
+					G = new /obj/item/gun/energy/pulse(get_turf(H))
+				if("suppressed")
+					G = new /obj/item/gun/ballistic/automatic/pistol(get_turf(H))
+					new /obj/item/suppressor(get_turf(H))
+				if("doublebarrel")
+					G = new /obj/item/gun/ballistic/revolver/doublebarrel(get_turf(H))
+				if("shotgun")
+					G = new /obj/item/gun/ballistic/shotgun(get_turf(H))
+				if("combatshotgun")
+					G = new /obj/item/gun/ballistic/shotgun/automatic/combat(get_turf(H))
+				if("arg")
+					G = new /obj/item/gun/ballistic/automatic/ar(get_turf(H))
+				if("mateba")
+					G = new /obj/item/gun/ballistic/revolver/mateba(get_turf(H))
+				if("boltaction")
+					G = new /obj/item/gun/ballistic/shotgun/boltaction(get_turf(H))
+				if("speargun")
+					G = new /obj/item/gun/ballistic/automatic/speargun(get_turf(H))
+				if("uzi")
+					G = new /obj/item/gun/ballistic/automatic/mini_uzi(get_turf(H))
+				if("cannon")
+					G = new /obj/item/gun/energy/lasercannon(get_turf(H))
+				if("crossbow")
+					G = new /obj/item/gun/energy/kinetic_accelerator/crossbow/large(get_turf(H))
+				if("nuclear")
+					G = new /obj/item/gun/energy/e_gun/nuclear(get_turf(H))
+				if("sabr")
+					G = new /obj/item/gun/ballistic/automatic/proto(get_turf(H))
+				if("bulldog")
+					G = new /obj/item/gun/ballistic/automatic/shotgun/bulldog(get_turf(H))
+				if("c20r")
+					G = new /obj/item/gun/ballistic/automatic/c20r(get_turf(H))
+				if("saw")
+					G = new /obj/item/gun/ballistic/automatic/l6_saw(get_turf(H))
+				if("car")
+					G = new /obj/item/gun/ballistic/automatic/m90(get_turf(H))
+				if("alienpistol")
+					G = new /obj/item/gun/energy/alien(get_turf(H))
+				if("dragnet")
+					G = new /obj/item/gun/energy/e_gun/dragnet(get_turf(H))
+				if("turret")
+					G = new /obj/item/gun/energy/e_gun/turret(get_turf(H))
+				if("pulsecarbine")
+					G = new /obj/item/gun/energy/pulse/carbine(get_turf(H))
+				if("decloner")
+					G = new /obj/item/gun/energy/decloner(get_turf(H))
+				if("mindflayer")
+					G = new /obj/item/gun/energy/mindflayer(get_turf(H))
+				if("hyperkinetic")
+					G = new /obj/item/gun/energy/kinetic_accelerator(get_turf(H))
+				if("advplasmacutter")
+					G = new /obj/item/gun/energy/plasmacutter/adv(get_turf(H))
+				if("wormhole")
+					G = new /obj/item/gun/energy/wormhole_projector(get_turf(H))
+				if("wt550")
+					G = new /obj/item/gun/ballistic/automatic/wt550(get_turf(H))
+				if("bulldog")
+					G = new /obj/item/gun/ballistic/automatic/shotgun(get_turf(H))
+				if("grenadelauncher")
+					G = new /obj/item/gun/ballistic/revolver/grenadelauncher(get_turf(H))
+				if("goldenrevolver")
+					G = new /obj/item/gun/ballistic/revolver/golden(get_turf(H))
+				if("sniper")
+					G = new /obj/item/gun/ballistic/automatic/sniper_rifle(get_turf(H))
+				if("medibeam")
+					G = new /obj/item/gun/medbeam(get_turf(H))
+				if("scatterbeam")
+					G = new /obj/item/gun/energy/laser/scatter(get_turf(H))
+				if("gravgun")
+					G = new /obj/item/gun/energy/gravity_gun(get_turf(H))
+			G.unlock()
+			playsound(get_turf(H),'sound/magic/summon_guns.ogg', 50, 1)
+
+		else
+			switch (randomizemagic)
+				if("fireball")
+					new /obj/item/spellbook/oneuse/fireball(get_turf(H))
+				if("smoke")
+					new /obj/item/spellbook/oneuse/smoke(get_turf(H))
+				if("blind")
+					new /obj/item/spellbook/oneuse/blind(get_turf(H))
+				if("mindswap")
+					new /obj/item/spellbook/oneuse/mindswap(get_turf(H))
+				if("forcewall")
+					new /obj/item/spellbook/oneuse/forcewall(get_turf(H))
+				if("knock")
+					new /obj/item/spellbook/oneuse/knock(get_turf(H))
+				if("horsemask")
+					new /obj/item/spellbook/oneuse/barnyard(get_turf(H))
+				if("charge")
+					new /obj/item/spellbook/oneuse/charge(get_turf(H))
+				if("summonitem")
+					new /obj/item/spellbook/oneuse/summonitem(get_turf(H))
+				if("wandnothing")
+					new /obj/item/gun/magic/wand(get_turf(H))
+				if("wanddeath")
+					new /obj/item/gun/magic/wand/death(get_turf(H))
+				if("wandresurrection")
+					new /obj/item/gun/magic/wand/resurrection(get_turf(H))
+				if("wandpolymorph")
+					new /obj/item/gun/magic/wand/polymorph(get_turf(H))
+				if("wandteleport")
+					new /obj/item/gun/magic/wand/teleport(get_turf(H))
+				if("wanddoor")
+					new /obj/item/gun/magic/wand/door(get_turf(H))
+				if("wandfireball")
+					new /obj/item/gun/magic/wand/fireball(get_turf(H))
+				if("staffhealing")
+					new /obj/item/gun/magic/staff/healing(get_turf(H))
+				if("staffdoor")
+					new /obj/item/gun/magic/staff/door(get_turf(H))
+				if("armor")
+					new /obj/item/clothing/suit/space/hardsuit/wizard(get_turf(H))
+				if("scrying")
+					new /obj/item/scrying(get_turf(H))
+					if (!(H.dna.check_mutation(XRAY)))
+						H.dna.add_mutation(XRAY)
+						to_chat(H, "<span class='notice'>The walls suddenly disappear.</span>")
+				if("voodoo")
+					new /obj/item/voodoo(get_turf(H))
+				if("whistle")
+					new /obj/item/warpwhistle(get_turf(H))
+				if("battlemage")
+					new /obj/item/clothing/suit/space/hardsuit/shielded/wizard(get_turf(H))
+				if("immortality")
+					new /obj/item/device/immortality_talisman(get_turf(H))
+				if("ghostsword")
+					new /obj/item/melee/ghost_sword(get_turf(H))
+				if("special")
+					magiclist -= "special" //only one super OP item per summoning max
+					switch (randomizemagicspecial)
+						if("staffchange")
+							new /obj/item/gun/magic/staff/change(get_turf(H))
+						if("staffanimation")
+							new /obj/item/gun/magic/staff/animate(get_turf(H))
+						if("wandbelt")
+							new /obj/item/storage/belt/wands/full(get_turf(H))
+						if("contract")
+							new /obj/item/antag_spawner/contract(get_turf(H))
+						if("staffchaos")
+							new /obj/item/gun/magic/staff/chaos(get_turf(H))
+						if("necromantic")
+							new /obj/item/device/necromantic_stone(get_turf(H))
+						if("bloodcontract")
+							new /obj/item/blood_contract(get_turf(H))
+					to_chat(H, "<span class='notice'>You suddenly feel lucky.</span>")
+			playsound(get_turf(H),'sound/magic/summon_magic.ogg', 50, 1)
+
+
+/proc/summonevents()
+	if(!SSevents.wizardmode)
+		SSevents.frequency_lower = 600									//1 minute lower bound
+		SSevents.frequency_upper = 3000									//5 minutes upper bound
+		SSevents.toggleWizardmode()
+		SSevents.reschedule()
+
+	else 																//Speed it up
+		SSevents.frequency_upper -= 600	//The upper bound falls a minute each time, making the AVERAGE time between events lessen
+		if(SSevents.frequency_upper < SSevents.frequency_lower) //Sanity
+			SSevents.frequency_upper = SSevents.frequency_lower
+
+		SSevents.reschedule()
+		message_admins("Summon Events intensifies, events will now occur every [SSevents.frequency_lower / 600] to [SSevents.frequency_upper / 600] minutes.")
+		log_game("Summon Events was increased!")
+>>>>>>> e8ff73e... Datum antag wizard. (#31449)

tgstation.dme

@@ -300,6 +300,7 @@
 #include "code\datums\antagonists\datum_traitor.dm"
 #include "code\datums\antagonists\devil.dm"
 #include "code\datums\antagonists\ninja.dm"
+#include "code\datums\antagonists\wizard.dm"
 #include "code\datums\components\_component.dm"
 #include "code\datums\components\archaeology.dm"
 #include "code\datums\components\infective.dm"