paths

code/__DEFINES/surgery.dm

@@ -149,7 +149,7 @@ See also /datum/surgery_step/saw_off_limb/failure var/list/cannot_hack, listing
 #define SURGERY_TOOLS_SEVER_BONE list(\
 	/obj/item/tool/surgery/circular_saw = SURGERY_TOOL_MULT_IDEAL,\
 	/obj/item/weapon/twohanded/fireaxe = SURGERY_TOOL_MULT_SUBOPTIMAL,\
-	/obj/item/weapon/claymore/mercsword/machete = SURGERY_TOOL_MULT_SUBOPTIMAL,\
+	/obj/item/weapon/sword/machete = SURGERY_TOOL_MULT_SUBOPTIMAL,\
 	/obj/item/tool/hatchet = SURGERY_TOOL_MULT_SUBSTITUTE,\
 	/obj/item/tool/kitchen/knife/butcher = SURGERY_TOOL_MULT_SUBSTITUTE,\
 	/obj/item/attachable/bayonet = SURGERY_TOOL_MULT_BAD_SUBSTITUTE\

code/game/gamemodes/colonialmarines/huntergames.dm

@@ -11,11 +11,11 @@
 
 #define HUNTER_GOOD_ITEM  pick(\
 								50; /obj/item/weapon/shield/riot, \
-								100; /obj/item/weapon/claymore, \
-								100; /obj/item/weapon/katana, \
+								100; /obj/item/weapon/sword, \
+								100; /obj/item/weapon/sword/katana, \
 								100; /obj/item/weapon/harpoon/yautja, \
-								150; /obj/item/weapon/claymore/mercsword, \
-								200; /obj/item/weapon/claymore/mercsword/machete, \
+								150; /obj/item/weapon/sword, \
+								200; /obj/item/weapon/sword/machete, \
 								125; /obj/item/weapon/twohanded/fireaxe, \
 \
 								100; /obj/item/device/binoculars, \
@@ -51,7 +51,7 @@
 								300; /obj/item/tool/hatchet, \
 								100; /obj/item/tool/scythe, \
 								100; /obj/item/tool/kitchen/knife/butcher, \
-								50; /obj/item/weapon/katana/replica, \
+								50; /obj/item/weapon/sword/katana/replica, \
 								100; /obj/item/weapon/harpoon, \
 								75; /obj/item/attachable/bayonet, \
 								200; /obj/item/weapon/throwing_knife, \

code/game/machinery/vending/cm_vending.dm

@@ -245,7 +245,7 @@ GLOBAL_LIST_EMPTY(vending_products)
 				return
 	//Machete holsters handling
 	else if(istype(item_to_stock, /obj/item/storage/large_holster/machete))
-		var/obj/item/weapon/claymore/mercsword/machete/mac = locate(/obj/item/weapon/claymore/mercsword/machete) in item_to_stock
+		var/obj/item/weapon/sword/machete/mac = locate(/obj/item/weapon/sword/machete) in item_to_stock
 		if(!mac)
 			if(user)
 				to_chat(user, SPAN_WARNING("\The [item_to_stock] is empty."))

code/game/objects/items/XMAS.dm

