Captain's Rapier

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 = 15
+	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'

code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm

@@ -181,3 +181,19 @@
 	if(prob(75))
 		new /obj/item/weapon/storage/backpack/dufflebag/sec(src)
 	return ..()
+
+/obj/structure/closet/secure_closet/captains
+	starts_with = list(
+		/obj/item/weapon/storage/backpack/dufflebag/captain,
+		/obj/item/clothing/head/helmet,
+		/obj/item/clothing/suit/storage/vest,
+		/obj/item/weapon/cartridge/captain,
+		/obj/item/weapon/storage/lockbox/medal,
+		/obj/item/device/radio/headset/heads/captain,
+		/obj/item/device/radio/headset/heads/captain/alt,
+		/obj/item/weapon/gun/energy/gun,
+		/obj/item/weapon/melee/telebaton,
+		/obj/item/device/flash,
+		/obj/item/weapon/storage/box/ids,
+		/obj/item/weapon/melee/rapier,
+		/obj/item/clothing/accessory/holster/machete/rapier)

code/modules/clothing/under/accessories/holster_vr.dm

@@ -1,4 +1,53 @@
 /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)
+	can_hold = list(/obj/item/weapon/gun/energy/kinetic_accelerator)
+
+/obj/item/clothing/accessory/holster/machete/rapier
+	name = "rapier sheath"
+	desc = "A beautiful red sheath, probably for a beautiful blade."
+	icon = 'icons/obj/clothing/ties_vr.dmi'
+	icon_state = "sheath"
+	slot_flags = SLOT_BELT|ACCESSORY_SLOT_WEAPON
+	var/has_full_icon = 1
+	icon_override = 'icons/mob/ties_vr.dmi'
+	overlay_state = "sheath"
+	can_hold = list(/obj/item/weapon/melee/rapier)
+
+/obj/item/clothing/accessory/holster/machete/rapier/swords
+	name = "sword sheath"
+	desc = "A beautiful red sheath, probably for a beautiful blade."
+	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/machete/rapier/proc/occupied()
+	if(!has_full_icon)
+		return
+	if(contents.len)
+		overlay_state = "[initial(overlay_state)]-rapier"
+	else
+		overlay_state = initial(overlay_state)
+
+/obj/item/clothing/accessory/holster/machete/rapier/swords/occupied()
+	if(!has_full_icon)
+		return
+	if(contents.len)
+		overlay_state = "[initial(overlay_state)]-secondary"
+	else
+		overlay_state = initial(overlay_state)
+
+/obj/item/clothing/accessory/holster/machete/rapier/holster(var/obj/item/I, var/mob/living/user)
+	..()
+	occupied()
+	has_suit.update_clothing_icon()
+
+/obj/item/clothing/accessory/holster/machete/rapier/unholster(var/obj/item/I, var/mob/living/user)
+	..()
+	occupied()
+	has_suit.update_clothing_icon()

vorestation.dme

@@ -1439,6 +1439,7 @@
 #include "code\game\objects\items\weapons\melee\energy.dm"
 #include "code\game\objects\items\weapons\melee\energy_vr.dm"
 #include "code\game\objects\items\weapons\melee\misc.dm"
+#include "code\game\objects\items\weapons\melee\misc_vr.dm"
 #include "code\game\objects\items\weapons\storage\backpack.dm"
 #include "code\game\objects\items\weapons\storage\backpack_vr.dm"
 #include "code\game\objects\items\weapons\storage\bags.dm"