-Fixed TK through cameras.

-Fixed rune 4 not counting the cultist in the middle. 
-Expanded the explanation of a cultist objective.
-Moved the "midis" setting to client, so it carries over when you ghost/robot/alien/etc.
-Little extra something for Host level admins.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@374 316c924e-a436-60f5-8080-3fe189b3f50e

code/defines/client.dm

@@ -24,6 +24,8 @@
 	var/warned = 0
 	var/karma = 0
 	var/karma_spent = 0
+	var/ooccolor = "#b82e00" //only used for admins of host level, default is equal to admin default
+	var/midis = 1 //Check if midis should be played for someone -- Urist
 
 	authenticate = 0
 	// comment out the line below when debugging locally to enable the options & messages menu

code/defines/mob/mob.dm

@@ -39,7 +39,6 @@
 	var/poll_answer = 0.0
 	var/sdisabilities = 0
 	var/disabilities = 0
-	var/midis = 1 //Check if midis should be played for someone -- Urist
 	var/atom/movable/pulling = null
 	var/stat = 0.0
 	var/next_move = null

code/defines/procs/gamehelpers.dm

@@ -29,7 +29,7 @@
 		return 1
 	else
 		if (istype(user, /mob/living/carbon))
-			if (user:mutations & 1)
+			if (user:mutations & 1 && get_dist(source, user) <= 7)
 				var/X = source:x
 				var/Y = source:y
 				var/Z = source:z

code/game/gamemodes/cult/cult.dm

@@ -76,7 +76,7 @@
 					else
 						explanation = "Free objective."
 				if("eldergod")
-					explanation = "Summon Nar-Sie via the use of an appropriate rune. It will only work if nine cultists stand on and around it."
+					explanation = "Summon Nar-Sie via the use of the appropriate rune (Hell join self). It will only work if nine cultists stand on and around it."
 			cult_mind.current << "<B>Objective #[obj_count]</B>: [explanation]"
 			cult_mind.memory += "<B>Objective #[obj_count]</B>: [explanation]<BR>"
 		cult_mind.current << "The convert rune is join blood self"
@@ -173,7 +173,7 @@
 					else
 						explanation = "Free objective."
 				if("eldergod")
-					explanation = "Summon Nar-Sie via the use of an appropriate rune. It will only work if nine cultists stand on and around it."
+					explanation = "Summon Nar-Sie via the use of the appropriate rune (Hell join self). It will only work if nine cultists stand on and around it."
 			cult_mind.current << "<B>Objective #[obj_count]</B>: [explanation]"
 			cult_mind.memory += "<B>Objective #[obj_count]</B>: [explanation]<BR>"
 

code/game/magic/cultist/rune4.dm

@@ -1,6 +1,6 @@
 /obj/rune/proc/tearreality()
 	var/cultist_count = 0
-	for(var/mob/M in orange(1,src))
+	for(var/mob/M in range(1,src))
 		if(cultists.Find(M))
 			M.say("Tok-lyr rqa'nap g'lt-ulotf!")
 			cultist_count += 1

code/game/objects/items/robot_parts.dm

@@ -128,7 +128,6 @@
 			var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(src.loc))
 			if (src.brain.owner)
 				O.gender = src.brain.owner.gender
-				O.midis = src.brain.owner.midis
 			//O.start = 1
 			O.invisibility = 0
 			O.name = "Cyborg"

code/game/verbs/ooc.dm

@@ -38,6 +38,8 @@
 //			C << "<span class=\"adminooc\"><span class=\"prefix\">OOC:</span> <span class=\"name\">[src.key]:</span> <span class=\"message\">[msg]</span></span>"
 			if (src.client.holder.rank == "Filthy Xeno")
 				C << "<span class=\"gfartooc\"><span class=\"prefix\">OOC:</span> <span class=\"name\">[src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]:</span> <span class=\"message\">[msg]</span></span>"
+			else if (src.client.holder.rank == "Host")
+				C << "<font color=[src.client.ooccolor]><b><span class=\"prefix\">OOC:</span> <span class=\"name\">[src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]:</span> <span class=\"message\">[msg]</span></b></font>"
 			else
 				C << "<span class=\"adminooc\"><span class=\"prefix\">OOC:</span> <span class=\"name\">[src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]:</span> <span class=\"message\">[msg]</span></span>"
 

code/game/verbs/sound.dm

@@ -2,10 +2,10 @@
 	set category = "Special Verbs"
 	set name = "Toggle Midis"
 
-	if(usr.midis)
-		usr.midis=0
+	if(usr.client.midis)
+		usr.client.midis=0
 		usr << "You will now stop receiving any sounds uploaded by admins."
 	else
-		usr.midis=1
+		usr.client.midis=1
 		usr << "You will now start receiving any sounds uploaded by admins."
 	return

code/modules/admin/admin_verbs.dm

