From 0adca2d9b85767efc17fb05ceabf32c6205f16e9 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Tue, 5 May 2020 04:45:43 +0200
Subject: [PATCH] Oh.

---
 code/_onclick/item_attack.dm                     | 10 +++++-----
 code/modules/mob/living/carbon/carbon_defense.dm |  2 +-
 code/modules/mob/living/carbon/human/species.dm  |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index dbcf171663..17d1e07d91 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -114,7 +114,7 @@
 	var/totitemdamage = I.force
 	if(I.used_skills && user.mind)
 		if(I.skill_flags & SKILL_ATTACK_OBJ)
-			LIST_SKILL_MODIFIER(used_skills, user.mind.skill_holder, totitemdamage, I.skill_difficulty)
+			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)
@@ -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, TRUE)
+	var/totitemdamage = calculate_item_force(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)
@@ -150,7 +150,7 @@
 	else
 		return ..()
 
-/mob/living/proc/pre_attacked_by(obj/item/I, mob/living/user, pre_attack = FALSE)
+/mob/living/proc/pre_attacked_by(obj/item/I, mob/living/user)
 	. = I.force
 	if(!(user.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE))
 		. *= 0.5
@@ -159,7 +159,7 @@
 	if(!pre_attack || !user.mind || !I.used_skills)
 		return
 	if(. && I.skill_flags & SKILL_ATTACK_MOB)
-		LIST_SKILL_MODIFIER(used_skills, user.mind.skill_holder, ., I.skill_difficulty)
+		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)
@@ -167,7 +167,7 @@
 			for(var/skill in used_skills)
 				user.mind.skill_holder.boost_skill_value_to(skill, I.skill_gain)
 
-/mob/living/carbon/proc/pre_attacked_by(obj/item/I, mob/living/user, pre_attack = FALSE)
+/mob/living/carbon/pre_attacked_by(obj/item/I, mob/living/user)
 	. = ..()
 	if(!(combat_flags & COMBAT_FLAG_COMBAT_ACTIVE))
 		. *= 1.5
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 42e702c5d9..f1d3cf0356 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -77,7 +77,7 @@
 	SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "embedded", /datum/mood_event/embedded)
 
 /mob/living/carbon/attacked_by(obj/item/I, mob/living/user)
-	var/totitemdamage = pre_attacked_by(I, user, TRUE)
+	var/totitemdamage = pre_attacked_by(I, user)
 	if(!(user.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE))
 		totitemdamage *= 0.5
 	if(!CHECK_MOBILITY(user, MOBILITY_STAND))
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 124f862244..71cdcd3f38 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1712,7 +1712,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 			disarm(M, H, attacker_style)
 
 /datum/species/proc/spec_attacked_by(obj/item/I, mob/living/user, obj/item/bodypart/affecting, intent, mob/living/carbon/human/H)
-	var/totitemdamage = H.pre_attacked_by(I, user, TRUE)
+	var/totitemdamage = H.pre_attacked_by(I, user)
 	// Allows you to put in item-specific reactions based on species
 	if(user != H)
 		if(H.run_block(I, totitemdamage, "the [I.name]", ATTACK_TYPE_MELEE, I.armour_penetration, user, affecting.body_zone) & BLOCK_SUCCESS)