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

Adds an isliving check to baton afterattack (#91254)

Browse Source 
## About The Pull Request

Very simple fix, afterattack is called for atom attacks - I forgot to
isliving here
Fixes #91253

## Changelog

🆑 Melbert
fix: You (can't) baton furniture 
/🆑
This commit is contained in:
MrMelbert
2025-05-22 09:03:19 +02:00
committed by GitHub
parent 0667cef353
commit ae2e30ac29
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/melee/baton.dm
+1 -1
View File
@@ -153,7 +153,7 @@
// This is where stun gets applied
/obj/item/melee/baton/afterattack(atom/target, mob/user, list/modifiers, list/attack_modifiers)
if(!active || !COOLDOWN_FINISHED(src, cooldown_check) || HAS_TRAIT_FROM(target, TRAIT_IWASBATONED, REF(user)))
if(!isliving(target) || !active || !COOLDOWN_FINISHED(src, cooldown_check) || HAS_TRAIT_FROM(target, TRAIT_IWASBATONED, REF(user)))
return
// worst check in the chain but - right click = harmbaton
if(LAZYACCESS(modifiers, RIGHT_CLICK) && !stun_on_harmbaton)