Skip to content

Commit

Permalink
adds a new boomerang item to the weapon kits + "fixes" an existing bu…
Browse files Browse the repository at this point in the history
…g on the boomerang code

Boomerang type weapons currently deal twice the intended damage due to a bug in their code which makes them strike the target twice, this is a bandaid fix that halves the damage so they atleast deal approximately the same damage they were intended to do.
  • Loading branch information
RinPin committed Jul 2, 2023
1 parent d9055b9 commit 3653c52
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions code/game/objects/items/melee/f13onehanded.dm
Original file line number Diff line number Diff line change
Expand Up @@ -646,8 +646,8 @@ obj/item/melee/onehanded/knife/switchblade
icon_state = "boomerang"
item_state = "boomerang"
force = 30
throwforce = 35 //so it can kill weak trash mobs in one throw
throw_speed = 3
throwforce = 18 //so it can kill weak trash mobs in one throw, a bug causes boomerang type weapons to deal double the intended damage, so this is a bandaid fix meanwhile
throw_speed = 4
attack_verb = list("beat", "smacked", "clubbed", "clobbered")
sharpness = SHARP_NONE
attack_speed = CLICK_CD_MELEE
Expand All @@ -667,7 +667,7 @@ obj/item/melee/onehanded/knife/switchblade
throw_at(thrownby, throw_range+2, throw_speed, null, TRUE)
else if(!thrownby)
return
return ..()
return



Expand Down
6 changes: 3 additions & 3 deletions code/modules/clothing/glasses/_glasses.dm
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@
icon_state = "garb"
item_state = "garb"
force = 23
throwforce = 23
throwforce = 12
throw_speed = 4
attack_verb = list("sliced")
hitsound = 'sound/weapons/bladeslice.ogg'
Expand Down Expand Up @@ -306,7 +306,7 @@
icon_state = "gar"
item_state = "gar"
force = 23
throwforce = 23
throwforce = 12
throw_speed = 4
attack_verb = list("sliced")
hitsound = 'sound/weapons/bladeslice.ogg'
Expand Down Expand Up @@ -337,7 +337,7 @@
icon_state = "supergar"
item_state = "gar"
force = 23
throwforce = 23
throwforce = 12
sharpness = SHARP_EDGED
glass_colour_type = /datum/client_colour/glass_colour/red
attack_speed = CLICK_CD_MELEE * 0.8
Expand Down

0 comments on commit 3653c52

Please sign in to comment.