@@ -66,7 +66,7 @@
 			gift_type = pick(
 			/obj/item/weapon/gun/revolver/mateba,
 			/obj/item/weapon/gun/pistol/heavy,
-			/obj/item/weapon/claymore,
+			/obj/item/weapon/sword,
 			/obj/item/weapon/energy/sword/green,
 			/obj/item/weapon/energy/sword/red,
 			/obj/item/attachable/heavy_barrel,

code/game/objects/items/misc.dm

@@ -141,13 +141,13 @@
 	. = ..()
 
 /obj/item/weapon/pole/fancy_cane/this_is_a_knife/machete
-	stored_item = new /obj/item/weapon/claymore/mercsword/machete
+	stored_item = new /obj/item/weapon/sword/machete
 
 /obj/item/weapon/pole/fancy_cane/this_is_a_knife/ceremonial_sword
-	stored_item = new /obj/item/weapon/claymore/mercsword/ceremonial
+	stored_item = new /obj/item/weapon/sword/ceremonial
 
 /obj/item/weapon/pole/fancy_cane/this_is_a_knife/katana
-	stored_item = new /obj/item/weapon/katana
+	stored_item = new /obj/item/weapon/sword/katana
 
 // IN SHOTGUNS.DM!!
 

code/game/objects/items/storage/large_holster.dm

@@ -75,20 +75,20 @@
 	desc = "A large leather scabbard used to carry a M2132 machete. It can be strapped to the back or the armor."
 	icon_state = "machete_holster"
 	flags_equip_slot = SLOT_WAIST|SLOT_BACK
-	can_hold = list(/obj/item/weapon/claymore/mercsword/machete)
+	can_hold = list(/obj/item/weapon/sword/machete)
 
 /obj/item/storage/large_holster/machete/full/fill_preset_inventory()
-	new /obj/item/weapon/claymore/mercsword/machete(src)
+	new /obj/item/weapon/sword/machete(src)
 
 /obj/item/storage/large_holster/machete/arnold
 	name = "\improper QH20 pattern M2100 custom machete scabbard"
 	desc = "A large leather scabbard used to carry a M2100 \"Ngájhe\" machete. It can be strapped to the back or the armor."
 	icon_state = "arnold-machete-pouch"
 	flags_equip_slot = SLOT_WAIST|SLOT_BACK
-	can_hold = list(/obj/item/weapon/claymore/mercsword/machete)
+	can_hold = list(/obj/item/weapon/sword/machete)
 
 /obj/item/storage/large_holster/machete/arnold/full/fill_preset_inventory()
-	new /obj/item/weapon/claymore/mercsword/machete/arnold(src)
+	new /obj/item/weapon/sword/machete/arnold(src)
 
 /obj/item/storage/large_holster/katana
 	name = "\improper katana scabbard"
@@ -97,21 +97,21 @@
 	force = 12
 	attack_verb = list("bludgeoned", "struck", "cracked")
 	flags_equip_slot = SLOT_WAIST|SLOT_BACK
-	can_hold = list(/obj/item/weapon/katana)
+	can_hold = list(/obj/item/weapon/sword/katana)
 
 /obj/item/storage/large_holster/katana/full/fill_preset_inventory()
-	new /obj/item/weapon/katana(src)
+	new /obj/item/weapon/sword/katana(src)
 
 /obj/item/storage/large_holster/ceremonial_sword
 	name = "ceremonial sword scabbard"
 	desc = "A large, vibrantly colored scabbard used to carry a ceremonial sword."
 	icon_state = "ceremonial_sword_holster"//object icon is duplicate of katana holster, needs new icon at some point.
 	force = 12
 	flags_equip_slot = SLOT_WAIST
-	can_hold = list(/obj/item/weapon/claymore/mercsword/ceremonial)
+	can_hold = list(/obj/item/weapon/sword/ceremonial)
 
 /obj/item/storage/large_holster/ceremonial_sword/full/fill_preset_inventory()
-	new /obj/item/weapon/claymore/mercsword/ceremonial(src)
+	new /obj/item/weapon/sword/ceremonial(src)
 
 /obj/item/storage/large_holster/m39
 	name = "\improper M276 pattern M39 holster rig"

code/game/objects/items/storage/pouch.dm

@@ -1372,7 +1372,7 @@
 	item_state = "machete_holster"
 	max_w_class = SIZE_LARGE
 	storage_flags = STORAGE_FLAGS_POUCH|STORAGE_USING_DRAWING_METHOD|STORAGE_ALLOW_QUICKDRAW
-	can_hold = list(/obj/item/weapon/claymore/mercsword/machete)
+	can_hold = list(/obj/item/weapon/sword/machete)
 
 	var/sheathe_sound = 'sound/weapons/gun_rifle_draw.ogg'
 	var/draw_sound = 'sound/weapons/gun_rifle_draw.ogg'
@@ -1392,4 +1392,4 @@
 	playsound(src, draw_sound, vol = 15, vary = TRUE)
 
 /obj/item/storage/pouch/machete/full/fill_preset_inventory()
-	new /obj/item/weapon/claymore/mercsword/machete(src)
+	new /obj/item/weapon/sword/machete(src)

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

@@ -1,38 +1,36 @@
-/obj/item/weapon/claymore
-	name = "claymore"
-	desc = "What are you standing around staring at this for? Get to killing!"
-	icon_state = "claymore"
-	item_state = "claymore"
+/obj/item/weapon/sword
+	name = "combat sword"
+	desc = "A dusty sword commonly seen in historical museums. Where you got this is a mystery, for sure. Only a mercenary would be nuts enough to carry one of these. Sharpened to deal massive damage."
+	icon_state = "mercsword"
+	item_state = "machete"
 	flags_atom = FPRINT|CONDUCT
 	flags_equip_slot = SLOT_WAIST
 	force = MELEE_FORCE_STRONG
 	throwforce = MELEE_FORCE_WEAK
 	sharp = IS_SHARP_ITEM_BIG
 	edge = 1
-	w_class = SIZE_MEDIUM
+	w_class = SIZE_LARGE
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	attack_speed = 9
 
-/obj/item/weapon/claymore/mercsword
-	name = "combat sword"
-	desc = "A dusty sword commonly seen in historical museums. Where you got this is a mystery, for sure. Only a mercenary would be nuts enough to carry one of these. Sharpened to deal massive damage."
-	icon_state = "mercsword"
-	item_state = "machete"
+/obj/item/weapon/sword/claymore
+	name = "claymore"
+	desc = "What are you standing around staring at this for? Get to killing!"
+	icon_state = "claymore"
+	item_state = "claymore"
 
-/obj/item/weapon/claymore/mercsword/ceremonial
+/obj/item/weapon/sword/ceremonial
 	name = "Ceremonial Sword"
 	desc = "A fancy ceremonial sword passed down from generation to generation. Despite this, it has been very well cared for, and is in top condition."
 	icon_state = "ceremonial"
-	item_state = "machete"
 
-/obj/item/weapon/claymore/mercsword/machete
+/obj/item/weapon/sword/machete
 	name = "\improper M2132 machete"
 	desc = "Latest issue of the USCM Machete. Great for clearing out jungle or brush on outlying colonies. Found commonly in the hands of scouts and trackers, but difficult to carry with the usual kit."
 	icon_state = "machete"
-	w_class = SIZE_LARGE
 
-/obj/item/weapon/claymore/mercsword/machete/attack_self(mob/user)
+/obj/item/weapon/sword/machete/attack_self(mob/user)
 	if(user.action_busy)
 		return
 
@@ -49,14 +47,13 @@
 
 	return ..()
 
-/obj/item/weapon/claymore/mercsword/machete/arnold
+/obj/item/weapon/sword/machete/arnold
 	name = "\improper M2100 \"Ngájhe\" machete"
 	desc = "An older issue USCM machete, never left testing. Designed in the Central African Republic. The notching made it hard to clean, and as such the USCM refused to adopt it - despite the superior bludgeoning power offered. Difficult to carry with the usual kit."
 	icon_state = "arnold-machete"
-	w_class = SIZE_LARGE
 	force = MELEE_FORCE_TIER_11
 
-/obj/item/weapon/claymore/hefa
+/obj/item/weapon/sword/hefa
 	name = "HEFA sword"
 	icon_state = "hefasword"
 	item_state = "hefasword"
@@ -65,15 +62,15 @@
 
 	var/primed = FALSE
 
-/obj/item/weapon/claymore/hefa/proc/apply_explosion_overlay()
+/obj/item/weapon/sword/hefa/proc/apply_explosion_overlay()
 	var/obj/effect/overlay/O = new /obj/effect/overlay(loc)
 	O.name = "grenade"
 	O.icon = 'icons/effects/explosion.dmi'
 	flick("grenade", O)
 	QDEL_IN(O, 7)
 	return
 
-/obj/item/weapon/claymore/hefa/attack_self(mob/user)
+/obj/item/weapon/sword/hefa/attack_self(mob/user)
 	..()
 
 	primed = !primed
@@ -82,7 +79,7 @@
 		msg = "You de-activate \the [src]!"
 	to_chat(user, SPAN_NOTICE(msg))
 
-/obj/item/weapon/claymore/hefa/attack(mob/target, mob/user)
+/obj/item/weapon/sword/hefa/attack(mob/target, mob/user)
 	. = ..()
 	if(!primed)
 		return
@@ -97,22 +94,15 @@
 	cell_explosion(epicenter, 40, 18, EXPLOSION_FALLOFF_SHAPE_LINEAR, user.dir, cause_data)
 	qdel(src)
 
-/obj/item/weapon/katana
+/obj/item/weapon/sword/katana
 	name = "katana"
 	desc = "A finely made Japanese sword, with a well sharpened blade. The blade has been filed to a molecular edge, and is extremely deadly. Commonly found in the hands of mercenaries and yakuza."
 	icon_state = "katana"
-	flags_atom = FPRINT|CONDUCT
+	item_state = "katana"
 	force = MELEE_FORCE_VERY_STRONG
-	throwforce = MELEE_FORCE_WEAK
-	sharp = IS_SHARP_ITEM_BIG
-	edge = 1
-	w_class = SIZE_MEDIUM
-	hitsound = 'sound/weapons/bladeslice.ogg'
-	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
-	attack_speed = 9
 
 //To do: replace the toys.
-/obj/item/weapon/katana/replica
+/obj/item/weapon/sword/katana/replica
 	name = "replica katana"
 	desc = "A cheap knock-off commonly found in regular knife stores. Can still do some damage."
 	force = MELEE_FORCE_WEAK

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

@@ -89,7 +89,7 @@
 
 /obj/item/weapon/shield/riot/attackby(obj/item/W as obj, mob/user as mob)
 	if(cooldown < world.time - 25)
-		if(istype(W, /obj/item/weapon/baton) || istype(W, /obj/item/weapon/claymore) || istype(W, /obj/item/weapon/baseballbat) || istype(W, /obj/item/weapon/katana) || istype(W, /obj/item/weapon/twohanded/fireaxe) || istype(W, /obj/item/weapon/chainofcommand))
+		if(istype(W, /obj/item/weapon/baton) || istype(W, /obj/item/weapon/sword) || istype(W, /obj/item/weapon/baseballbat) || istype(W, /obj/item/weapon/sword/katana) || istype(W, /obj/item/weapon/twohanded/fireaxe) || istype(W, /obj/item/weapon/chainofcommand))
 			user.visible_message(SPAN_WARNING("[user] bashes [src] with [W]!"))
 			playsound(user.loc, 'sound/effects/shieldbash.ogg', 25, 1)
 			cooldown = world.time

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

@@ -167,7 +167,7 @@
 	update_icon(user)
 
 
-/obj/item/weapon/katana/sharp
+/obj/item/weapon/sword/katana/sharp
 	name = "absurdly sharp katana"
 	desc = "<p>That's it. I'm sick of all this \"Masterwork Bastard Sword\" bullshit that's going on in CM-SS13 right now. Katanas deserve much better than that. Much, much better than that.</p>\
 <p>I should know what I'm talking about. I myself commissioned a genuine katana in Japan for 2,400,000 Yen (that's about $20,000) and have been practicing with it for almost 2 years now. I can even cut slabs of solid steel with my katana.</p>\
@@ -190,7 +190,7 @@
 
 	attack_verb = list("sliced", "diced", "cut")
 
-/obj/item/weapon/katana/sharp/attack(mob/living/M, mob/living/user)
+/obj/item/weapon/sword/katana/sharp/attack(mob/living/M, mob/living/user)
 
 	if(flags_item & NOBLUDGEON)
 		return
@@ -223,7 +223,7 @@
 
 
 	//if the target also has a katana (and we aren't attacking ourselves), we add some suspense
-	if( ( istype(M.get_active_hand(), /obj/item/weapon/katana) || istype(M.get_inactive_hand(), /obj/item/weapon/katana) ) && M != user )
+	if( ( istype(M.get_active_hand(), /obj/item/weapon/sword/katana) || istype(M.get_inactive_hand(), /obj/item/weapon/sword/katana) ) && M != user )
 
 		if(prob(50))
 			user.visible_message(SPAN_DANGER("[M] and [user] cross blades!"))

code/game/objects/structures/flora.dm

@@ -717,7 +717,7 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE.
 	//hatchets and shiet can clear away undergrowth
 	if(I && (I.sharp >= IS_SHARP_ITEM_ACCURATE) && !stump)
 		var/damage = rand(2,5)
-		if(istype(I,/obj/item/weapon/claymore/mercsword))
+		if(istype(I,/obj/item/weapon/sword))
 			damage = rand(8,18)
 		if(indestructable)
 			//this bush marks the edge of the map, you can't destroy it

code/modules/clothing/suits/armor.dm

@@ -215,7 +215,7 @@
 	time_to_unequip = 20
 	time_to_equip = 20
 	allowed = list(
-		/obj/item/weapon/claymore/mercsword,
+		/obj/item/weapon/sword,
 		/obj/item/weapon/shield/riot,
 		/obj/item/device/flashlight,
 	)

code/modules/clothing/suits/marine_armor.dm

@@ -292,7 +292,7 @@
 		/obj/item/storage/backpack/general_belt,
 		/obj/item/device/hailer,
 		/obj/item/storage/belt/gun,
-		/obj/item/weapon/claymore/mercsword/ceremonial,
+		/obj/item/weapon/sword/ceremonial,
 		/obj/item/device/motiondetector,
 		/obj/item/device/walkman,
 	)
