diff --git a/code/game/gamemodes/scoreboard.dm b/code/game/gamemodes/scoreboard.dm
index 3a0d531e03a..a39692e2ffa 100644
--- a/code/game/gamemodes/scoreboard.dm
+++ b/code/game/gamemodes/scoreboard.dm
@@ -29,13 +29,6 @@
 		if(I.stat == DEAD && is_station_level(I.z))
 			score_deadcrew++
 
-		if(I && I.mind)
-			if(I.mind.assigned_role == "Clown")
-				for(var/thing in I.attack_log)
-					if(findtext(thing, "<font color='orange'>")) //This has to be the hackiest fucking way _ever_ to see attacks.
-						score_clownabuse++
-
-
 	if(shuttle_master.emergency.mode >= SHUTTLE_ENDGAME)
 		for(var/mob/living/player in mob_list)
 			if(player.client)
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index 68307875b1b..bac5b3d51e3 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -72,6 +72,10 @@
 
 /obj/item/clothing/under/rank/clown/hit_reaction()
 	playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1)
+	if(ishuman(loc))
+		var/mob/living/carbon/human/H = loc
+		if(H.mind && H.mind.assigned_role == "Clown")
+			score_clownabuse++
 	return 0
 
 /obj/item/clothing/under/rank/head_of_personnel