diff --git a/code/game/objects/items/weapons/melee/misc_vr.dm b/code/game/objects/items/weapons/melee/misc_vr.dm
new file mode 100644
index 00000000000..26f0eafc363
--- /dev/null
+++ b/code/game/objects/items/weapons/melee/misc_vr.dm
@@ -0,0 +1,16 @@
+/obj/item/weapon/melee/rapier
+	name = "rapier"
+	desc = "A gleaming steel blade with a gold handguard and inlayed with an outstanding red gem."
+	icon = 'icons/obj/weapons_vr.dmi'
+	icon_state = "rapier"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_melee_vr.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_melee_vr.dmi',
+		)
+	force = 25
+	throwforce = 10
+	w_class = ITEMSIZE_NORMAL
+	sharp = 1
+	edge = 0
+	attack_verb = list("stabbed", "lunged at", "dextrously struck", "sliced", "lacerated", "impaled", "diced", "charioted")
+	hitsound = 'sound/weapons/bladeslice.ogg'
\ No newline at end of file
diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm
index cac0713b07a..6bc7a403c1a 100644
--- a/code/modules/clothing/under/accessories/holster.dm
+++ b/code/modules/clothing/under/accessories/holster.dm
@@ -36,6 +36,7 @@
 	w_class = max(w_class, holstered.w_class)
 	user.visible_message("<span class='notice'>[user] holsters \the [holstered].</span>", "<span class='notice'>You holster \the [holstered].</span>")
 	name = "occupied [initial(name)]"
+	update_icon()
 
 /obj/item/clothing/accessory/holster/proc/clear_holster()
 	holstered = null
diff --git a/code/modules/clothing/under/accessories/holster_vr.dm b/code/modules/clothing/under/accessories/holster_vr.dm
index 75cb4ccc9e7..f937df49a41 100644
--- a/code/modules/clothing/under/accessories/holster_vr.dm
+++ b/code/modules/clothing/under/accessories/holster_vr.dm
@@ -1,4 +1,36 @@
 /obj/item/clothing/accessory/holster/waist/kinetic_accelerator
 	name = "KA holster"
 	desc = "A specialized holster, made specifically for Kinetic Accelerator."
-	can_hold = list(/obj/item/weapon/gun/energy/kinetic_accelerator)
\ No newline at end of file
+	can_hold = list(/obj/item/weapon/gun/energy/kinetic_accelerator)
+
+/obj/item/clothing/accessory/holster/machete/rapier
+	name = "sword sheath"
+	desc = "A beautiful red sheath, probably for a beautiful blade."
+	icon = 'icons/obj/clothing/ties_vr.dmi'
+	icon_state = "sheath"
+	slot = ACCESSORY_SLOT_WEAPON || SLOT_BELT
+	can_hold = list(
+		/obj/item/weapon/melee/rapier,
+		/obj/item/weapon/material/sword/katana,
+		/obj/item/toy/cultsword,
+		/obj/item/weapon/material/sword,
+		/obj/item/weapon/melee/cursedblade,
+		/obj/item/weapon/melee/cultblade
+		)
+
+/obj/item/clothing/accessory/holster/holster(var/obj/item/I, var/mob/living/user)
+	. = ..()
+	icon_state = initial(icon_state)
+	item_state = initial(item_state)
+	for(var/item in contents)
+     if(istype(item, /obj/item/weapon/melee/rapier))
+		icon_state = "[icon_state]-rapier"
+		item_state = "[item_state]-rapier"
+		else
+			icon_state = "[icon_state]-other"
+			item_state = "[item_state]-other"
+
+/obj/item/clothing/accessory/holster/machete/rapier/unholster(mob/user as mob)
+	icon_state = initial(icon_state)
+	item_state = initial(item_state)
+