Merge pull request #9610 from Ghommie/Ghommie-cit273

ports anti-magic component code updates (holymelon sold separately).
This commit is contained in:
kevinz000
2021-07-15 17:43:18 -03:00
committed by Archie
parent 8d33579e86
commit 865ff4fa08
32 changed files with 245 additions and 72 deletions
+4
View File
@@ -9,6 +9,7 @@
fire_sound = 'sound/weapons/emitter.ogg'
flags_1 = CONDUCT_1
w_class = WEIGHT_CLASS_HUGE
var/checks_antimagic = FALSE
var/max_charges = 6
var/charges = 0
var/recharge_rate = 4
@@ -31,6 +32,9 @@
return
else
no_den_usage = 0
if(checks_antimagic && user.anti_magic_check(TRUE, FALSE, FALSE, 0, TRUE))
to_chat(user, "<span class='warning'>Something is interfering with [src].</span>")
return
. = ..()
/obj/item/gun/magic/can_shoot()