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

Mjolnir successfully attacks only if it successfully attacks (#95921)

Browse Source 
## About The Pull Request

When you call parent but don't care if the parent succeeded:

## Why It's Good For The Game

fixes #95887
This commit is contained in:
Leland Kemble
2026-05-01 16:32:18 -05:00
committed by GitHub
parent 168e9463ae
commit 03e185a566
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/wizard/equipment/wizard_hammer.dm
+6 -7
View File
@@ -113,16 +113,15 @@
var/atom/throw_target = get_edge_target_turf(target, get_dir(src, get_step_away(target, src)))
target.throw_at(throw_target, 200, 4)
/obj/item/mjollnir/attack(mob/living/target_mob, mob/user)
..()
if(QDELETED(target_mob))
/obj/item/mjollnir/afterattack(atom/target, mob/user)
if(QDELETED(target))
return
if(HAS_TRAIT(user, TRAIT_PACIFISM))
return
if(HAS_TRAIT(src, TRAIT_WIELDED))
yeet_shock(target_mob)
if(HAS_TRAIT(src, TRAIT_WIELDED) && isliving(target))
yeet_shock(target)
/obj/item/mjollnir/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
. = ..()
if(.)
return
if(!QDELETED(hit_atom) && isliving(hit_atom))
yeet_shock(hit_atom)