diff --git a/code/game/verbs/sound.dm b/code/game/verbs/sound.dm
index 06b27939075..cced7b67b23 100644
--- a/code/game/verbs/sound.dm
+++ b/code/game/verbs/sound.dm
@@ -1,6 +1,7 @@
 /mob/verb/togglemidis()
 	set category = "Special Verbs"
 	set name = "Toggle Midis"
+	set desc = "This will prevent further admin midis from playing, as well as cut off the current one."
 
 	if(istype(usr,/mob))
 		var/mob/M = usr
@@ -8,5 +9,8 @@
 
 		if(M.client)
 			M.client.midis = !M.client.midis
-			M << "You will now [M.client.midis? "start":"stop"] receiving any sounds uploaded by admins."
+			if(!M.client.midis)
+				M << sound(null, 0, 0, 777) // breaks the client's sound output on channel 777
+
+			M << "You will now [M.client.midis? "start":"stop"] receiving any sounds uploaded by admins[M.client.midis? "":", and any current midis playing have been disabled"]."
 		return
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/metroid/life.dm b/code/modules/mob/living/carbon/metroid/life.dm
index 48edc4c9045..df3db674bbd 100644
--- a/code/modules/mob/living/carbon/metroid/life.dm
+++ b/code/modules/mob/living/carbon/metroid/life.dm
@@ -215,7 +215,7 @@
 
 		AIprocess()  // the master AI process
 
-			if(AIproc || stat == 2) return
+			if(AIproc || stat == 2 || client) return
 
 			var/hungry = 0
 			var/starving = 0
@@ -233,7 +233,7 @@
 				if(Victim) // can't eat AND have this little process at the same time
 					break
 
-				if(!Target)
+				if(!Target || client)
 					break
 
 
diff --git a/html/changelog.html b/html/changelog.html
index a7d656e3d00..a89b100a9fa 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -54,6 +54,15 @@ Stuff which is in development and not yet visible to players or just code relate
 (ie. 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'>19 November 2011</font><b>
+<ul>
+  <li><b>Doohl updated:</b>
+  <ul>
+    <li>Toggling admin midis will now <b><font color=red>DISABLE THE CURRENT MIDI OH MY GOSH!</b></font color></li>
+  </ul>
+  </li>
+</ul>
+
 <b><font color='blue'>16 November 2011</font><b>
 <ul>
   <li><b>Tobba updated:</b>
diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi
index 2c2b795463e..24f8f5276cf 100644
Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
index 35ea9a94466..1c92b1415e5 100644
Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ
diff --git a/icons/obj/terminals.dmi b/icons/obj/terminals.dmi
index fd48bec7f75..aa363819810 100644
Binary files a/icons/obj/terminals.dmi and b/icons/obj/terminals.dmi differ