From 62feca073dbf78eac79bf036dced57e2123ca815 Mon Sep 17 00:00:00 2001
From: Matt Atlas <mattiathebest2000@hotmail.it>
Date: Sun, 27 Oct 2019 22:00:22 +0100
Subject: [PATCH] Fixes ert merc outfit (#7285)

---
 code/datums/outfits/ert/ert.dm                |  4 +-
 .../clothing/spacesuits/rig/suits/merc.dm     |  3 ++
 html/changelogs/mattatlas-fixesoutfit.yml     | 42 +++++++++++++++++++
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/mattatlas-fixesoutfit.yml

diff --git a/code/datums/outfits/ert/ert.dm b/code/datums/outfits/ert/ert.dm
index 5c08cec99e0..f773f9830fc 100644
--- a/code/datums/outfits/ert/ert.dm
+++ b/code/datums/outfits/ert/ert.dm
@@ -140,11 +140,13 @@
 /datum/outfit/admin/ert/mercenary/leader
 	name = "Mercenary Freelancer Leader"
 	l_hand = /obj/item/weapon/gun/projectile/automatic/rifle
-	back = /obj/item/weapon/rig/merc
+	back = /obj/item/weapon/rig/merc/distress
 	suit_store = null
 	suit = null
 	head = null
 
+	backpack_contents = list()
+
 	belt_contents = list(
 		/obj/item/ammo_magazine/c762 = 3,
 		/obj/item/weapon/handcuffs/ziptie = 2,
diff --git a/code/modules/clothing/spacesuits/rig/suits/merc.dm b/code/modules/clothing/spacesuits/rig/suits/merc.dm
index 9c41925daca..50eb6bb25ad 100644
--- a/code/modules/clothing/spacesuits/rig/suits/merc.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/merc.dm
@@ -40,3 +40,6 @@
 		/obj/item/rig_module/electrowarfare_suite, //might as well
 		/obj/item/rig_module/actuators/combat // What the dude above me said.
 		)
+
+/obj/item/weapon/rig/merc/distress
+	req_access = list(access_distress)
diff --git a/html/changelogs/mattatlas-fixesoutfit.yml b/html/changelogs/mattatlas-fixesoutfit.yml
new file mode 100644
index 00000000000..cb0c1f5d47c
--- /dev/null
+++ b/html/changelogs/mattatlas-fixesoutfit.yml
@@ -0,0 +1,42 @@
+################################
+# 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: "Merc leaders can now actually use the hardsuit."
+  - rscdel: "Merc leaders no longer spawn with items they shouldn't have."