Merge pull request #549 from Hawk-v3/master

TG UPDATES

code/modules/admin/verbs/randomverbs.dm

@@ -388,7 +388,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 			ticker.mode.equip_traitor(new_character)
 		if("Wizard")
 			new_character.loc = pick(wizardstart)
-			ticker.mode.learn_basic_spells(new_character)
+			//ticker.mode.learn_basic_spells(new_character)
 			ticker.mode.equip_wizard(new_character)
 		if("Syndicate")
 			var/obj/effect/landmark/synd_spawn = locate("landmark*Syndicate-Spawn")

code/modules/chemical/Chemistry-Reagents.dm

@@ -450,7 +450,7 @@ datum
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
 				M.druggy = max(M.druggy, 15)
-				if(isturf(M.loc))
+				if(isturf(M.loc) && !istype(M.loc, /turf/space))
 					if(M.canmove)
 						if(prob(10)) step(M, pick(cardinal))
 				if(prob(7)) M:emote(pick("twitch","drool","moan","giggle"))
@@ -579,7 +579,8 @@ datum
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
-				if(M.canmove) step(M, pick(cardinal))
+				if(M.canmove && istype(M.loc, /turf/space))
+					step(M, pick(cardinal))
 				if(prob(5)) M:emote(pick("twitch","drool","moan"))
 				..()
 				return
@@ -652,7 +653,8 @@ datum
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
-				if(M.canmove) step(M, pick(cardinal))
+				if(M.canmove && istype(M.loc, /turf/space))
+					step(M, pick(cardinal))
 				if(prob(5)) M:emote(pick("twitch","drool","moan"))
 				..()
 				return

code/modules/clothing/suits/robe.dm

@@ -19,6 +19,13 @@
 	desc = "Strange-looking hat-wear, makes you want to cast fireballs."
 	icon_state = "marisa"
 
+/obj/item/clothing/head/wizard/magus
+	name = "Magus Helm"
+	desc = "A mysterious helmet that hums with an unearthly power"
+	icon_state = "magus"
+	item_state = "magus"
+
+
 /obj/item/clothing/suit/wizrobe
 	name = "wizard robe"
 	desc = "A magnificant, gem-lined robe that seems to radiate power."

code/modules/mob/living/carbon/monkey/monkey.dm

@@ -604,6 +604,7 @@
 	if (prob(50))
 		Paralyse(10)
 
+
 /obj/effect/equip_e/monkey/process()
 	if (item)
 		item.add_fingerprint(source)

code/modules/mob/living/say.dm

@@ -257,8 +257,8 @@
 			italics = 1
 		if("changeling")
 			if(src.changeling)
-				for(var/mob/living/carbon/aChangeling in world)
-					if(aChangeling.changeling)
+				for(var/mob/aChangeling in world)
+					if(aChangeling.changeling || istype(aChangeling, /mob/dead/observer))
 						aChangeling << "<i><font color=#800080><b>[gender=="male"?"Mr.":"Mrs."] [changeling.changelingID]:</b> [message]</font></i>"
 				return
 ////SPECIAL HEADSETS START

code/modules/projectiles/guns/energy/special.dm

@@ -24,9 +24,11 @@ obj/item/weapon/gun/energy/staff
 	name = "staff of change"
 	desc = "an artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself"
 	icon = 'gun.dmi'
-	icon_state = "staff"
-	item_state = "staff"
+	icon_state = "staffofchange"
+	item_state = "staffofchange"
 	fire_sound = 'emitter.ogg'
+	flags =  FPRINT | TABLEPASS | CONDUCT | ONBACK
+	w_class = 4.0
 	charge_cost = 200
 	projectile_type = "/obj/item/projectile/change"
 	origin_tech = null