diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index 14a35b9f223..c1283361935 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -25,6 +25,7 @@
 		if(atom.grab_attack(src, pulling))
 			changeNext_move(grab_state > GRAB_PASSIVE ? CLICK_CD_GRABBING : CLICK_CD_PULLING)
 			return TRUE
+
 	return FALSE
 
 /mob/living/carbon/human/beforeAdjacentClick(atom/A, params)
@@ -125,6 +126,7 @@
 
 /mob/living/simple_animal/hostile/OnUnarmedAttack(atom/atom, proximity_flag)
 	GiveTarget(atom)
+	
 	if(target)
 		return AttackingTarget()
 
@@ -146,7 +148,7 @@
 		if(atom.grab_attack(src, pulling))
 			changeNext_move(grab_state > GRAB_PASSIVE ? CLICK_CD_GRABBING : CLICK_CD_PULLING)
 			return TRUE
-			
+
 	return FALSE
 
 /atom/proc/attack_alien(mob/living/carbon/alien/user)
diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
index 8a902fd0bcd..85637e3576d 100644
--- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
@@ -590,6 +590,7 @@
 /mob/living/simple_animal/bot/ed209/OnUnarmedAttack(atom/A)
 	if(!on)
 		return
+		
 	if(iscarbon(A))
 		var/mob/living/carbon/C = A
 		if(C.staminaloss < 110 || arrest_type && !baton_delayed)
diff --git a/code/modules/mob/living/simple_animal/bot/griefsky.dm b/code/modules/mob/living/simple_animal/bot/griefsky.dm
index bc1c5b0f627..10cebb52c45 100644
--- a/code/modules/mob/living/simple_animal/bot/griefsky.dm
+++ b/code/modules/mob/living/simple_animal/bot/griefsky.dm
@@ -94,12 +94,15 @@
 	arrived.Weaken(4 SECONDS)
 
 
-/mob/living/simple_animal/bot/secbot/griefsky/OnUnarmedAttack(atom/A) //like secbots its only possible with admin intervention
+/mob/living/simple_animal/bot/secbot/griefsky/OnUnarmedAttack(atom/atom) //like secbots its only possible with admin intervention
 	if(!on)
 		return
-	if(iscarbon(A))
-		var/mob/living/carbon/C = A
-		sword_attack(C)
+
+	if(!iscarbon(atom))
+		return
+
+	var/mob/living/carbon/carbon = atom
+	sword_attack(atom)
 
 /mob/living/simple_animal/bot/secbot/griefsky/pre_grab_attack(atom/atom, proximity_flag)
 	return FALSE
diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm
index 703d583f8d6..81fb071eb30 100644
--- a/code/modules/mob/living/simple_animal/bot/honkbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm
@@ -134,6 +134,7 @@
 /mob/living/simple_animal/bot/honkbot/OnUnarmedAttack(atom/A)
 	if(!on)
 		return
+		
 	if(iscarbon(A))
 		var/mob/living/carbon/C = A
 		if(emagged <= 1)
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index f1b7f6509f0..350ccad2a47 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -269,6 +269,7 @@
 /mob/living/simple_animal/bot/secbot/OnUnarmedAttack(atom/A)
 	if(!on)
 		return
+		
 	if(iscarbon(A))
 		var/mob/living/carbon/C = A
 		if((C.staminaloss < 110 || arrest_type) && !baton_delayed)
diff --git a/code/modules/mob/living/simple_animal/bot/syndicate.dm b/code/modules/mob/living/simple_animal/bot/syndicate.dm
index a37ee10060e..ebb0acdff60 100644
--- a/code/modules/mob/living/simple_animal/bot/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/bot/syndicate.dm
@@ -204,6 +204,7 @@
 /mob/living/simple_animal/bot/ed209/syndicate/OnUnarmedAttack(atom/A)
 	if(!on)
 		return
+		
 	shootAt(A)
 
 /mob/living/simple_animal/bot/ed209/syndicate/pre_grab_attack(atom/atom, proximity_flag)