cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 00:29:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes weird baseball bat interaction with objects with throw_range 0 (boulders) (#89168)

Browse Source 
## About The Pull Request


Set the minimum flight distance to 3 tiles for objects hit by baseball
bat parry,
so instead of the boulder being sucked into wielder when the baseball
bat hits it, it now bounces back a little.

## Why It's Good For The Game

Closes https://github.com/tgstation/tgstation/issues/87877
## Changelog
🆑
fix: objects with throw_range 0 now properly parried with baseball bats
/🆑
This commit is contained in:
MX0739
2025-01-23 19:12:11 +01:00
committed by GitHub
parent bfdbe4039e
commit a3c60b69b2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weaponry.dm
+1 -1
View File
@@ -1025,7 +1025,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
angle = 180
if(target.dir & target_to_user)
angle = 360
var/turf/return_to_sender = get_ranged_target_turf_direct(user, throw_datum.starting_turf, round(target.throw_range * 1.5, 1), offset = angle + (rand(-1, 1) * 10))
var/turf/return_to_sender = get_ranged_target_turf_direct(user, throw_datum.starting_turf, max(3, round(target.throw_range * 1.5, 1)), offset = angle + (rand(-1, 1) * 10))
throw_datum.finalize(hit = FALSE)
target.mouse_opacity = MOUSE_OPACITY_TRANSPARENT //dont mess with our ball
target.color = list(1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,3) //make them super light