Fixes conflicts, conflicts.

code/game/gamemodes/wizard/artefact.dm

@@ -46,7 +46,7 @@
 	if(loc == H || (in_range(src, H) && istype(loc, /turf)))
 		H.set_machine(src)
 		if(href_list["school"])
-			if (used)
+			if(used)
 				to_chat(H, "You already used this contract!")
 				return
 			used = 1
@@ -89,7 +89,7 @@
 				var/randomname = "[wizard_name_first] [wizard_name_second]"
 				var/newname = sanitize(copytext(input(M, "You are the wizard's apprentice. Would you like to change your name to something else?", "Name change", randomname) as null|text,1,MAX_NAME_LEN))
 
-				if (!newname)
+				if(!newname)
 					newname = randomname
 				M.mind.name = newname
 				M.real_name = newname
@@ -711,7 +711,7 @@ var/global/list/multiverse = list()
 
 /obj/item/device/necromantic_stone/proc/spawnheresy(mob/living/carbon/human/H as mob)
 	H.set_species("Human")
-	if (H.gender == MALE)
+	if(H.gender == MALE)
 		H.change_gender(FEMALE)
 
 	var/list/anime_hair =list("Odango", "Kusanagi Hair", "Pigtails", "Hime Cut", "Floorlength Braid", "Ombre", "Twincurls", "Twincurls 2")
@@ -867,3 +867,9 @@ var/global/list/multiverse = list()
 		target.IgniteMob()
 		GiveHint(target,1)
 	return ..()
+
+/obj/item/organ/internal/heart/cursed/wizard
+	pump_delay = 60
+	heal_brute = 25
+	heal_burn = 25
+	heal_oxy = 25

code/game/gamemodes/wizard/godhand.dm

@@ -33,7 +33,7 @@
 	qdel(src)
 
 /obj/item/weapon/melee/touch_attack/disintegrate
-	name = "\improper disintegrating touch"
+	name = "disintegrating touch"
 	desc = "This hand of mine glows with an awesome power!"
 	catchphrase = "EI NATH!!"
 	on_use_sound = "sound/magic/Disintegrate.ogg"
@@ -51,7 +51,7 @@
 	..()
 
 /obj/item/weapon/melee/touch_attack/fleshtostone
-	name = "\improper petrifying touch"
+	name = "petrifying touch"
 	desc = "That's the bottom line, because flesh to stone said so!"
 	catchphrase = "STAUN EI!!"
 	on_use_sound = "sound/magic/FleshToStone.ogg"
@@ -78,10 +78,38 @@
 	item_state = "disintegrate"
 
 /obj/item/weapon/melee/touch_attack/fake_disintegrate/afterattack(atom/target, mob/living/carbon/user, proximity)
-	if(!proximity || target == user || !ismob(target) || !iscarbon(user) || user.lying || user.handcuffed) //exploding after touching yourself would be bad
+	if(!proximity || target == user || !ismob(target) || !iscarbon(user) || user.lying || user.handcuffed) //not exploding after touching yourself would be bad
 		return
 	var/datum/effect/system/spark_spread/sparks = new
 	sparks.set_up(4, 0, target.loc) //no idea what the 0 is
 	sparks.start()
 	playsound(target.loc, 'sound/goonstation/effects/gib.ogg', 50, 1)
-	..()
+	..()
+
+/obj/item/weapon/melee/touch_attack/cluwne
+	name = "cluwne touch"
+	desc = "It's time to start clowning around."
+	catchphrase = "NWOLC EGNEVER"
+	on_use_sound = "sound/misc/sadtrombone.ogg"
+	icon_state = "cluwnecurse"
+	item_state = "cluwnecurse"
+
+/obj/item/weapon/melee/touch_attack/cluwne/afterattack(atom/target, mob/living/carbon/user, proximity)
+	if(!proximity || target == user || !ishuman(target) || !iscarbon(user) || user.lying || user.handcuffed) //clowning around after touching yourself would unsurprisingly, be bad
+		return
+
+	if(iswizard(target))
+		to_chat(user, "<span class='warning'>The spell has no effect on [target].</span>")
+		return
+
+	var/datum/effect/system/harmless_smoke_spread/s = new /datum/effect/system/harmless_smoke_spread
+	s.set_up(5, 0, target)
+	s.start()
+
+	var/mob/living/carbon/human/H = target
+	if(H.mind)
+		if(H.mind.assigned_role != "Cluwne")
+			H.makeCluwne()
+		else
+			H.makeAntiCluwne()
+	..()

code/game/gamemodes/wizard/raginmages.dm

@@ -18,7 +18,7 @@
 
 
 /datum/game_mode/wizard/raginmages/greet_wizard(var/datum/mind/wizard, var/you_are=1)
