diff --git a/code/game/objects/items/melee/blunt.dm b/code/game/objects/items/melee/blunt.dm new file mode 100644 index 000000000000..e02096d23b82 --- /dev/null +++ b/code/game/objects/items/melee/blunt.dm @@ -0,0 +1,36 @@ +/obj/item/melee/brass_knuckles + name = "spiked brass knuckles" + desc = "spikey." + icon_state = "powerfist" + item_state = "powerfist" + hitsound = 'sound/weapons/melee/stab_hit.ogg' + pickup_sound = 'sound/weapons/melee/general_pickup.ogg' + flags_1 = CONDUCT_1 + attack_verb = list("punched", "jabed", "clocked", "nailed", "bludgeoned", "whacked", "bonked") + force = 20 + throwforce = 10 + throw_range = 7 + w_class = WEIGHT_CLASS_SMALL + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 40) + resistance_flags = FIRE_PROOF + +/obj/item/melee/sledgehammer + name = "sledgehammer" + icon_state = "sledgehammer" + icon = 'icons/obj/weapon/blunt.dmi' + //lefthand_file = 'icons/mob/inhands/weapons/blunt_lefthand.dmi' + //righthand_file = 'icons/mob/inhands/weapons/blunt_righthand.dmi' + force = 5 + throwforce = 15 + w_class = WEIGHT_CLASS_BULKY + slot_flags = ITEM_SLOT_BACK + attack_cooldown = 12 + attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") + hitsound = list('sound/weapons/melee/heavyblunt_hit1.ogg', 'sound/weapons/melee/heavyblunt_hit2.ogg', 'sound/weapons/melee/heavyblunt_hit3.ogg') + pickup_sound = 'sound/weapons/melee/heavy_pickup.ogg' + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30) + resistance_flags = FIRE_PROOF + +/obj/item/melee/sledgehammer/ComponentInitialize() + . = ..() + AddComponent(/datum/component/two_handed, force_unwielded = force, force_wielded = 30, icon_wielded="[base_icon_state]") diff --git a/code/game/objects/items/melee/melee.dm b/code/game/objects/items/melee/melee.dm index 325f30c62479..89f8ad44c07a 100644 --- a/code/game/objects/items/melee/melee.dm +++ b/code/game/objects/items/melee/melee.dm @@ -196,22 +196,6 @@ else qdel(target) -/obj/item/melee/brass_knuckles - name = "spiked brass knuckles" - desc = "spikey." - icon_state = "powerfist" - item_state = "powerfist" - hitsound = 'sound/weapons/melee/stab_hit.ogg' - pickup_sound = 'sound/weapons/melee/general_pickup.ogg' - flags_1 = CONDUCT_1 - attack_verb = list("punched", "jabed", "clocked", "nailed", "bludgeoned", "whacked", "bonked") - force = 20 - throwforce = 10 - throw_range = 7 - w_class = WEIGHT_CLASS_SMALL - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 40) - resistance_flags = FIRE_PROOF - /obj/item/wirerod name = "wired rod" desc = "A rod with some wire wrapped around the top. It'd be easy to attach something to the top bit." diff --git a/shiptest.dme b/shiptest.dme index cddc81392f67..a9215c128022 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -1320,6 +1320,7 @@ #include "code\game\objects\items\implants\implantpad.dm" #include "code\game\objects\items\implants\implantuplink.dm" #include "code\game\objects\items\melee\axe.dm" +#include "code\game\objects\items\melee\blunt.dm" #include "code\game\objects\items\melee\chainsaw.dm" #include "code\game\objects\items\melee\dualenergy.dm" #include "code\game\objects\items\melee\energy.dm"