@@ -1052,7 +1052,7 @@
 		/obj/item/tool/crowbar,
 		/obj/item/storage/large_holster/katana,
 		/obj/item/storage/large_holster/machete,
-		/obj/item/weapon/claymore/mercsword/machete,
+		/obj/item/weapon/sword/machete,
 		/obj/item/attachable/bayonet,
 		/obj/item/device/motiondetector,
 		/obj/item/tool/crew_monitor,
@@ -1569,7 +1569,7 @@
 		/obj/item/tool/lighter,
 		/obj/item/explosive/grenade,
 		/obj/item/storage/bible,
-		/obj/item/weapon/claymore/mercsword/machete,
+		/obj/item/weapon/sword/machete,
 		/obj/item/attachable/bayonet,
 		/obj/item/device/motiondetector,
 		/obj/item/device/walkman,
@@ -1604,7 +1604,7 @@
 		/obj/item/tool/lighter,
 		/obj/item/explosive/grenade,
 		/obj/item/storage/bible,
-		/obj/item/weapon/claymore/mercsword/machete,
+		/obj/item/weapon/sword/machete,
 		/obj/item/attachable/bayonet,
 		/obj/item/device/motiondetector,
 		/obj/item/device/walkman,
@@ -1709,7 +1709,7 @@
 		/obj/item/storage/backpack/general_belt,
 		/obj/item/device/hailer,
 		/obj/item/storage/belt/gun,
