diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index bf171de117d..0d3b26d0340 100644
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -320,6 +320,8 @@ This is always put in the attack log.
 			var/area/A = get_area(MT)
 			if(A && A.hide_attacklogs)
 				loglevel = ATKLOG_ALMOSTALL
+	else
+		loglevel = ATKLOG_ALL // Hitting an object. Not a mob
 	if(isLivingSSD(target))  // Attacks on SSDs are shown to admins with any log level except ATKLOG_NONE. Overrides custom level
 		loglevel = ATKLOG_FEW
 
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index f8b7d45592c..1dc09d13e63 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -564,8 +564,8 @@
 		if(user.obj_damage)
 			animal_damage = user.obj_damage
 		animal_damage = min(animal_damage, 20*user.environment_smash)
-		user.create_attack_log("<font color='red'>attacked [name]</font>")
-		add_attack_logs(user, OCCUPANT_LOGGING, "Animal attacked mech [src]")
+		if(animal_damage)
+			add_attack_logs(user, OCCUPANT_LOGGING, "Animal attacked mech [src]")
 		attack_generic(user, animal_damage, user.melee_damage_type, "melee", play_soundeffect)
 		return TRUE
 
@@ -781,7 +781,8 @@
 			to_chat(user, "<span class='notice'>You stop installing [M].</span>")
 
 	else
-		add_attack_logs(user, OCCUPANT_LOGGING, "attacked mech '[src]' using [W]")
+		if(W.force)
+			add_attack_logs(user, OCCUPANT_LOGGING, "attacked mech '[src]' using [W]")
 		return ..()