From 3dc2cd09092ecc8616a67522c5230e53d69fa389 Mon Sep 17 00:00:00 2001
From: Matt Atlas <mattiathebest2000@hotmail.it>
Date: Wed, 5 May 2021 18:56:26 +0200
Subject: [PATCH] Melee weapons now actually apply armor penetration. (#11846)

---
 code/modules/mob/living/living_defense.dm   |  2 +-
 html/changelogs/mattatlas-meleearmorpen.yml | 41 +++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/mattatlas-meleearmorpen.yml

diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 0e0fa5c655a..bd2159e9e5a 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -136,7 +136,7 @@
 		damage_flags &= ~DAM_SHARP
 		damage_flags &= ~DAM_EDGE
 
-	apply_damage(effective_force, I.damtype, hit_zone, blocked, used_weapon=I, damage_flags = damage_flags)
+	apply_damage(effective_force, I.damtype, hit_zone, I, damage_flags, I.armor_penetration)
 
 	return TRUE
 
diff --git a/html/changelogs/mattatlas-meleearmorpen.yml b/html/changelogs/mattatlas-meleearmorpen.yml
new file mode 100644
index 00000000000..357fc9a7351
--- /dev/null
+++ b/html/changelogs/mattatlas-meleearmorpen.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: MattAtlas
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Melee weapons now properly apply armor penetration."