Skip to content

Commit

Permalink
the sledge
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed Oct 1, 2024
1 parent 5f429b7 commit b50d974
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 16 deletions.
36 changes: 36 additions & 0 deletions code/game/objects/items/melee/blunt.dm
Original file line number Diff line number Diff line change
@@ -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]")
16 changes: 0 additions & 16 deletions code/game/objects/items/melee/melee.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
1 change: 1 addition & 0 deletions shiptest.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit b50d974

Please sign in to comment.