-	if (you_are)
+	if(you_are)
 		to_chat(wizard.current, "<B>\red You are the Space Wizard!</B>")
 	to_chat(wizard.current, "<B>The Space Wizards Federation has given you the following tasks:</B>")
 
@@ -72,7 +72,7 @@
 			continue // Could just be a bad connection, so SSD wiz's shouldn't be gibbed over it, but they're not "alive" either
 		wizards_alive++
 
-	if (wizards_alive)
+	if(wizards_alive)
 		if(!time_checked) time_checked = world.time
 		if(world.time > time_till_chaos && world.time > time_checked + delay_per_mage && (mages_made < wizard_cap))
 			time_checked = world.time

code/game/gamemodes/wizard/rightandwrong.dm

@@ -18,7 +18,7 @@
 		var/randomizemagic = pick(magiclist)
 		var/randomizemagicspecial = pick(magicspeciallist)
 		if(!summon_type)
-			switch (randomizeguns)
+			switch(randomizeguns)
 				if("taser")
 					new /obj/item/weapon/gun/energy/gun/advtaser(get_turf(H))
 				if("egun")
@@ -89,7 +89,7 @@
 				if("medibeam")
 					new /obj/item/weapon/gun/medbeam(get_turf(H))
 		else
-			switch (randomizemagic)
+			switch(randomizemagic)
 				if("fireball")
 					new /obj/item/weapon/spellbook/oneuse/fireball(get_turf(H))
 				if("smoke")
@@ -131,7 +131,7 @@
 					new /obj/item/clothing/head/helmet/space/rig/wizard(get_turf(H))
 				if("scrying")
 					new /obj/item/weapon/scrying(get_turf(H))
-					if (!(XRAY in H.mutations))
+					if(!(XRAY in H.mutations))
 						H.mutations.Add(XRAY)
 						H.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS)
 						H.see_in_dark = 8
@@ -141,7 +141,7 @@
 					new /obj/item/voodoo(get_turf(H))
 				if("special")
 					magiclist -= "special" //only one super OP item per summoning max
-					switch (randomizemagicspecial)
+					switch(randomizemagicspecial)
 						if("staffchange")
 							new /obj/item/weapon/gun/magic/staff/change(get_turf(H))
 						if("staffanimation")

code/game/gamemodes/wizard/soulstone.dm

@@ -45,7 +45,7 @@
 ///////////////////Options for using captured souls///////////////////////////////////////
 
 	attack_self(mob/user)
-		if (!in_range(src, user))
+		if(!in_range(src, user))
 			return
 		user.set_machine(src)
 		var/dat = "<TT><B>Soul Stone</B><BR>"
@@ -63,7 +63,7 @@
 
 	Topic(href, href_list)
 		var/mob/U = usr
-		if (!in_range(src, U)||U.machine!=src)
+		if(!in_range(src, U)||U.machine!=src)
 			U << browse(null, "window=aicard")
 			U.unset_machine()
 			return
@@ -72,12 +72,12 @@
 		U.set_machine(src)
 
 		switch(href_list["choice"])//Now we switch based on choice.
-			if ("Close")
+			if("Close")
 				U << browse(null, "window=aicard")
 				U.unset_machine()
 				return
 
-			if ("Summon")
+			if("Summon")
 				for(var/mob/living/simple_animal/shade/A in src)
 					A.status_flags &= ~GODMODE
 					A.canmove = 1
@@ -110,7 +110,7 @@
 			if(C.imprinted != "empty")
 				to_chat(U, "<span class='danger'>Capture failed!</span>: The soul stone has already been imprinted with [C.imprinted]'s mind!")
 			else
-				if (T.stat == 0)
+				if(T.stat == 0)
 					to_chat(U, "<span class='danger'>Capture failed!</span>: Kill or maim the victim first!")
 				else
 					if(T.client == null)
@@ -136,7 +136,7 @@
 							S.faction |= "\ref[U]"
 							S.name = "Shade of [T.real_name]"
 							S.real_name = "Shade of [T.real_name]"
-							if (T.client)
+							if(T.client)
 								T.client.mob = S
 							S.cancel_camera()
 							C.icon_state = "soulstone2"
@@ -149,7 +149,7 @@
 		if("SHADE")
 			var/mob/living/simple_animal/shade/T = target
 			var/obj/item/device/soulstone/C = src
-			if (T.stat == DEAD)
+			if(T.stat == DEAD)
 				to_chat(U, "<span class='danger'>Capture failed!</span>: The shade has already been banished!")
 			else
 				if(C.contents.len)

code/game/gamemodes/wizard/spellbook.dm

@@ -233,6 +233,11 @@
 	category = "Assistance"
 	cost = 1
 
+/datum/spellbook_entry/cluwne
+	name = "Curse of the Cluwne"
+	spell_type = /obj/effect/proc_holder/spell/targeted/touch/cluwne
+	log_name = "CC"
+
 /datum/spellbook_entry/item
 	name = "Buy Item"
 	refundable = 0
