diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index bff96a1e3df..52042aac126 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -172,7 +172,6 @@
 	src.L += new /obj/item/weapon/rcd_ammo(src)
 	src.L += new /obj/item/weapon/scalpel(src)
 	src.L += new /obj/item/weapon/circular_saw(src)
-	src.L += new /obj/item/weapon/shield/riot(src)
 	src.L += new /obj/item/device/t_scanner(src)
 	src.L += new /obj/item/weapon/reagent_containers/glass/bucket(src)
 	src.LL += new /obj/item/weapon/flamethrower(src)
@@ -184,6 +183,7 @@
 	src.LL += new /obj/item/weapon/handcuffs(src)
 	src.LL += new /obj/item/weapon/ammo/a357(src)
 	src.LL += new /obj/item/weapon/ammo/a38(src)
+	src.LL += new /obj/item/weapon/shield/riot(src)
 	src.wires["Light Red"] = 0
 	src.wires["Dark Red"] = 0
 	src.wires["Blue"] = 0
diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm
index fdb40db33b5..73b4b191dfb 100644
--- a/code/game/objects/items/weapons/swords_axes_etc.dm
+++ b/code/game/objects/items/weapons/swords_axes_etc.dm
@@ -97,6 +97,14 @@ STUN BATON
 		return
 	if (status == 0 || (status == 1 && charges ==0))
 		if(user.a_intent == "hurt")
+			if (!istype(H:r_hand, /obj/item/weapon/shield/riot) && prob(40))
+				for(var/mob/O in viewers(M, null))
+					if (O.client)	O.show_message(text("\red <B>[] has blocked []'s stun baton with the riot shield!</B>", M, user), 1, "\red You hear a cracking sound", 2)
+				return
+			if (!istype(H:l_hand, /obj/item/weapon/shield/riot) && prob(40))
+				for(var/mob/O in viewers(M, null))
+					if (O.client)	O.show_message(text("\red <B>[] has blocked []'s stun baton with the riot shield!</B>", M, user), 1, "\red You hear a cracking sound", 2)
+				return
 			if (M.weakened < 5 && (!(M.mutations & 8))  /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/)
 				M.weakened = 5
 				..()
@@ -114,6 +122,14 @@ STUN BATON
 	if((charges > 0 && status == 1) && (istype(H, /mob/living/carbon/human)))
 		flick("baton_active", src)
 		if (user.a_intent == "hurt")
+			if (!istype(H:r_hand, /obj/item/weapon/shield/riot) && prob(40))
+				for(var/mob/O in viewers(M, null))
+					if (O.client)	O.show_message(text("\red <B>[] has blocked []'s stun baton with the riot shield!</B>", M, user), 1, "\red You hear a cracking sound", 2)
+				return
+			if (!istype(H:l_hand, /obj/item/weapon/shield/riot) && prob(40))
+				for(var/mob/O in viewers(M, null))
+					if (O.client)	O.show_message(text("\red <B>[] has blocked []'s stun baton with the riot shield!</B>", M, user), 1, "\red You hear a cracking sound", 2)
+				return
 			playsound(src.loc, 'Genhit.ogg', 50, 1, -1)
 			if(isrobot(user))
 				var/mob/living/silicon/robot/R = user
@@ -128,6 +144,14 @@ STUN BATON
 			if (M.stunned < 1 && (!(M.mutations & 8))  /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/)
 				M.stunned = 1
 		else
+			if (!istype(H:r_hand, /obj/item/weapon/shield/riot) && prob(40))
+				for(var/mob/O in viewers(M, null))
+					if (O.client)	O.show_message(text("\red <B>[] has blocked []'s stun baton with the riot shield!</B>", M, user), 1, "\red You hear a cracking sound", 2)
+				return
+			if (!istype(H:l_hand, /obj/item/weapon/shield/riot) && prob(40))
+				for(var/mob/O in viewers(M, null))
+					if (O.client)	O.show_message(text("\red <B>[] has blocked []'s stun baton with the riot shield!</B>", M, user), 1, "\red You hear a cracking sound", 2)
+				return
 			playsound(src.loc, 'Egloves.ogg', 50, 1, -1)
 			if(isrobot(user))
 				var/mob/living/silicon/robot/R = user
diff --git a/icons/changelog.html b/icons/changelog.html
index 1300547f7be..2db1ddf9492 100644
--- a/icons/changelog.html
+++ b/icons/changelog.html
@@ -35,8 +35,8 @@
 <p><strong>Visit our IRC channel, #tgstation13 on irc.rizon.net</strong></p>
 
 <h5>/tg/Station 13 Development Team</h4>
-	<strong>Coders:</strong> TLE, NEO, muskets, veryinky, Skie, Numbers, Agouri, Noka, Urist McDorf<br>
-	<strong>Spriters:</strong> Skie, Agouri<br>
+	<strong>Coders:</strong> TLE, NEO, muskets, veryinky, Skie, Numbers, Agouri, Noka, Urist McDorf, Uhangi<br>
+	<strong>Spriters:</strong> Skie, Agouri, Uhangi<br>
 	<strong>Sounds:</strong> Skie<br>
 	<strong>Thanks to:</strong> CDK Station devs, GoonStation devs and original SpaceStation developers