Merge pull request #11673 from Arkatos1/Magic-With-Style

Wizard Update - Magic with style

code/modules/antagonists/_common/antag_spawner.dm

@@ -210,6 +210,7 @@
 	var/datum/objective/KillDaCrew = new /datum/objective
 	KillDaCrew.owner = S.mind
 	KillDaCrew.explanation_text = "[objective_verb] everyone else while you're at it."
+	KillDaCrew.completed = TRUE
 	S.mind.objectives += KillDaCrew
 	to_chat(S, "<B>Objective #[1]</B>: [KillDaWiz.explanation_text]")
 	to_chat(S, "<B>Objective #[2]</B>: [KillDaCrew.explanation_text]")
@@ -219,7 +220,8 @@
 	desc = "A magically infused bottle of clown love, distilled from \
 		countless hugging attacks. Used in funny rituals to attract \
 		adorable creatures."
-	color = "#FF69B4" // HOT PINK
+	icon = 'icons/obj/wizard.dmi'
+	icon_state = "vialtickles"
 	veil_msg = "<span class='warning'>You sense an adorable presence \
 		lurking just beyond the veil...</span>"
 	objective_verb = "Hug and tickle"
@@ -278,6 +280,7 @@
 	var/datum/objective/KillDaCrew = new /datum/objective
 	KillDaCrew.owner = M.mind
 	KillDaCrew.explanation_text = "[objective_verb] everyone and everything else while you're at it."
+	KillDaCrew.completed = TRUE
 	M.mind.objectives += KillDaCrew
 	to_chat(M, "<B>Objective #[1]</B>: [KillDaWiz.explanation_text]")
 	to_chat(M, "<B>Objective #[2]</B>: [KillDaCrew.explanation_text]")

code/modules/mob/living/silicon/laws.dm

@@ -70,6 +70,13 @@
 	if(!silent && !isnull(usr))
 		log_and_message_admins("cleared the supplied laws of [src]")
 
+/mob/living/silicon/proc/clear_zeroth_law(var/silent = FALSE)
+	throw_alert("newlaw", /obj/screen/alert/newlaw)
+	laws_sanity_check()
+	laws.clear_zeroth_laws()
+	if(!silent && !isnull(usr))
+		log_and_message_admins("cleared the zeroth law of [src]")
+
 /mob/living/silicon/proc/statelaws(var/datum/ai_laws/laws)
 	var/prefix = ""
 	if(MAIN_CHANNEL == lawchannel)

code/modules/projectiles/projectile/magic.dm

@@ -184,8 +184,10 @@
 		var/randomize = pick("robot", "slime", "xeno", "human", "animal")
 		switch(randomize)
 			if("robot")
+				var/path
 				if(prob(30))
-					new_mob = new /mob/living/silicon/robot/syndicate(M.loc)
+					path = pick(typesof(/mob/living/silicon/robot/syndicate))
+					new_mob = new path(M.loc)
 				else
 					new_mob = new /mob/living/silicon/robot(M.loc)
 				new_mob.gender = M.gender
@@ -193,6 +195,10 @@
 				new_mob.job = "Cyborg"
 				var/mob/living/silicon/robot/Robot = new_mob
 				Robot.mmi = new /obj/item/mmi(new_mob)
+				Robot.lawupdate = FALSE
+				Robot.connected_ai = null
+				Robot.clear_inherent_laws()
+				Robot.clear_zeroth_law()
 				if(ishuman(M))
 					Robot.mmi.transfer_identity(M)	//Does not transfer key/client.
 			if("slime")