diff --git a/code/__DEFINES/surgery.dm b/code/__DEFINES/surgery.dm index 1bdf2318d250..9257172eeee5 100644 --- a/code/__DEFINES/surgery.dm +++ b/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\ diff --git a/code/game/gamemodes/colonialmarines/huntergames.dm b/code/game/gamemodes/colonialmarines/huntergames.dm index c8c90fa51c0c..bd5302bf7ec0 100644 --- a/code/game/gamemodes/colonialmarines/huntergames.dm +++ b/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, \ diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm index 861f5b37ebca..43ff59488aa3 100644 --- a/code/game/machinery/vending/cm_vending.dm +++ b/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.")) diff --git a/code/game/objects/items/XMAS.dm b/code/game/objects/items/XMAS.dm index 4b7bca2fb319..b10ea2035d96 100644 --- a/code/game/objects/items/XMAS.dm +++ b/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, diff --git a/code/game/objects/items/misc.dm b/code/game/objects/items/misc.dm index abd8404d6e25..50c5cd75551b 100644 --- a/code/game/objects/items/misc.dm +++ b/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!! diff --git a/code/game/objects/items/storage/large_holster.dm b/code/game/objects/items/storage/large_holster.dm index b4a6c3a8c1af..1d37a542bad4 100644 --- a/code/game/objects/items/storage/large_holster.dm +++ b/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,10 +97,10 @@ 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" @@ -108,10 +108,10 @@ 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" diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 48eb322f2093..086b1b603d8a 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/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) diff --git a/code/game/objects/items/weapons/blades.dm b/code/game/objects/items/weapons/blades.dm index 4b4b31539064..3237bd131128 100644 --- a/code/game/objects/items/weapons/blades.dm +++ b/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,7 +62,7 @@ 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' @@ -73,7 +70,7 @@ 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 diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 20bf8ac951e9..0497a410a373 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/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/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 diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index aaa2a33d4e63..efa898ba9937 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/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 = "

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.

\

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.

