diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index fd7885ace2..d3328becb8 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -27,6 +27,13 @@
 	IsShield()
 		return 1
 
+	attackby(obj/item/weapon/W as obj, mob/user as mob)
+		if(istype(W, /obj/item/weapon/melee/baton))
+			user.visible_message("<span class='warning'>[user] bashes their [src] with [W]!</span>")
+			playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1)
+		else
+			..()
+
 /obj/item/weapon/shield/energy
 	name = "energy combat shield"
 	desc = "A shield capable of stopping most projectile and melee attacks. It can be retracted, expanded, and stored anywhere."
@@ -221,6 +228,19 @@
 	details = 1
 	origin_tech = "magnets=4;biotech=2"
 
+/obj/item/weapon/melee/chainofcommand
+	name = "chain of command"
+	desc = "A tool used by great men to placate the frothing masses."
+	icon_state = "chain"
+	item_state = "chain"
+	flags = FPRINT | TABLEPASS | CONDUCT
+	slot_flags = SLOT_BELT
+	force = 10
+	throwforce = 7
+	w_class = 3
+	origin_tech = "combat=4"
+	attack_verb = list("flogged", "whipped", "lashed", "disciplined")
+
 /obj/item/weapon/melee/energy
 	var/active = 0
 
diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi
index 84dfb7320e..1e2737d0f3 100644
Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ
diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi
index bac7ba1803..170f833afd 100644
Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index ecc8c8f85a..7fd74e14df 100644
Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ
diff --git a/maps/tgstation.2.0.9.dmm b/maps/tgstation.2.0.9.dmm
index 6154bf8120..298fc88022 100644
--- a/maps/tgstation.2.0.9.dmm
+++ b/maps/tgstation.2.0.9.dmm
@@ -1697,7 +1697,7 @@
 "aGG" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/crema_switch{pixel_x = 25},/turf/simulated/floor{icon_state = "dark"},/area/chapel/office)
 "aGH" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp{pixel_y = 10},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
 "aGI" = (/obj/structure/table/woodentable,/obj/item/weapon/pen,/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater,/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
-"aGJ" = (/obj/structure/table/woodentable,/obj/item/device/soulstone,/obj/item/weapon/nullrod,/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
+"aGJ" = (/obj/structure/table/woodentable,/obj/item/weapon/nullrod,/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
 "aGK" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main)
 "aGL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/chapel/main)
 "aGM" = (/turf/space,/area/shuttle/escape/station)
@@ -2718,8 +2718,8 @@
 "ban" = (/turf/simulated/floor{dir = 8; icon_state = "browncorner"},/area/hallway/primary/central)
 "bao" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 32; pixel_y = 0},/turf/simulated/floor{icon_state = "bluecorner"},/area/hallway/primary/central)
 "bap" = (/obj/machinery/door/window{dir = 1; icon = 'icons/obj/doors/windoor.dmi'; name = "Captain's Desk Door"; req_access_txt = "20"},/turf/simulated/floor/wood,/area/crew_quarters/captain)
-"baq" = (/obj/item/weapon/hand_tele,/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/crew_quarters/captain)
-"bar" = (/obj/item/weapon/soap/deluxe,/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/crew_quarters/captain)
+"baq" = (/obj/structure/table/woodentable,/obj/item/weapon/melee/chainofcommand,/turf/simulated/floor/wood,/area/crew_quarters/captain)
+"bar" = (/obj/item/weapon/soap/deluxe,/obj/structure/table/woodentable,/obj/item/weapon/hand_tele,/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "bas" = (/obj/structure/table/woodentable,/obj/item/weapon/folder/blue,/obj/item/weapon/book/manual/security_space_law,/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "bat" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "bau" = (/obj/machinery/vending/cigarette,/turf/simulated/floor/wood,/area/crew_quarters/captain)
diff --git a/sound/effects/shieldbash.ogg b/sound/effects/shieldbash.ogg
new file mode 100644
index 0000000000..ffcea66956
Binary files /dev/null and b/sound/effects/shieldbash.ogg differ