diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm
index bda1714f7b..05599597af 100644
--- a/code/game/objects/items/stunbaton.dm
+++ b/code/game/objects/items/stunbaton.dm
@@ -63,9 +63,9 @@
 /obj/item/melee/baton/examine(mob/user)
 	..()
 	if(cell)
-		to_chat(user, "<span class='notice'>The baton is [round(cell.percent())]% charged.</span>")
+		to_chat(user, "<span class='notice'>\The [src] is [round(cell.percent())]% charged.</span>")
 	else
-		to_chat(user, "<span class='warning'>The baton does not have a power source installed.</span>")
+		to_chat(user, "<span class='warning'>\The [src] does not have a power source installed.</span>")
 
 /obj/item/melee/baton/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/stock_parts/cell))
diff --git a/modular_citadel/code/game/objects/items/stunsword.dm b/modular_citadel/code/game/objects/items/stunsword.dm
new file mode 100644
index 0000000000..3d541bb139
--- /dev/null
+++ b/modular_citadel/code/game/objects/items/stunsword.dm
@@ -0,0 +1,31 @@
+/obj/item/melee/baton/stunsword
+	name = "stunsword"
+	desc = "not actually sharp, this sword is functionally identical to a stunbaton"
+	icon = 'modular_citadel/icons/obj/stunsword.dmi'
+	icon_state = "stunsword"
+	item_state = "sword"
+	lefthand_file = 'modular_citadel/icons/mob/inhands/stunsword_left.dmi'
+	righthand_file = 'modular_citadel/icons/mob/inhands/stunsword_right.dmi'
+
+/obj/item/device/ssword_kit
+	name = "stunsword kit"
+	desc = "a modkit for making a stunbaton into a stunsword"
+	icon = 'icons/obj/vending_restock.dmi'
+	icon_state = "refill_donksoft"
+	var/product = /obj/item/melee/baton/stunsword //what it makes
+	var/list/fromitem = list(/obj/item/melee/baton, /obj/item/melee/baton/loaded) //what it needs
+	afterattack(obj/O, mob/user as mob)
+		if(istype(O, product))
+			to_chat(user,"<span class='warning'>[O] is already modified!")
+		else if(O.type in fromitem) //makes sure O is the right thing
+			var/obj/item/melee/baton/B = O
+			if(!B.cell) //checks for a powercell in the baton. If there isn't one, continue. If there is, warn the user to take it out
+				new product(usr.loc) //spawns the product
+				user.visible_message("<span class='warning'>[user] modifies [O]!","<span class='warning'>You modify the [O]!")
+				qdel(O) //Gets rid of the baton
+				qdel(src) //gets rid of the kit
+
+			else
+				to_chat(user,"<span class='warning'>Remove the powercell first!</span>") //We make this check because the stunsword starts without a battery.
+		else
+			to_chat(user, "<span class='warning'> You can't modify [O] with this kit!</span>")
\ No newline at end of file
diff --git a/modular_citadel/icons/mob/inhands/stunsword_left.dmi b/modular_citadel/icons/mob/inhands/stunsword_left.dmi
new file mode 100644
index 0000000000..68adffaa61
Binary files /dev/null and b/modular_citadel/icons/mob/inhands/stunsword_left.dmi differ
diff --git a/modular_citadel/icons/mob/inhands/stunsword_right.dmi b/modular_citadel/icons/mob/inhands/stunsword_right.dmi
new file mode 100644
index 0000000000..57ef58126e
Binary files /dev/null and b/modular_citadel/icons/mob/inhands/stunsword_right.dmi differ
diff --git a/modular_citadel/icons/obj/stunsword.dmi b/modular_citadel/icons/obj/stunsword.dmi
new file mode 100644
index 0000000000..bfe4b45cd9
Binary files /dev/null and b/modular_citadel/icons/obj/stunsword.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index cebe192cc2..08aaf3e9ad 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2512,6 +2512,7 @@
 #include "modular_citadel\code\game\machinery\Sleeper.dm"
 #include "modular_citadel\code\game\objects\ids.dm"
 #include "modular_citadel\code\game\objects\items\handcuffs.dm"
+#include "modular_citadel\code\game\objects\items\stunsword.dm"
 #include "modular_citadel\code\game\objects\items\devices\aicard.dm"
 #include "modular_citadel\code\game\objects\items\devices\PDA\PDA.dm"
 #include "modular_citadel\code\game\objects\items\devices\radio\shockcollar.dm"