diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm
index bac5047f8ac..8d3e29260b4 100644
--- a/code/WorkInProgress/Chemistry-Tools.dm
+++ b/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
diff --git a/code/defines/obj/clothing/gimmick.dm b/code/defines/obj/clothing/gimmick.dm
index d571018dbdb..6ddc1c28db7 100644
--- a/code/defines/obj/clothing/gimmick.dm
+++ b/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
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 5a9d524aadd..f4c75ef8642 100644
--- a/code/defines/obj/weapon.dm
+++ b/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."
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index c5b2fcf28e1..283c50cd742 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/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
diff --git a/code/game/gamemodes/wizard/spells.dm b/code/game/gamemodes/wizard/spells.dm
index 66183c804af..70e28b80df0 100644
--- a/code/game/gamemodes/wizard/spells.dm
+++ b/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'
diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm
index 1e2f0bb3357..2675ae442d0 100644
--- a/code/game/machinery/hydroponics.dm
+++ b/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
diff --git a/code/game/objects/items/item.dm b/code/game/objects/items/item.dm
index 0117086e53f..c72f51746ef 100644
--- a/code/game/objects/items/item.dm
+++ b/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
 
 
 
diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi
index ecebb787f99..322f7acec6f 100644
Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 00579407d02..985e0ad4520 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi
index 43d93b5a8d5..e544af1b809 100644
Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ
diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi
index 0cf173fd642..5229e13733d 100644
Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index f46959a05b2..e66100f99c4 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi
index 21e45acb3a9..8e122252418 100644
Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 3c2787b1cc8..a7124a7dc12 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 6d771734ce1..cdcd78b8a74 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index 9dbb245b4f0..6846213337c 100644
Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