diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index a0b84ea2575..16e3fb56d23 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -329,11 +329,7 @@ Class Procs:
 	var/turf/T = get_turf(src)
 	for(var/atom/movable/AM in contents)
 		AM.forceMove(T)
-	//if(occupant)
-	//	if(occupant.client)
-	//		occupant.client.eye = occupant
-	//		occupant.client.perspective = MOB_PERSPECTIVE
-	//	occupant = null
+
 ////////////////////////////////////////////////////////////////////////////////////////////
 
 /obj/machinery/attack_ai(var/mob/user as mob)
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index c96af327e04..a596db41b82 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -142,14 +142,14 @@
 				for (var/atom/movable/A as mob|obj in src)
 					A.forceMove(loc)
 					A.ex_act(severity++)
-					new /obj/item/stack/sheet/metal(loc)
+				new /obj/item/stack/sheet/metal(loc)
 				qdel(src)
 		if(3)
 			if(prob(5))
 				for(var/atom/movable/A as mob|obj in src)
 					A.forceMove(loc)
 					A.ex_act(severity++)
-					new /obj/item/stack/sheet/metal(loc)
+				new /obj/item/stack/sheet/metal(loc)
 				qdel(src)
 
 /obj/structure/closet/bullet_act(var/obj/item/projectile/Proj)
diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm
index 03ed2d630b4..d50d2f7ce59 100644
--- a/code/modules/mob/language.dm
+++ b/code/modules/mob/language.dm
@@ -515,7 +515,7 @@
 	ask_verb = "tones"
 	exclaim_verb = "tones"
 	colour = "say_quote"
-	key = "z"//Zwarmer...Or Zerg!
+	key = "zw"//Zwarmer...Or Zerg!
 	flags = RESTRICTED || HIVEMIND
 	follow = 1
 
diff --git a/code/modules/mob/living/simple_animal/bot_swarm/swarmer_event.dm b/code/modules/mob/living/simple_animal/bot_swarm/swarmer_event.dm
index 9b245ffd856..72c1c5050f0 100644
--- a/code/modules/mob/living/simple_animal/bot_swarm/swarmer_event.dm
+++ b/code/modules/mob/living/simple_animal/bot_swarm/swarmer_event.dm
@@ -23,7 +23,6 @@
 
 
 /datum/event/spawn_swarmer/start()
-	src << "[the_gateway]"
 	if(find_swarmer())
 		return 0
 	if(!the_gateway)
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 8646cc19d66..954aaa7f77b 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -511,11 +511,20 @@
 			return 0
 	return 1
 
-/mob/living/simple_animal/proc/attack_threshold_check(damage, damagetype = BRUTE)
-	if(damage <= force_threshold || ignored_damage_types[damagetype])
+/mob/living/simple_animal/proc/attack_threshold_check(damage, damagetype)
+	if(damage <= force_threshold)
 		visible_message("<span class='warning'>[src] looks unharmed.</span>")
 	else
-		adjustBruteLoss(damage)
+		switch(damagetype)
+		 if(BRUTE)
+		 	adjustBruteLoss(damage)
+		 if(BURN)
+		 	adjustFireLoss(damage)
+		 if(TOX)
+		 	adjustToxLoss(damage)
+		 if(CLONE)
+		 	adjustCloneLoss(damage)
+
 
 /mob/living/simple_animal/update_fire()
 	return