diff --git a/code/__defines/accessories.dm b/code/__defines/accessories.dm
index 90de1a5df9b..5e6eccd03bf 100644
--- a/code/__defines/accessories.dm
+++ b/code/__defines/accessories.dm
@@ -2,6 +2,7 @@
 #define ACCESSORY_SLOT_UTILITY			"utility"
 #define ACCESSORY_SLOT_CAPE				"cape"
 #define ACCESSORY_SLOT_ARMBAND			"armband"
+#define ACCESSORY_SLOT_BADGE			"badge"
 #define ACCESSORY_SLOT_ARMOR_PLATE		"armor plate"
 #define ACCESSORY_SLOT_LEG_GUARDS		"leg guards"
 #define ACCESSORY_SLOT_ARM_GUARDS		"arm guards"
diff --git a/code/game/objects/items/weapons/RFD.dm b/code/game/objects/items/weapons/RFD.dm
index 6445b5e260f..325aaa09b17 100644
--- a/code/game/objects/items/weapons/RFD.dm
+++ b/code/game/objects/items/weapons/RFD.dm
@@ -81,7 +81,7 @@
 	if(W.isscrewdriver())  // Turning it into a crossbow
 		crafting = !crafting
 		if(!crafting)
-			to_chat(user, SPAN_NOTICE("You reassemble the RFD"))
+			to_chat(user, SPAN_NOTICE("You reassemble the RFD."))
 		else
 			to_chat(user, SPAN_NOTICE("The RFD can now be modified."))
 		src.add_fingerprint(user)
@@ -110,9 +110,9 @@
 			var/obj/item/gun/launcher/crossbow/RFD/CB = new(get_turf(user)) // can be found in crossbow.dm
 			forceMove(CB)
 			CB.stored_matter = src.stored_matter
+			user.drop_from_inventory(src)
 			qdel(src)
 			user.put_in_hands(CB)
-			add_fingerprint(user)
 			return
 	..()
 
diff --git a/code/modules/clothing/spacesuits/rig/modules/combat.dm b/code/modules/clothing/spacesuits/rig/modules/combat.dm
index f2bec7cd931..29f9c3de727 100644
--- a/code/modules/clothing/spacesuits/rig/modules/combat.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/combat.dm
@@ -141,7 +141,7 @@
 		var/list/extra_mobs = list()
 		if(holder.wearer != user)
 			extra_mobs += holder.wearer
-		gun.attack_self(user, extra_mobs)
+		gun.toggle_firing_mode(user)
 		return TRUE
 
 	gun.Fire(target, user)
diff --git a/code/modules/clothing/suits/modular_armor.dm b/code/modules/clothing/suits/modular_armor.dm
index 246cd9470d5..d6d7e8bd42c 100644
--- a/code/modules/clothing/suits/modular_armor.dm
+++ b/code/modules/clothing/suits/modular_armor.dm
@@ -7,8 +7,8 @@
 	item_state = "plate_carrier"
 	blood_overlay_type = "armor"
 	w_class = ITEMSIZE_NORMAL
-	restricted_accessory_slots = list(ACCESSORY_SLOT_ARMOR_PLATE, ACCESSORY_SLOT_ARM_GUARDS, ACCESSORY_SLOT_LEG_GUARDS, ACCESSORY_SLOT_ARMOR_POCKETS, ACCESSORY_SLOT_ARMOR_PIN, ACCESSORY_SLOT_CAPE)
-	valid_accessory_slots = list(ACCESSORY_SLOT_ARMOR_PLATE, ACCESSORY_SLOT_ARM_GUARDS, ACCESSORY_SLOT_LEG_GUARDS, ACCESSORY_SLOT_ARMOR_POCKETS, ACCESSORY_SLOT_ARMOR_PIN, ACCESSORY_SLOT_CAPE)
+	restricted_accessory_slots = list(ACCESSORY_SLOT_ARMOR_PLATE, ACCESSORY_SLOT_ARM_GUARDS, ACCESSORY_SLOT_LEG_GUARDS, ACCESSORY_SLOT_ARMOR_POCKETS, ACCESSORY_SLOT_ARMOR_PIN, ACCESSORY_SLOT_CAPE, ACCESSORY_SLOT_BADGE)
+	valid_accessory_slots = list(ACCESSORY_SLOT_ARMOR_PLATE, ACCESSORY_SLOT_ARM_GUARDS, ACCESSORY_SLOT_LEG_GUARDS, ACCESSORY_SLOT_ARMOR_POCKETS, ACCESSORY_SLOT_ARMOR_PIN, ACCESSORY_SLOT_CAPE, ACCESSORY_SLOT_BADGE)
 
 /obj/item/clothing/suit/armor/carrier/officer
 	starting_accessories = list(
diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm
index b43b6227190..191c182dc74 100644
--- a/code/modules/clothing/under/accessories/badges.dm
+++ b/code/modules/clothing/under/accessories/badges.dm
@@ -11,6 +11,7 @@
 	item_state = "marshalbadge"
 	overlay_state = "marshalbadge"
 	slot_flags = SLOT_BELT | SLOT_TIE
+	slot = ACCESSORY_SLOT_BADGE
 
 	var/stored_name
 	var/badge_string = "Corporate Security"
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 59faf268fec..3c5ef6efe23 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -573,4 +573,4 @@ emp_act
 /mob/living/carbon/human/extinguish_fire()
 	..()
 	for(var/obj/item/I in contents)
-		I.extinguish_fire()
\ No newline at end of file
+		I.extinguish_fire()
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 82a6723d734..2b65499185c 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -119,7 +119,7 @@
 	to_chat(src, SPAN_WARNING("Warning: Electromagnetic pulse detected."))
 	..()
 
-/mob/living/silicon/stun_effect_act()
+/mob/living/silicon/stun_effect_act(var/stun_amount, var/agony_amount, var/def_zone, var/used_weapon, var/damage_flags)
 	return	//immune
 
 /mob/living/silicon/electrocute_act(shock_damage, obj/source, siemens_coeff = 1.0, tesla_shock = FALSE, ground_zero)
diff --git a/html/changelogs/mattatlas-notactuallytrue.yml b/html/changelogs/mattatlas-notactuallytrue.yml
new file mode 100644
index 00000000000..206aa680e84
--- /dev/null
+++ b/html/changelogs/mattatlas-notactuallytrue.yml
@@ -0,0 +1,44 @@
+################################
+# 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: "Badges can now be attached to plate carriers."
+  - bugfix: "Crossbows are no longer duplicated when attached to an RFD."
+  - bugfix: "Fixed hardsuit weapon configuration."
+  - bugfix: "Fixed riot armguards worn sprite."
diff --git a/icons/clothing/kit/modular_armor.dmi b/icons/clothing/kit/modular_armor.dmi
index ef231070ab6..d456dbcd8d5 100644
Binary files a/icons/clothing/kit/modular_armor.dmi and b/icons/clothing/kit/modular_armor.dmi differ