diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm
index 3c970a5634e..34dcf1b68fb 100644
--- a/code/WorkInProgress/Chemistry-Tools.dm
+++ b/code/WorkInProgress/Chemistry-Tools.dm
@@ -1751,10 +1751,9 @@
 		..()
 		reagents.add_reagent("cryoxadone", 30)
 
-/obj/item/weapon/reagent_containers/glass/golden_cup
+/obj/item/weapon/reagent_containers/food/drinks/golden_cup
 	desc = "A golden cup"
 	name = "golden cup"
-	icon = 'drinks.dmi'
 	icon_state = "golden_cup"
 	item_state = "" //nope :(
 	w_class = 4
@@ -1762,11 +1761,12 @@
 	throwforce = 10
 	amount_per_transfer_from_this = 20
 	possible_transfer_amounts = null
-	volume = 100
+	volume = 150
 	flags = FPRINT | CONDUCT | TABLEPASS | OPENCONTAINER
 
-/obj/item/weapon/reagent_containers/glass/golden_cup/tournament_26_06_2011
-	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."
+/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!"
 
 //Syringes
 /obj/item/weapon/reagent_containers/syringe/robot
diff --git a/code/game/dna.dm b/code/game/dna.dm
index 706bc3e3fa7..51ff1eeeded 100644
--- a/code/game/dna.dm
+++ b/code/game/dna.dm
@@ -248,16 +248,13 @@
 
 		var/hairnum = hex2num(getblock(structure,13,3))
 
-
 		var/list/styles = list("bald", "hair_a", "hair_b", "hair_c", "hair_d", "hair_e", "hair_f", "hair_bedhead", "hair_dreads" )
-		var/hrange = round(4095 / styles.len)
 
-		var/style = round(hairnum / hrange)
+		var/style = round(1 +(hairnum / 4096)*styles.len)
 
 		H.hair_icon_state = styles[style]
 		H.h_style = H.hair_icon_state
 
-
 		H.update_face()
 		H.update_body()
 
diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index 52749156d95..3c7360ce470 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -61,7 +61,7 @@ var/global/datum/controller/gameticker/ticker
 		var/tries=5
 		do
 			can_continue = src.mode.pre_setup()
-		while (tries && !can_continue)
+		while (tries-- && !can_continue)
 		if (!can_continue)
 			del(mode)
 			current_state = GAME_STATE_PREGAME
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 0bc73058754..70957bc039d 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -163,7 +163,7 @@
 
 	stat(null, "Intent: [a_intent]")
 	stat(null, "Move Mode: [m_intent]")
-	if(ticker.mode.name == "AI malfunction")
+	if(ticker && ticker.mode && ticker.mode.name == "AI malfunction")
 		if(ticker.mode:malf_mode_declared)
 			stat(null, "Time left: [max(ticker.mode:AI_win_timeleft/(ticker.mode:apcs/3), 0)]")
 	if(emergency_shuttle)
@@ -905,12 +905,12 @@
 				if(!wear_suit.allowed)
 					usr << "You somehow have a suit with no defined allowed items for suit storage, stop that."
 					return
-				for(var/i=1, i<=wear_suit.allowed.len, i++)
-					if(!W) return
-		//			world << "[wear_suit.allowed[i]] and [W.type]"
-					if (findtext("[W.type]","[wear_suit.allowed[i]]") || istype(W, /obj/item/device/pda) || istype(W, /obj/item/weapon/pen))
-						confirm = 1
-						break
+				if (istype(W, /obj/item/device/pda) || istype(W, /obj/item/weapon/pen))
+					confirm = 1
+					break
+				if (is_type_in_list(W, wear_suit.allowed))
+					confirm = 1
+					break
 			if (!confirm) return
 			else
 				u_equip(W)
@@ -923,14 +923,12 @@
 				return
 			var/confirm
 			if (head)
-				for(var/i=1, i<=head.allowed.len, i++)
-			//		world << "[head.allowed[i]] and [W.type]"
-					if(!W)
-						src << "The code is under the impression that the item you're trying to stick in your hat doesn't exist."
-						return
-					if (findtext("[W.type]","[head.allowed[i]]") || istype(W, /obj/item/weapon/pen))
-						confirm = 1
-						break
+				if (istype(W, /obj/item/weapon/pen))
+					confirm = 1
+					break
+				if (istype(head) && is_type_in_list(W, head.allowed)) // NOTE: head is /obj/item/clothing/head/ and parer hat is not /obj/item/clothing/ and does not have "allowed" --rastaf0
+					confirm = 1
+					break
 			if (!confirm) return
 			else
 				u_equip(W)
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index f8e34c89d71..17190c7fbfc 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