cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 10:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactored magic guns to use process_fire() for checks (#43432)

Browse Source 
This was previously using afterattack()
This commit is contained in:
moo
2019-04-02 14:00:02 -04:00
committed by GitHub
parent 0c4fe77857 b14809f889
commit 596d57cb6f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/projectiles/guns/magic.dm
View File

@@ -24,15 +24,17 @@
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' //not really a gun and some toys use these inhands
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
/obj/item/gun/magic/afterattack(atom/target, mob/living/user, flag)
/obj/item/gun/magic/process_fire(atom/target, mob/living/user, message, params, zone_override, bonus_spread)
if(no_den_usage)
var/area/A = get_area(user)
if(istype(A, /area/wizard_station))
add_fingerprint(user)
to_chat(user, "<span class='warning'>You know better than to violate the security of The Den, best wait until you leave to use [src].</span>")
return
else
no_den_usage = 0
if(checks_antimagic && user.anti_magic_check(TRUE, FALSE, major = FALSE, self = TRUE))
add_fingerprint(user)
to_chat(user, "<span class='warning'>Something is interfering with [src].</span>")
return
. = ..()