diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index 17d1e07d91..36a718b4b5 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -117,9 +117,9 @@
 			LIST_SKILL_MODIFIER(I.used_skills, user.mind.skill_holder, totitemdamage, I.skill_difficulty)
 		if(I.skill_flags & SKILL_TRAIN_ATTACK_OBJ)
 			if(!islist(I.used_skills))
-				user.mind.skill_holder.boost_skill_value_to(used_skills, I.skill_gain)
+				user.mind.skill_holder.boost_skill_value_to(I.used_skills, I.skill_gain)
 			else
-				for(var/skill in used_skills)
+				for(var/skill in I.used_skills)
 					user.mind.skill_holder.boost_skill_value_to(skill, I.skill_gain)
 	if(totitemdamage)
 		visible_message("<span class='danger'>[user] has hit [src] with [I]!</span>", null, null, COMBAT_MESSAGE_RANGE)
@@ -128,7 +128,7 @@
 	take_damage(totitemdamage, I.damtype, "melee", 1)
 
 /mob/living/attacked_by(obj/item/I, mob/living/user)
-	var/totitemdamage = calculate_item_force(I, user)
+	var/totitemdamage = pre_attacked_by(I, user)
 	if((user != src) && run_block(I, totitemdamage, "the [I.name]", ATTACK_TYPE_MELEE, I.armour_penetration, user) & BLOCK_SUCCESS)
 		return FALSE
 	send_item_attack_message(I, user)
@@ -156,15 +156,15 @@
 		. *= 0.5
 	if(!CHECK_MOBILITY(user, MOBILITY_STAND))
 		. *= 0.5
-	if(!pre_attack || !user.mind || !I.used_skills)
+	if(!user.mind || !I.used_skills)
 		return
 	if(. && I.skill_flags & SKILL_ATTACK_MOB)
 		LIST_SKILL_MODIFIER(I.used_skills, user.mind.skill_holder, ., I.skill_difficulty)
 	if(I.skill_flags & SKILL_TRAIN_ATTACK_MOB)
 		if(!islist(I.used_skills))
-			user.mind.skill_holder.boost_skill_value_to(used_skills, I.skill_gain)
+			user.mind.skill_holder.boost_skill_value_to(I.used_skills, I.skill_gain)
 		else
-			for(var/skill in used_skills)
+			for(var/skill in I.used_skills)
 				user.mind.skill_holder.boost_skill_value_to(skill, I.skill_gain)
 
 /mob/living/carbon/pre_attacked_by(obj/item/I, mob/living/user)