From a93bfc39e0db2ac8a338e52ca8d68ebc342f6e07 Mon Sep 17 00:00:00 2001
From: TechnoAlchemist <TechnoAlchemisto@users.noreply.github.com>
Date: Thu, 22 Sep 2016 15:25:25 -0700
Subject: [PATCH] Officer's Sabre Tweaks (#20565)

Allows for quickdrawing the sabre.
Also changes the attack text since it's no longer a rapier, and it doesn't make sense that it can dismember with point lunges and thrusts.
---
 code/game/objects/items/weapons/melee/misc.dm  |  2 +-
 .../game/objects/items/weapons/storage/belt.dm | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm
index 6c20ea10f6f..596ed7b35b6 100644
--- a/code/game/objects/items/weapons/melee/misc.dm
+++ b/code/game/objects/items/weapons/melee/misc.dm
@@ -47,7 +47,7 @@
 	armour_penetration = 75
 	sharpness = IS_SHARP
 	origin_tech = "combat=5"
-	attack_verb = list("lunged at", "stabbed")
+	attack_verb = list("slashed", "cut")
 	hitsound = 'sound/weapons/rapierhit.ogg'
 	materials = list(MAT_METAL = 1000)
 
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 46dbaa39b36..1a45f5a838e 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -421,7 +421,7 @@
 
 /obj/item/weapon/storage/belt/sabre
 	name = "sabre sheath"
-	desc = "An ornate sheath designed to hold an officer's blade."
+	desc = "An ornate sheath designed to hold an officer's blade. Alt-Click to quickly draw the sheathed blade."
 	icon_state = "sheath"
 	item_state = "sheath"
 	storage_slots = 1
@@ -431,6 +431,21 @@
 		/obj/item/weapon/melee/sabre
 		)
 
+
+
+
+/obj/item/weapon/storage/belt/sabre/AltClick(mob/user)
+	if(!ishuman(user) || !user.canUseTopic(src))
+		return
+	if(contents.len)
+		var/obj/item/I = contents[1]
+		user.visible_message("[user] takes [I] out of [src].", "<span class='notice'>You take [I] out of [src].</span>",\
+		)
+		user.put_in_hands(I)
+		update_icon()
+	else
+		user << "[src] is empty."
+
 /obj/item/weapon/storage/belt/sabre/update_icon()
 	icon_state = "sheath"
 	item_state = "sheath"
@@ -442,6 +457,7 @@
 		L.regenerate_icons()
 	..()
 
+
 /obj/item/weapon/storage/belt/sabre/New()
 	..()
 	new /obj/item/weapon/melee/sabre(src)