Fixed counter of escaped cultists.

Added kilt, bowler and, specially for Gregory House, the walking stick.
Also changed monocle sprite.

Kilt belongs to Catratcat, other stuff belongs to Farart.

Fixed some runtime errors.

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

code/WorkInProgress/Chemistry-Tools.dm

@@ -1765,8 +1765,7 @@
 	flags = FPRINT | CONDUCT | TABLEPASS | OPENCONTAINER
 
 /obj/item/weapon/reagent_containers/food/drinks/golden_cup/tournament_26_06_2011
-	name = "The Quinn Tei's golden cup"
-	desc = "The graving says: Quinn Tei is the glorious winner of Animus Station Tournament. His gun is loud, his mop is fast, his oxygentank is devastating!"
+	desc = "A golden cup. It will be presented to a winner of tournament 26 june and name of the winner will be graved on it."
 
 //Syringes
 /obj/item/weapon/reagent_containers/syringe/robot

code/defines/obj/clothing/gimmick.dm

@@ -351,3 +351,17 @@
 	color = "luigi"
 */
 
+/obj/item/clothing/under/kilt
+	name = "kilt"
+	desc = "Includes shoes and plaid"
+	icon_state = "kilt"
+	item_state = "kilt"
+	color = "kilt"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|FEET
+
+/obj/item/clothing/head/bowler
+	name = "bowler-hat"
+	desc = "Gentleman, elite aboard!"
+	icon_state = "bowler"
+	item_state = "bowler"
+	flags = FPRINT | TABLEPASS | HEADSPACE

code/defines/obj/weapon.dm

@@ -1363,6 +1363,20 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
 	w_class = 2.0
 	flags = FPRINT | TABLEPASS | NOSHIELD
 
+
+/obj/item/weapon/staff/stick
+	name = "stick"
+	desc = "A great tool to drag someone else's drinks across the bar."
+	icon = 'weapons.dmi'
+	icon_state = "stick"
+	item_state = "stick"
+	force = 3.0
+	throwforce = 5.0
+	throw_speed = 1
+	throw_range = 5
+	w_class = 2.0
+	flags = FPRINT | TABLEPASS | NOSHIELD
+
 /obj/item/weapon/table_parts
 	name = "table parts"
 	desc = "Parts of a table. Poor table."

code/game/gamemodes/cult/cult.dm

@@ -255,10 +255,12 @@ var/list/allwords = list("travel","self","see","hell","blood","join","tech","des
 	return cult_fail //if any objectives aren't met, failure
 
 /datum/game_mode/cult/proc/check_survive()
-	var/area/shuttle = locate(/area/shuttle/escape/centcom)
-	for(var/mob/living/carbon/human/C in shuttle)
-		if(C.stat!=2 && cult.Find(C.mind))
-			acolytes_survived++
+	acolytes_survived = 0
+	for(var/datum/mind/cult_mind in cult)
+		if (cult_mind.current && cult_mind.current.stat!=2)
+			var/area/A = get_area(cult_mind.current )
+			if ( is_type_in_list(A, centcom_areas))
+				acolytes_survived++
 	if(acolytes_survived>=acolytes_needed)
 		return 0
 	else

code/game/gamemodes/wizard/spells.dm

@@ -59,6 +59,8 @@
 			A.layer = 4
 			var/i
 			for(i=0, i<20, i++)
+				if (!istype(M)) //it happens sometimes --rastaf0
+					break
 				var/obj/overlay/B = new /obj/overlay( A.loc )
 				B.icon_state = "magicmd"
 				B.icon = 'wizard.dmi'

code/game/machinery/hydroponics.dm

@@ -866,7 +866,8 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 
 		for(var/datum/reagent/blood/bloodSample in W:reagents.reagent_list)
 			var/mob/living/carbon/human/source = bloodSample.data["donor"] //hacky, since it gets the CURRENT condition of the mob, not how it was when the blood sample was taken
-
+			if (!istype(source))
+				continue
 			//ui = bloodSample.data["blood_dna"] doesn't work for whatever reason
 			ui = source.dna.uni_identity
 			se = source.dna.struc_enzymes

code/game/objects/items/item.dm

@@ -232,29 +232,30 @@
 
 		if(power >= 3)
 			var/mob/living/carbon/metroid/Metroid = M
-			if(istype(Metroid, /mob/living/carbon/metroid/adult))
-				if(prob(5 + round(power/2)))
-					Metroid.Victim = null
-					Metroid.anchored = 0
-					spawn(0)
-						Metroid.canmove = 0
-						step_away(Metroid, user)
-						if(prob(25 + power*2))
-							sleep(2)
+			if (istype(M))
+				if(istype(Metroid, /mob/living/carbon/metroid/adult))
+					if(prob(5 + round(power/2)))
+						Metroid.Victim = null
+						Metroid.anchored = 0
+						spawn(0)
+							Metroid.canmove = 0
 							step_away(Metroid, user)
-						Metroid.canmove = 1
+							if(prob(25 + power*2))
+								sleep(2)
+								step_away(Metroid, user)
+							Metroid.canmove = 1
 
-			else
-				if(prob(10 + power*2))
-					Metroid.Victim = null
-					Metroid.anchored = 0
-					spawn(0)
-						step_away(Metroid, user)
-						Metroid.canmove = 0
-						if(prob(25 + power*4))
-							sleep(2)
+				else
+					if(prob(10 + power*2))
+						Metroid.Victim = null
+						Metroid.anchored = 0
+						spawn(0)
 							step_away(Metroid, user)
-						Metroid.canmove = 1
+							Metroid.canmove = 0
+							if(prob(25 + power*4))
+								sleep(2)
+								step_away(Metroid, user)
+							Metroid.canmove = 1