@@ -298,7 +303,7 @@
 
 /datum/spellbook_entry/item/scryingorb/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book)
 	if(..())
-		if (!(XRAY in user.mutations))
+		if(!(XRAY in user.mutations))
 			user.mutations.Add(XRAY)
 			user.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS)
 			user.see_in_dark = 8
@@ -398,6 +403,14 @@
 	item_path = /obj/item/weapon/twohanded/singularityhammer
 	log_name = "SI"
 
+/datum/spellbook_entry/item/cursed_heart
+	name = "Cursed Heart"
+	desc = "A heart that has been revived by dark magicks, the user must concentrate to ensure the heart beats, but every beat heals them. It must beat every 6 seconds."
+	item_path = /obj/item/organ/internal/heart/cursed/wizard
+	log_name = "CH"
+	cost = 1
+	category = "Defensive"
+
 /datum/spellbook_entry/summon
 	name = "Summon Stuff"
 	category = "Rituals"
@@ -857,4 +870,4 @@
 	spell = /obj/effect/proc_holder/spell/targeted/touch/fake_disintegrate
 	spellname = "disintegrate"
 	icon_state ="bookfireball"
-	desc = "This book feels like it will rip stuff apart."
+	desc = "This book feels like it will rip stuff apart."

code/game/gamemodes/wizard/wizard.dm

@@ -79,7 +79,7 @@
 			steal_objective.find_target()
 			wizard.objectives += steal_objective
 
-			if (!(locate(/datum/objective/escape) in wizard.objectives))
+			if(!(locate(/datum/objective/escape) in wizard.objectives))
 				var/datum/objective/escape/escape_objective = new
 				escape_objective.owner = wizard
 				wizard.objectives += escape_objective
@@ -94,7 +94,7 @@
 			steal_objective.find_target()
 			wizard.objectives += steal_objective
 
-			if (!(locate(/datum/objective/survive) in wizard.objectives))
+			if(!(locate(/datum/objective/survive) in wizard.objectives))
 				var/datum/objective/survive/survive_objective = new
 				survive_objective.owner = wizard
 				wizard.objectives += survive_objective
@@ -105,7 +105,7 @@
 			kill_objective.find_target()
 			wizard.objectives += kill_objective
 
-			if (!(locate(/datum/objective/hijack) in wizard.objectives))
+			if(!(locate(/datum/objective/hijack) in wizard.objectives))
 				var/datum/objective/hijack/hijack_objective = new
 				hijack_objective.owner = wizard
 				wizard.objectives += hijack_objective
@@ -116,7 +116,7 @@
 			steal_objective.find_target()
 			wizard.objectives += steal_objective
 
-			if (!(locate(/datum/objective/hijack) in wizard.objectives))
+			if(!(locate(/datum/objective/hijack) in wizard.objectives))
 				var/datum/objective/hijack/hijack_objective = new
 				hijack_objective.owner = wizard
 				wizard.objectives += hijack_objective
@@ -131,7 +131,7 @@
 	spawn(0)
 		var/newname = sanitize(copytext(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)
+		if(!newname)
 			newname = randomname
 
 		wizard_mob.real_name = newname
@@ -142,7 +142,7 @@
 
 
 /datum/game_mode/proc/greet_wizard(var/datum/mind/wizard, var/you_are=1)
-	if (you_are)
+	if(you_are)
 		to_chat(wizard.current, "<B>\red You are the Space Wizard!</B>")
 	to_chat(wizard.current, "<B>The Space Wizards Federation has given you the following tasks:</B>")
 
@@ -154,7 +154,7 @@
 
 
 /*/datum/game_mode/proc/learn_basic_spells(mob/living/carbon/human/wizard_mob)
-	if (!istype(wizard_mob))
+	if(!istype(wizard_mob))
 		return
 	if(!config.feature_object_spell_system)
 		wizard_mob.verbs += /client/proc/jaunt
@@ -164,7 +164,7 @@
 */
 
 /datum/game_mode/proc/equip_wizard(mob/living/carbon/human/wizard_mob)
-	if (!istype(wizard_mob))
+	if(!istype(wizard_mob))
 		return
 
 	//So zards properly get their items when they are admin-made.
@@ -195,6 +195,7 @@
 	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.")
 	wizard_mob.update_icons()
+	wizard_mob.gene_stability += DEFAULT_GENE_STABILITY //magic
 	return 1
 
 
@@ -216,7 +217,7 @@
 				continue
 			traitors_alive++
 
-	if (wizards_alive || traitors_alive || but_wait_theres_more)
+	if(wizards_alive || traitors_alive || but_wait_theres_more)
 		return ..()
 	else
 		finished = 1