diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index 61e3aef5b31..8946189b4cb 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -84,7 +84,7 @@
 	if(M.is_adult)
 		damage = rand(10, 40)
 	adjustBruteLoss(damage)
-	add_logs(M, src, "attacked", admin=0)
+	add_attack_logs(src, M, "Slime'd for [damage] damage")
 	updatehealth()
 	return
 
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
index 1027c0a4245..0056bb709a5 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
@@ -20,7 +20,7 @@
 								"<span class='userdanger'>[M] has weakened [src]!</span>", \
 								"<span class='danger'>You hear someone fall.</span>")
 					adjustBruteLoss(damage)
-					add_logs(M, src, "attacked", admin=0)
+					add_attack_logs(M, src, "Melee attacked with fists")
 					updatehealth()
 				else
 					playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
@@ -31,7 +31,7 @@
 					if(prob(5))//Very small chance to push an alien down.
 						Paralyse(2)
 						playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
-						add_logs(M, src, "pushed", admin=0)
+						add_attack_logs(M, src, "Pushed over")
 						visible_message("<span class='danger'>[M] has pushed down [src]!</span>", \
 								"<span class='userdanger'>[M] has pushed down [src]!</span>")
 					else
diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm
index e1fbd04a60f..783d683f060 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva.dm
@@ -79,7 +79,7 @@
 	if(M.is_adult)
 		damage = rand(20, 40)
 	adjustBruteLoss(damage)
-	add_attack_logs(M, src, "Slime attacked")
+	add_attack_logs(src, M, "Slime'd for [damage] damage")
 	updatehealth()
 	return
 
diff --git a/code/modules/mob/living/carbon/alien/larva/larva_defense.dm b/code/modules/mob/living/carbon/alien/larva/larva_defense.dm
index 029ea07da4f..fc7fa22510b 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva_defense.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva_defense.dm
@@ -10,7 +10,7 @@
 					sleep(3)
 					step_away(src, M, 15)
 			playsound(loc, "punch", 25, 1, -1)
-			add_logs(M, src, "attacked", admin=0)
+			add_attack_logs(M, src, "Melee attacked with fists")
 			visible_message("<span class='danger'>[M] has kicked [src]!</span>", \
 					"<span class='userdanger'>[M] has kicked [src]!</span>")
 			if((stat != DEAD) && (damage > 4.9))
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 6f5e692c311..dc640ec68a0 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1756,7 +1756,7 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
 
 			to_chat(H, "<span class='notice'>You feel a breath of fresh air enter your lungs. It feels good.</span>")
 			to_chat(src, "<span class='alert'>Repeat at least every 7 seconds.")
-			add_logs(src, H, "CPRed")
+			add_attack_logs(src, H, "CPRed", FALSE)
 			return 1
 	else
 		to_chat(src, "<span class='danger'>You need to stay still while performing CPR!</span>")
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index d6545d9bff6..c45154e4931 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -391,7 +391,7 @@ emp_act
 				visible_message("<span class='danger'>[M] has wounded [src]!</span>", \
  					"<span class='userdanger'>[M] has wounded [src]!</span>")
 				apply_effect(4, WEAKEN, armor_block)
-				add_logs(M, src, "attacked", admin=0)
+				add_attack_logs(M, src, "Alien attacked")
 			updatehealth()
 
 		if(M.a_intent == INTENT_DISARM)
@@ -399,7 +399,7 @@ emp_act
 				var/obj/item/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting))
 				playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
 				apply_effect(5, WEAKEN, run_armor_check(affecting, "melee"))
-				add_logs(M, src, "tackled", admin=0)
+				add_attack_logs(M, src, "Alien tackled")
 				visible_message("<span class='danger'>[M] has tackled down [src]!</span>")
 			else
 				if(prob(99)) //this looks fucking stupid but it was previously 'var/randn = rand(1, 100); if(randn <= 99)'
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 0039284a6a0..10c83f4d0f2 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -290,7 +290,7 @@
 				s.set_up(5, 1, src)
 				s.start()
 				return 1