@@ -39,6 +39,7 @@
 			src.verbs += /client/proc/cmd_admin_abominize // -- TLE
 			src.verbs += /client/proc/make_cultist // -- TLE
 			src.verbs += /client/proc/check_words // -- Urist
+			src.verbs += /client/proc/colorooc // -- Urist
 			src.verbs += /client/proc/cmd_admin_monkeyize
 			src.verbs += /client/proc/cmd_admin_robotize
 			src.verbs += /client/proc/cmd_admin_add_freeform_ai_law
@@ -705,6 +706,12 @@
 	log_admin("[key_name(usr)] has used boom boom boom shake the room")
 	message_admins("[key_name_admin(usr)] has used boom boom boom shake the room", 1)
 
+/client/proc/colorooc()
+	set category = "Fun"
+	set name = "OOC Text Color"
+	src.ooccolor = input(src, "Please select your OOC colour.", "OOC colour") as color
+	return
+
 /client/proc/stealth()
 	set category = "Admin"
 	set name = "Stealth Mode"

code/modules/admin/verbs/playsound.dm

@@ -15,7 +15,7 @@
 		log_admin("[key_name(src)] played sound [S]")
 		message_admins("[key_name_admin(src)] played sound [S]", 1)
 		for(var/mob/M in world)
-			if(M.midis)
+			if(M.client.midis)
 				M << uploaded_sound
 	else
 		if(usr.client.canplaysound)
@@ -23,7 +23,7 @@
 			log_admin("[key_name(src)] played sound [S]")
 			message_admins("[key_name_admin(src)] played sound [S]", 1)
 			for(var/mob/M in world)
-				if(M.midis)
+				if(M.client.midis)
 					M << uploaded_sound
 		else
 			usr << "You already used up your jukebox monies this round!"
@@ -43,7 +43,7 @@
 	message_admins("[key_name_admin(usr)] has declared Cuban Pete Time!", 1)
 
 	for(var/mob/M in world)
-		if(M.midis)
+		if(M.client.midis)
 			M << 'cubanpetetime.ogg'
 
 	for(var/mob/living/carbon/human/CP in world)

code/modules/mob/dead/observer/observer.dm

@@ -10,7 +10,6 @@
 		src.loc = get_turf(corpse.loc)
 		src.real_name = corpse.real_name
 		src.name = corpse.real_name
-		src.midis = corpse.midis
 		src.verbs += /mob/dead/observer/proc/reenter_corpse
 
 /mob/proc/ghostize()

code/modules/mob/new_player/preferences.dm

@@ -6,6 +6,7 @@ datum/preferences
 
 	var/be_syndicate
 	var/midis = 1
+	var/ooccolor = "#b82e00"
 	var/be_random_name = 0
 	var/underwear = 1
 
@@ -156,6 +157,9 @@ datum/preferences
 		dat += "<br>"
 		dat += "<b>UI Style:</b> <a href=\"byond://?src=\ref[user];preferences=1;UI=input\"><b>[src.UI == 'screen1.dmi' ? "New" : "Old"]</b></a><br>"
 		dat += "<b>Play admin midis:</b> <a href=\"byond://?src=\ref[user];preferences=1;midis=input\"><b>[src.midis == 1 ? "Yes" : "No"]</b></a><br>"
+		if(user.client.holder.rank == "Host")
+			dat += "<hr><b>OOC</b><br>"
+			dat += "<a href='byond://?src=\ref[user];preferences=1;ooccolor=input'>Change colour</a> <font face=\"fixedsys\" size=\"3\" color=\"[ooccolor]\"><table bgcolor=\"[ooccolor]\"><tr><td>IM</td></tr></table></font>"
 
 		dat += "<hr><b>Occupation Choices</b><br>"
 		if (destructive.Find(src.occupation1))
@@ -482,6 +486,12 @@ datum/preferences
 			if (new_style)
 				src.h_style = new_style
 
+		if (link_tags["ooccolor"])
+			var/ooccolor = input(user, "Please select OOC colour.", "OOC colour") as color
+
+			if(ooccolor)
+				src.ooccolor = ooccolor
+
 		if (link_tags["f_style"])
 			var/new_style = input(user, "Please select facial style", "Character Generation")  as null|anything in list("Watson", "Chaplin", "Selleck", "Full Beard", "Long Beard", "Neckbeard", "Van Dyke", "Elvis", "Abe", "Chinstrap", "Hipster", "Goatee", "Hogan", "Shaved")
 
@@ -585,7 +595,6 @@ datum/preferences
 		character.f_style = f_style
 
 		character.UI = UI
-		character.midis = midis
 
 		switch(h_style)
 			if("Short Hair")
@@ -645,6 +654,10 @@ datum/preferences
 		character.update_face()
 		character.update_body()
 
+		spawn(10)
+			character.client.midis = midis
+			character.client.ooccolor = ooccolor
+
 /*
 
 	if (!M.real_name || M.be_random_name)