diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm
index 0ade207cf12..1f960676cae 100644
--- a/code/modules/clothing/shoes/magboots.dm
+++ b/code/modules/clothing/shoes/magboots.dm
@@ -4,26 +4,29 @@
 	icon_state = "magboots0"
 	var/magpulse = 0
 //	flags = NOSLIP //disabled by default
+	icon_action_button = "action_magboots"
 
 
 	verb/toggle()
 		set name = "Toggle Magboots"
 		set category = "Object"
 		set src in usr
+		attack_self(usr)
+
+	attack_self(mob/user)
 		if(src.magpulse)
 			src.flags &= ~NOSLIP
 			src.slowdown = SHOES_SLOWDOWN
 			src.magpulse = 0
 			icon_state = "magboots0"
-			usr << "You disable the mag-pulse traction system."
+			user << "You disable the mag-pulse traction system."
 		else
 			src.flags |= NOSLIP
 			src.slowdown = 2
 			src.magpulse = 1
 			icon_state = "magboots1"
-			usr << "You enable the mag-pulse traction system."
-		usr.update_inv_shoes()	//so our mob-overlays update
-
+			user << "You enable the mag-pulse traction system."
+		user.update_inv_shoes()	//so our mob-overlays update
 
 	examine()
 		set src in view()
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index 9f5c97117bb..7558a13b3cd 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -104,7 +104,7 @@
 			if(!busy && prob(30))
 				//first, check for potential food nearby to cocoon
 				for(var/mob/living/C in can_see)
-					if(C.stat)
+					if(C.stat && !istype(C,/mob/living/simple_animal/hostile/giant_spider))
 						cocoon_target = C
 						busy = MOVING_TO_TARGET
 						walk_to(src, C, 1, move_to_delay)
diff --git a/code/modules/mob/screen.dm b/code/modules/mob/screen.dm
index e89c1388dd4..3159d6908ef 100644
--- a/code/modules/mob/screen.dm
+++ b/code/modules/mob/screen.dm
@@ -48,6 +48,8 @@
 				usr.update_inv_glasses()
 			if("action_jetpack")
 				usr.update_inv_back()
+			if("action_magboots")
+				usr.update_inv_shoes()
 
 //This is the proc used to update all the action buttons. It just returns for all mob types except humans.
 /mob/proc/update_action_buttons()
diff --git a/icons/mob/screen1_action.dmi b/icons/mob/screen1_action.dmi
index ac3232918eb..8c1fa3c7f25 100644
Binary files a/icons/mob/screen1_action.dmi and b/icons/mob/screen1_action.dmi differ