diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index 2c3dfb0fe1d..7208eeedbc5 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -283,7 +283,7 @@
 		src.MASK.loc = src.loc
 		src.MASK = null
 	if(src.OCCUPANT)
-		src.eject_occupant(usr)
+		src.eject_occupant(OCCUPANT)
 	return
 
 /obj/machinery/suit_storage_unit/proc/toggle_open(mob/user as mob)
@@ -298,7 +298,7 @@
 
 /obj/machinery/suit_storage_unit/proc/toggle_lock(mob/user as mob)
 	if(src.OCCUPANT && src.safetieson)
-		user << "<font color='red>The Unit's safety protocol disallow locking when a biological form is detected inside its compartment.</font>"
+		user << "<font color='red'>The Unit's safety protocols disallow locking when a biological form is detected inside its compartments.</font>"
 		return
 	if(src.isopen)
 		return
@@ -353,6 +353,8 @@
 					V.show_message("<font color='red'>With a loud whining noise, the Suit Storage Unit's door grinds open. Puffs of ashen smoke come out of its chamber.</font>", 3)
 				src.isbroken = 1
 				src.isopen = 1
+				src.islocked = 0
+				src.eject_occupant(OCCUPANT) //Mixing up these two lines causes bug. DO NOT DO IT.
 			src.isUV = 0 //Cycle ends
 	src.update_icon()
 	src.updateUsrDialog()
@@ -433,6 +435,9 @@
 	if (!src.isopen)
 		usr << "<font color='red'>The unit's doors are shut.</font>"
 		return
+	if (!src.ispowered || src.isbroken)
+		usr << "<font color='red'>The unit is not operational.</font>"
+		return
 	if ( (src.OCCUPANT) || (src.HELMET) || (src.SUIT) )
 		usr << "<font color='red'>It's too cluttered inside for you to fit in!</font>"
 		return
@@ -474,6 +479,9 @@
 		if (!src.isopen)
 			usr << "<font color='red'>The unit's doors are shut.</font>"
 			return
+		if (!src.ispowered || src.isbroken)
+			usr << "<font color='red'>The unit is not operational.</font>"
+			return
 		if ( (src.OCCUPANT) || (src.HELMET) || (src.SUIT) ) //Unit needs to be absolutely empty
 			user << "<font color='red'>The Unit's storage area is too cluttered.</font>"
 			return
diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm
index 9ee0793297a..f22f2302572 100644
--- a/code/modules/chemical/Chemistry-Reagents.dm
+++ b/code/modules/chemical/Chemistry-Reagents.dm
@@ -3474,7 +3474,7 @@ datum
 				..()
 				return
 
-		alliescocktail
+/*		alliescocktail
 			name = "Allies Cocktail"
 			id = "alliescocktail"
 			description = "A drink made from your allies."
@@ -3491,7 +3491,7 @@ datum
 				else if(data >= 250 && prob(60))
 					M.confused = max(M:confused+8,0)
 				..()
-				return
+				return*/
 
 		soy_latte
 			name = "Soy Latte"
diff --git a/code/modules/chemical/Chemistry-Recipes.dm b/code/modules/chemical/Chemistry-Recipes.dm
index 150c0586d43..092ae6dd53d 100644
--- a/code/modules/chemical/Chemistry-Recipes.dm
+++ b/code/modules/chemical/Chemistry-Recipes.dm
@@ -1157,12 +1157,12 @@ datum
 			required_reagents = list("rum" = 1, "whiskey" = 1, "lemonjuice" = 1)
 			result_amount = 3
 
-		alliescocktail
+/*		alliescocktail
 			name = "Allies Cocktail"
 			id = "alliescocktail"
 			result = "alliescocktail"
 			required_reagents = list("gin" = 1, "vermouth" = 1)
-			result_amount = 2
+			result_amount = 2*/
 
 		snowwhite
 			name = "Snow White"
diff --git a/icons/changelog.html b/icons/changelog.html
index 87b178a870d..0e44553ef6a 100644
--- a/icons/changelog.html
+++ b/icons/changelog.html
@@ -45,7 +45,16 @@ Stuff which is in development and not yet visible to players or just code relate
 (is. code improvements for expandability, etc.) should not be listed here. They 
 should be listed in the changelog upon commit tho. Thanks. -->
 
-<b><font color='blue'>2 August 2011.</font color><b>
+<b><font color='blue'>2 August 2011. The day the earth stood still.</font color><b>
+<ul>
+	<li><b>Agouri updated</b>:
+	<ul>
+		<li>SSUs now correctly cycle and dump the unlucky occupant when designated to supercycle, when the criteria to do so are met.</li>
+		<li>Fixed bugshit</li>
+		<li>You can now make normal martinis again, removed a silly recipe conflict (Thanks, muskets.). Good barmen are urged to blend the good ol' recipes since the new ones have sprites that SUCK ASS JESUS CHRIST</li>
+	</ul>
+</ul>
+
 <ul>
 	<li><b>Doohl updated</b>:
 	<ul>