-		/obj/item/weapon/claymore/mercsword/ceremonial,
+		/obj/item/weapon/sword/ceremonial,
 		/obj/item/device/motiondetector,
 		/obj/item/device/walkman,
 	)
@@ -1765,7 +1765,7 @@
 		/obj/item/tool/lighter,
 		/obj/item/explosive/grenade,
 		/obj/item/storage/bible,
-		/obj/item/weapon/claymore/mercsword/machete,
+		/obj/item/weapon/sword/machete,
 		/obj/item/attachable/bayonet,
 		/obj/item/device/motiondetector,
 		/obj/item/device/walkman,

code/modules/cm_preds/thrall_procs.dm

@@ -60,11 +60,11 @@
 			if(YAUTJA_GEAR_STICK)
 				spawned_weapon = new /obj/item/weapon/yautja/combistick(wearer.loc)
 			if(YAUTJA_THRALL_GEAR_MACHETE)
-				spawned_weapon = new /obj/item/weapon/claymore/mercsword/machete(wearer.loc)
+				spawned_weapon = new /obj/item/weapon/sword/machete(wearer.loc)
 			if(YAUTJA_THRALL_GEAR_RAPIER)
-				spawned_weapon = new /obj/item/weapon/claymore/mercsword/ceremonial(wearer.loc)
+				spawned_weapon = new /obj/item/weapon/sword/ceremonial(wearer.loc)
 			if(YAUTJA_THRALL_GEAR_CLAYMORE)
-				spawned_weapon = new /obj/item/weapon/claymore(wearer.loc)
+				spawned_weapon = new /obj/item/weapon/sword(wearer.loc)
 			if(YAUTJA_THRALL_GEAR_FIREAXE)
 				spawned_weapon = new /obj/item/weapon/twohanded/fireaxe(wearer.loc)
 

code/modules/gear_presets/corpses.dm

@@ -970,7 +970,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat, WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot, WEAR_R_HAND)
-	new_human.equip_to_slot_or_del(new /obj/item/weapon/claymore/mercsword, WEAR_L_HAND)
+	new_human.equip_to_slot_or_del(new /obj/item/weapon/sword, WEAR_L_HAND)
 
 	var/obj/item/lantern = new /obj/item/device/flashlight/lantern(new_human)
 	lantern.name = "Beacon of Holy Light"