Merge pull request #2436 from Citadel-Station-13/upstream-merge-30004

[MIRROR] Moved emagged var to obj/item parent.
2017-09-06 09:15:11 -05:00
parent 27ae29664b f5e8e06041
commit cf46abecb3
12 changed files with 1067 additions and 1070 deletions
@@ -278,7 +278,6 @@
 	desc = "Releases a harmless blast that confuses most organics. For when the harm is JUST TOO MUCH"
 	icon_state = "megaphone"
 	var/cooldown = 0
-	var/emagged = FALSE

 /obj/item/device/harmalarm/emag_act(mob/user)
 	emagged = !emagged