diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index b5f8612244..e1101322e9 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -252,6 +252,10 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 /obj/item/katana/timestop
 	name = "temporal katana"
 	desc = "Delicately balanced, this finely-crafted blade hums with barely-restrained potential."
+	icon_state = "temporalkatana"
+	item_state = "temporalkatana"
+	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
 	block_chance = 0 // oops
 	force = 27.5 // oops
 	item_flags = ITEM_CAN_PARRY
@@ -263,6 +267,21 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 		flynn.emote("smirk")
 	new /obj/effect/timestop/magic(get_turf(owner), 1, 50, list(owner)) // null roddies counter
 
+/obj/item/katana/timestop/suicide_act(mob/living/user) // stolen from hierophant staff
+	new /obj/effect/timestop/magic(get_turf(user), 1, 50, list(user)) // free usage for dying
+	user.say("Heh.. Nothing personnel, kid..", forced = "temporal katana suicide")
+	user.visible_message("<span class='suicide'>[user] poses menacingly with the [src]! It looks like [user.p_theyre()] trying to teleport behind someone!</span>")
+	sleep(10)
+	if(!user)
+		return
+	user.visible_message("<span class='hierophant_warning'>[user] vanishes into a cloud of falling dust and  burning embers, likely off to style on some poor sod in the distance!</span>")
+	for(var/obj/item/I in user)
+		if(I != src)
+			user.dropItemToGround(I)
+	user.dropItemToGround(src) //Drop us last, so it goes on top of their stuff
+	qdel(user)
+
+
 /obj/item/melee/bokken // parrying stick
 	name = "bokken"
 	desc = "A space-Japanese training sword made of wood and shaped like a katana."
diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
index 9490595484..8594af8ec2 100644
Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ
diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi
index 52ef75020c..4ac82ca299 100644
Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ
diff --git a/icons/mob/inhands/weapons/swords_lefthand.dmi b/icons/mob/inhands/weapons/swords_lefthand.dmi
index 0ca36ad43d..23d80af9ef 100644
Binary files a/icons/mob/inhands/weapons/swords_lefthand.dmi and b/icons/mob/inhands/weapons/swords_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/swords_righthand.dmi b/icons/mob/inhands/weapons/swords_righthand.dmi
index 59d7bbce69..702c0299b5 100644
Binary files a/icons/mob/inhands/weapons/swords_righthand.dmi and b/icons/mob/inhands/weapons/swords_righthand.dmi differ
diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
index 57105cc089..a3d209570b 100644
Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ
diff --git a/sound/music/twilight.ogg b/sound/music/twilight.ogg
index 74b811b3e5..635663314d 100644
Binary files a/sound/music/twilight.ogg and b/sound/music/twilight.ogg differ