\ @@ -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!")) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 9c1f46de50d5..52c715ed973d 100644 --- a/code/game/objects/structures/flora.dm +++ b/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 diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index cc7fee7724f4..2c023fed2ed7 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/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, ) diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index 94361c420d2b..e736ce18a129 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/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, diff --git a/code/modules/cm_preds/thrall_procs.dm b/code/modules/cm_preds/thrall_procs.dm index 50a2800ef855..8ea0f2abb51a 100644 --- a/code/modules/cm_preds/thrall_procs.dm +++ b/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) diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm index b66f3b236e3b..70f4e2206002 100644 --- a/code/modules/gear_presets/corpses.dm +++ b/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" diff --git a/code/modules/gear_presets/fun.dm b/code/modules/gear_presets/fun.dm index e3511722af36..23350768a692 100644 --- a/code/modules/gear_presets/fun.dm +++ b/code/modules/gear_presets/fun.dm @@ -191,8 +191,8 @@ var/satchel_success = new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK) var/waist_success = new_human.equip_to_slot_or_del(new /obj/item/storage/belt/grenade/large(new_human), WEAR_WAIST) var/pouch_r_success = new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/weapon/claymore/hefa(new_human), WEAR_R_HAND) - new_human.equip_to_slot_or_del(new /obj/item/weapon/claymore/hefa(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/sword/hefa(new_human), WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/weapon/sword/hefa(new_human), WEAR_IN_BACK) if(shoes_success) var/obj/item/clothing/shoes/marine/knife/shoes = new_human.shoes diff --git a/code/modules/gear_presets/other.dm b/code/modules/gear_presets/other.dm index b60e3f0314e2..0308c8d9e3cb 100644 --- a/code/modules/gear_presets/other.dm +++ b/code/modules/gear_presets/other.dm @@ -694,7 +694,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" @@ -720,7 +720,7 @@ new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_WAIST) 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" @@ -746,7 +746,7 @@ 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/tool/crowbar, WEAR_WAIST) - 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" diff --git a/code/modules/gear_presets/wo.dm b/code/modules/gear_presets/wo.dm index 3b4671a6517f..acc795dc6882 100644 --- a/code/modules/gear_presets/wo.dm +++ b/code/modules/gear_presets/wo.dm @@ -76,7 +76,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/command(new_human), WEAR_BODY) //jacket new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/SO(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/claymore/mercsword/ceremonial(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/sword/ceremonial(new_human), WEAR_J_STORE) //waist new_human.equip_to_slot_or_del(new sidearmpath(new_human), WEAR_WAIST) //limbs diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm index 767f50fc9750..ea075080121b 100644 --- a/code/modules/surgery/generic.dm +++ b/code/modules/surgery/generic.dm @@ -390,7 +390,7 @@ /obj/item/tool/surgery/circular_saw = SURGERY_TOOL_MULT_IDEAL, /obj/item/attachable/bayonet = SURGERY_TOOL_MULT_SUBOPTIMAL, /obj/item/weapon/twohanded/fireaxe = SURGERY_TOOL_MULT_SUBSTITUTE, - /obj/item/weapon/claymore/mercsword/machete = SURGERY_TOOL_MULT_SUBSTITUTE, + /obj/item/weapon/sword/machete = SURGERY_TOOL_MULT_SUBSTITUTE, /obj/item/tool/hatchet = SURGERY_TOOL_MULT_BAD_SUBSTITUTE, /obj/item/tool/kitchen/knife/butcher = SURGERY_TOOL_MULT_BAD_SUBSTITUTE, ) diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm index ed7688070a2f..748d4e5cdbfc 100644 --- a/maps/map_files/DesertDam/Desert_Dam.dmm +++ b/maps/map_files/DesertDam/Desert_Dam.dmm @@ -20754,7 +20754,7 @@ /area/desert_dam/interior/dam_interior/tech_storage) "bmo" = ( /obj/structure/safe, -/obj/item/weapon/katana/replica, +/obj/item/weapon/sword/katana/replica, /obj/item/reagent_container/food/drinks/bottle/absinthe, /obj/structure/machinery/light{ dir = 1 diff --git a/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm b/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm index 1dd3650ad747..d0ebbc5039d5 100644 --- a/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm +++ b/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm @@ -298,7 +298,7 @@ dir = 1; icon_state = "phoronrwindow" }, -/obj/item/weapon/katana{ +/obj/item/weapon/sword/katana{ color = "#b2ffff"; desc = "A finely made Japanese sword, with a well sharpened blade. It appears to have cobalt infused within the blade. There are Japanese engravings on the blade which say 'He who wields this sword becomes the next Titan.'."; name = "ancient katana"; @@ -548,10 +548,10 @@ /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ pixel_x = 7 }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ pixel_x = -7 }, /turf/open/floor/sandstone/runed, diff --git a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm index 0fd8b269d33c..5da17a318887 100644 --- a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm +++ b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm @@ -15559,7 +15559,7 @@ /area/prison/command/secretary_office) "aRX" = ( /obj/structure/surface/rack, -/obj/item/weapon/katana/replica, +/obj/item/weapon/sword/katana/replica, /turf/open/floor/wood, /area/prison/command/office) "aRY" = ( diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm index 0d4ed21934d0..ae60874edc68 100644 --- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm +++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm @@ -35733,7 +35733,7 @@ /area/fiorina/station/security) "vKP" = ( /obj/structure/surface/rack, -/obj/item/weapon/katana, +/obj/item/weapon/sword/katana, /turf/open/floor/wood, /area/fiorina/station/security/wardens) "vLH" = ( diff --git a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm index aaaaeb0c1199..8d81f12899fb 100644 --- a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm +++ b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm @@ -26844,7 +26844,7 @@ /area/ice_colony/underground/storage/highsec) "bCS" = ( /obj/structure/safe, -/obj/item/weapon/katana/replica, +/obj/item/weapon/sword/katana/replica, /obj/item/reagent_container/food/drinks/bottle/absinthe, /turf/open/floor{ dir = 1; diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm index 336dc6a90212..3d97333ad161 100644 --- a/maps/map_files/LV624/LV624.dmm +++ b/maps/map_files/LV624/LV624.dmm @@ -4035,7 +4035,7 @@ icon_state = "Synthetic_Template"; name = "Eternal guardian" }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ layer = 3.1; pixel_x = -6; pixel_y = 7 @@ -15262,7 +15262,7 @@ /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "idz" = ( -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ pixel_x = 6; pixel_y = 7 }, @@ -19886,7 +19886,7 @@ /turf/open/gm/coast/north, /area/lv624/ground/river/west_river) "thn" = ( -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ pixel_x = -6; pixel_y = 7 }, @@ -21227,7 +21227,7 @@ icon_state = "Synthetic_Template"; name = "Eternal guardian" }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ layer = 3.1; pixel_x = 6; pixel_y = 7 diff --git a/maps/map_files/LV624/maintemple/1.intact.dmm b/maps/map_files/LV624/maintemple/1.intact.dmm index 9289d3454327..8f7c741d80c6 100644 --- a/maps/map_files/LV624/maintemple/1.intact.dmm +++ b/maps/map_files/LV624/maintemple/1.intact.dmm @@ -474,7 +474,7 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) "iN" = ( -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ pixel_x = -6; pixel_y = 7 }, @@ -885,7 +885,7 @@ icon_state = "Synthetic_Template"; name = "Eternal guardian" }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ layer = 3.1; pixel_x = 6; pixel_y = 7 @@ -1132,7 +1132,7 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple/powered) "BI" = ( -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ pixel_x = 6; pixel_y = 7 }, @@ -1215,7 +1215,7 @@ icon_state = "Synthetic_Template"; name = "Eternal guardian" }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ layer = 3.1; pixel_x = -6; pixel_y = 7 @@ -1257,7 +1257,7 @@ dir = 4; health = 80 }, -/obj/item/weapon/claymore/mercsword/machete{ +/obj/item/weapon/sword/machete{ desc = "This machete seems not standard issue, indeed it seems to be an ancient military design. Smells like the jungle."; name = "\improper Dutch's Machete" }, diff --git a/maps/map_files/LV624/maintemple/2.flooded.dmm b/maps/map_files/LV624/maintemple/2.flooded.dmm index bcbf6a54774c..8643676807fc 100644 --- a/maps/map_files/LV624/maintemple/2.flooded.dmm +++ b/maps/map_files/LV624/maintemple/2.flooded.dmm @@ -260,7 +260,7 @@ /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/barrens/south_eastern_barrens) "hu" = ( -/obj/item/weapon/claymore/mercsword, +/obj/item/weapon/sword, /turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/caves/sand_temple) "hA" = ( @@ -686,7 +686,7 @@ icon_state = "Synthetic_Template"; name = "Eternal guardian" }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ layer = 3.1; pixel_x = 6; pixel_y = 7 @@ -1012,7 +1012,7 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) "BI" = ( -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ pixel_x = 6; pixel_y = 7 }, @@ -1096,7 +1096,7 @@ icon_state = "Synthetic_Template"; name = "Eternal guardian" }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ layer = 3.1; pixel_x = -6; pixel_y = 7 diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm index e03bf8cdcbe4..bc8edbd63429 100644 --- a/maps/map_files/New_Varadero/New_Varadero.dmm +++ b/maps/map_files/New_Varadero/New_Varadero.dmm @@ -4928,7 +4928,7 @@ "dhQ" = ( /obj/effect/decal/cleanable/blood, /obj/effect/landmark/corpsespawner/colonist, -/obj/item/weapon/katana, +/obj/item/weapon/sword/katana, /turf/open/floor/carpet, /area/varadero/interior/chapel) "dhV" = ( diff --git a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm index eb4f5fdb6025..af8ab7799fdb 100644 --- a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm +++ b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm @@ -11823,7 +11823,7 @@ }, /area/whiskey_outpost/inside/hospital/triage) "TD" = ( -/obj/item/weapon/claymore/mercsword/machete, +/obj/item/weapon/sword/machete, /turf/open/jungle{ bushes_spawn = 0; icon_state = "grass_impenetrable" diff --git a/maps/predship/huntership.dmm b/maps/predship/huntership.dmm index f8b3028a68ff..7c5d633286f0 100644 --- a/maps/predship/huntership.dmm +++ b/maps/predship/huntership.dmm @@ -672,7 +672,7 @@ /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" }, -/obj/item/weapon/claymore/mercsword/machete/arnold{ +/obj/item/weapon/sword/machete/arnold{ anchored = 1; desc = "Won by an Elder during their youthful hunting days. None are allowed to touch it."; name = "\improper Dutch's Machete" @@ -1271,36 +1271,36 @@ color = "#6b675e"; layer = 2.79 }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ attack_speed = 12; force = 25; pixel_x = 12 }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ attack_speed = 12; force = 25; pixel_x = 8 }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ attack_speed = 12; force = 25; pixel_x = 4 }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ attack_speed = 12; force = 25; pixel_x = -4 }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ attack_speed = 12; force = 25; pixel_x = -12 }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ attack_speed = 12; force = 25 }, -/obj/item/weapon/claymore/mercsword{ +/obj/item/weapon/sword{ attack_speed = 12; force = 25; pixel_x = -8 @@ -1883,24 +1883,24 @@ color = "#6b675e"; layer = 2.79 }, -/obj/item/weapon/claymore{ +/obj/item/weapon/sword{ attack_speed = 12; force = 25; name = "duelling claymore" }, -/obj/item/weapon/claymore{ +/obj/item/weapon/sword{ attack_speed = 12; force = 25; name = "duelling claymore"; pixel_x = -5 }, -/obj/item/weapon/claymore{ +/obj/item/weapon/sword{ attack_speed = 12; force = 25; name = "duelling claymore"; pixel_x = 5 }, -/obj/item/weapon/claymore{ +/obj/item/weapon/sword{ attack_speed = 12; force = 25; name = "duelling claymore"; @@ -1955,7 +1955,7 @@ color = "#6b675e" }, /obj/item/storage/large_holster/katana, -/obj/item/weapon/katana, +/obj/item/weapon/sword/katana, /turf/open/floor/corsat{ dir = 1; icon_state = "squareswood" @@ -2246,7 +2246,7 @@ /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" }, -/obj/item/weapon/claymore/mercsword/ceremonial, +/obj/item/weapon/sword/ceremonial, /turf/open/floor/corsat{ dir = 1; icon_state = "squareswood" diff --git a/maps/predship/regular.dmm b/maps/predship/regular.dmm index 93392c6b7f5e..895e8ae84c91 100644 --- a/maps/predship/regular.dmm +++ b/maps/predship/regular.dmm @@ -451,7 +451,7 @@ /area/yautja) "bN" = ( /obj/structure/surface/table/reinforced, -/obj/item/weapon/katana, +/obj/item/weapon/sword/katana, /obj/structure/window/reinforced{ dir = 4 }, @@ -1053,12 +1053,12 @@ /area/yautja) "cZ" = ( /obj/structure/surface/table/reinforced, -/obj/item/weapon/claymore/mercsword, -/obj/item/weapon/claymore/mercsword, -/obj/item/weapon/claymore/mercsword, -/obj/item/weapon/claymore/mercsword, -/obj/item/weapon/claymore/mercsword, -/obj/item/weapon/claymore/mercsword, +/obj/item/weapon/sword, +/obj/item/weapon/sword, +/obj/item/weapon/sword, +/obj/item/weapon/sword, +/obj/item/weapon/sword, +/obj/item/weapon/sword, /turf/open/floor/holofloor{ dir = 2; icon_state = "cult"