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

Fixes e-bolas being unblockable and not ensnaring flying mobs. (#60160)

Browse Source 
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
This commit is contained in:
Ghom
2021-07-30 12:42:23 -07:00
committed by GitHub
co-authored by Mothblocks
parent 069c76f629
commit bd5b0d66ed
4 changed files with 45 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon_defense.dm
+1 -1
View File
@@ -59,7 +59,7 @@
return TRUE
/mob/living/carbon/hitby(atom/movable/AM, skipcatch, hitpush = TRUE, blocked = FALSE, datum/thrownthing/throwingdatum)
if(!skipcatch && can_catch_item() && istype(AM, /obj/item) && isturf(AM.loc))
if(!skipcatch && can_catch_item() && istype(AM, /obj/item) && !HAS_TRAIT(AM, TRAIT_UNCATCHABLE) && isturf(AM.loc))
var/obj/item/I = AM
I.attack_hand(src)
if(get_active_held_item() == I) //if our attack_hand() picks up the item...