cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 18:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make bat hits no longer stunlock (#59909)

Browse Source 
Wooden bats are 2nd best melee weapon in game, just next to stun batons. They cost 5 wooden planks which makes them ridiculously cheap and available to everyone, and the worst thing about them is how easily they can just stunlock people out of nowhere. I did what I believe was the best way to balance them out
This commit is contained in:
Sparkezel
2021-07-01 22:56:50 +02:00
committed by GitHub
parent 5600467371
commit e1d3c12dba
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/items/weaponry.dm
View File

@@ -643,7 +643,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
inhand_icon_state = "baseball_bat" inhand_icon_state = "baseball_bat"
lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
force = 10 force = 12
wound_bonus = -10 wound_bonus = -10
throwforce = 12 throwforce = 12
attack_verb_continuous = list("beats", "smacks") attack_verb_continuous = list("beats", "smacks")
@@ -697,7 +697,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
return return
else if(!target.anchored) else if(!target.anchored)
var/whack_speed = (prob(60) ? 1 : 4) var/whack_speed = (prob(60) ? 1 : 4)
target.throw_at(throw_target, rand(1, 2), whack_speed, user) // sorry friends, 7 speed batting caused wounds to absolutely delete whoever you knocked your target into (and said target) target.throw_at(throw_target, rand(1, 2), whack_speed, user, gentle = TRUE) // sorry friends, 7 speed batting caused wounds to absolutely delete whoever you knocked your target into (and said target)
/obj/item/melee/baseball_bat/ablative /obj/item/melee/baseball_bat/ablative
name = "metal baseball bat" name = "metal baseball bat"