-	add_logs(M, src, "attacked", admin=0)
+	add_attack_logs(src, M, "Slime'd")
 	return
 
 /mob/living/attack_animal(mob/living/simple_animal/M)
@@ -303,7 +303,7 @@
 		M.do_attack_animation(src)
 		visible_message("<span class='danger'>\The [M] [M.attacktext] [src]!</span>", \
 						"<span class='userdanger'>\The [M] [M.attacktext] [src]!</span>")
-		add_logs(M, src, "attacked", admin=0)
+		add_attack_logs(M, src, "Animal attacked")
 		return 1
 
 /mob/living/attack_larva(mob/living/carbon/alien/larva/L)
@@ -315,7 +315,7 @@
 		else
 			L.do_attack_animation(src)
 			if(prob(90))
-				add_logs(L, src, "attacked", admin=0)
+				add_attack_logs(L, src, "Larva attacked")
 				visible_message("<span class='danger'>[L.name] bites [src]!</span>", \
 						"<span class='userdanger'>[L.name] bites [src]!</span>")
 				playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm
index ca240058e58..033b244cf8c 100644
--- a/code/modules/mob/living/silicon/robot/robot_defense.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defense.dm
@@ -7,7 +7,7 @@
 				step(src, get_dir(M,src))
 				spawn(5)
 					step(src, get_dir(M,src))
-				add_logs(M, src, "pushed", admin=0)
+				add_attack_logs(M, src, "Alien pushed over")
 				playsound(loc, 'sound/weapons/pierce.ogg', 50, 1, -1)
 				visible_message("<span class='danger'>[M] has forced back [src]!</span>",\
 								"<span class='userdanger'>[M] has forced back [src]!</span>")
diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm
index 5659eecc4dc..480c9442bd7 100644
--- a/code/modules/mob/living/silicon/silicon_defense.dm
+++ b/code/modules/mob/living/silicon/silicon_defense.dm
@@ -5,13 +5,12 @@
 	if(..()) //if harm or disarm intent
 		var/damage = rand(10, 20)
 		if(prob(90))
-			add_logs(M, src, "attacked", admin=0)
 			playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1)
 			visible_message("<span class='danger'>[M] has slashed at [src]!</span>", \
 							"<span class='userdanger'>[M] has slashed at [src]!</span>")
 			if(prob(8))
 				flash_eyes(affect_silicon = 1)
-			add_logs(M, src, "attacked", admin=0)
+			add_attack_logs(M, src, "Alien attacked")
 			adjustBruteLoss(damage)
 			updatehealth()
 		else
@@ -55,7 +54,7 @@
 			if(HULK in M.mutations)
 				var/damage = rand(10,15)
 				adjustBruteLoss(damage)
-				add_logs(M, src, "attacked", admin=0)
+				add_attack_logs(M, src, "Melee attacked with fists")
 				playsound(loc, "punch", 25, 1, -1)
 				visible_message("<span class='danger'>[M] has punched [src]!</span>", \
 						"<span class='userdanger'>[M] has punched [src]!</span>")
diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm
index acf22ed69f7..b122decd322 100644
--- a/code/modules/mob/living/simple_animal/animal_defense.dm
+++ b/code/modules/mob/living/simple_animal/animal_defense.dm
@@ -15,7 +15,7 @@
 			visible_message("<span class='danger'>[M] [response_harm] [src]!</span>")
 			playsound(loc, "punch", 25, 1, -1)
 			attack_threshold_check(harm_intent_damage)
-			add_logs(M, src, "attacked", admin=0)
+			add_attack_logs(M, src, "Melee attacked with fists")
 			updatehealth()
 			return 1
 
@@ -25,7 +25,7 @@
 		visible_message("<span class='danger'>[M] has slashed at [src]!</span>", \
 				"<span class='userdanger'>[M] has slashed at [src]!</span>")
 		playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
-		add_logs(M, src, "attacked", admin=0)
+		add_attack_logs(M, src, "Alien attacked")
 		attack_threshold_check(damage)
 	return