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

fixes shields with breakable_by_damage set to FALSE being unable to block attacks. (#71734)

Browse Source 
## About The Pull Request
It removes a stupid check from `hit_reaction()` and adds another to
`on_shield_block()`, simple as.

## Why It's Good For The Game
Consult the PR title. That's not what `breakable_by_damage` is supposed
to do.

## Changelog

🆑
fix: fixes shields that don't actually take damage from attacks (eg:
adamantine shields) being unable to block said attacks.
/🆑
This commit is contained in:
Ghom
2022-12-08 15:21:15 +01:00
committed by GitHub
parent fa1b4fa2ae
commit c41b18fadd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/shields.dm
+2 -2
View File
@@ -27,8 +27,6 @@
COOLDOWN_DECLARE(baton_bash)
/obj/item/shield/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
if(!breakable_by_damage)
return FALSE
if(transparent && (hitby.pass_flags & PASSGLASS))
return FALSE
if(attack_type == THROWN_PROJECTILE_ATTACK)
@@ -55,6 +53,8 @@
new shield_break_leftover(get_turf(src))
/obj/item/shield/proc/on_shield_block(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", damage = 0, attack_type = MELEE_ATTACK)
if(!breakable_by_damage)
return TRUE
if (atom_integrity <= damage)
var/turf/owner_turf = get_turf(owner)
owner_turf.visible_message(span_warning("[hitby] destroys [src]!"))