[MIRROR] Concealed Cane Sword (ABLE TO BE MERGED) (#13089)

* Concealed Cane Sword

* Update stealthy_weapons.dm

* Update canes.dm

* Update canes.dm

* Ports weapon.dmi sprites from Polaris

* Update swords.dm

* Update swords.dm

* Update canes.dm

Co-authored-by: Atermonera <atermonera@gmail.com>
Co-authored-by: C.L <killer65311@gmail.com>

code/game/objects/items/weapons/canes.dm

@@ -24,10 +24,9 @@
 
 /obj/item/weapon/cane/concealed/Initialize()
 	. = ..()
-	var/obj/item/weapon/material/butterfly/switchblade/temp_blade = new(src)
+	var/obj/item/weapon/material/sword/katana/caneblade/temp_blade = new(src)
 	concealed_blade = temp_blade
-	temp_blade.active = TRUE
-	temp_blade.update_force()
+	temp_blade.attack_self()
 
 /obj/item/weapon/cane/concealed/attack_self(var/mob/user)
 	var/datum/gender/T = gender_datums[user.get_visible_gender()]
@@ -41,10 +40,11 @@
 		user.update_inv_l_hand(0)
 		user.update_inv_r_hand()
 		concealed_blade = null
+		update_icon()
 	else
 		..()
 
-/obj/item/weapon/cane/concealed/attackby(var/obj/item/weapon/material/butterfly/W, var/mob/user)
+/obj/item/weapon/cane/concealed/attackby(var/obj/item/weapon/material/sword/katana/caneblade/W, var/mob/user)
 	if(!src.concealed_blade && istype(W))
 		var/datum/gender/T = gender_datums[user.get_visible_gender()]
 		user.visible_message("<span class='warning'>[user] has sheathed \a [W] into [T.his] [src]!</span>", "You sheathe \the [W] into \the [src].")
@@ -63,7 +63,7 @@
 		item_state = initial(icon_state)
 	else
 		name = "cane shaft"
-		icon_state = "nullrod"
+		icon_state = "caneshaft"
 		item_state = "foldcane"
 
 /obj/item/weapon/cane/white
@@ -122,4 +122,4 @@
 
 	playsound(src, 'sound/weapons/empty.ogg', 50, 1)
 	add_fingerprint(user)
-	return TRUE
+	return TRUE

code/game/objects/items/weapons/material/swords.dm

@@ -23,4 +23,64 @@
 	name = "katana"
 	desc = "Woefully underpowered in D20. This one looks pretty sharp."
 	icon_state = "katana"
-	slot_flags = SLOT_BELT | SLOT_BACK
+	slot_flags = SLOT_BELT | SLOT_BACK
+
+/obj/item/weapon/material/sword/katana/caneblade
+	name = "cane blade"
+	desc = "Used for making people fall over instead of helping them stand up."
+	icon_state = "caneblade"
+	item_state = "caneblade"
+
+/obj/item/weapon/material/sword/rapier
+	name = "rapier"
+	desc = "A slender, fancy and sharply pointed sword."
+	icon_state = "rapier"
+	item_state = "rapier"
+	slot_flags = SLOT_BELT
+	applies_material_colour = 0
+	attack_verb = list("attacked", "stabbed", "prodded", "poked", "lunged")
+	edge = 0 //rapiers are pointy, but not cutty like other swords
+
+/obj/item/weapon/material/sword/longsword
+	name = "longsword"
+	desc = "A double-edged large blade."
+	icon_state = "longsword"
+	item_state = "longsword"
+	applies_material_colour = 0
+	slot_flags = SLOT_BELT | SLOT_BACK
+	can_cleave = TRUE
+
+/obj/item/weapon/material/sword/sabre
+	name = "sabre"
+	desc = "A sharp curved sword, a favored weapon of pirates far in the past."
+	icon_state = "sabre"
+	item_state = "sabre"
+	applies_material_colour = 0 //messes up the hilt color otherwise
+	slot_flags = SLOT_BELT
+
+/obj/item/weapon/material/sword/battleaxe
+	name = "battleaxe"
+	desc = "A one handed battle axe, still a deadly weapon."
+	icon_state = "axe"
+	item_state = "axe"
+	slot_flags = SLOT_BACK
+	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
+	applies_material_colour = 0
+	drop_sound = 'sound/items/drop/axe.ogg'
+	pickup_sound = 'sound/items/pickup/axe.ogg'
+	can_cleave = TRUE
+
+/obj/item/weapon/material/sword/battleaxe/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+	if(unique_parry_check(user, attacker, damage_source) && prob(10))
+		user.visible_message("<span class='danger'>\The [user] parries [attack_text] with \the [src]!</span>")
+		playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1)
+		return 1
+	return 0
+
+/obj/item/weapon/material/sword/gladius
+	name = "gladius"
+	desc = "An ancient short sword, designed to stab and cut."
+	icon_state = "gladius"
+	item_state = "gladius"
+	applies_material_colour = 0
+	slot_flags = SLOT_BELT