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
@@ -8,7 +8,6 @@
 	flags_1 = CONDUCT_1
 	w_class = WEIGHT_CLASS_TINY
 	attack_verb = list("poked")
-	var/emagged = FALSE
 	var/fail_message = "<span class='warning'>INVALID USER.</span>"
 	var/selfdestruct = 0 // Explode when user check is failed.
 	var/force_replace = 0 // Can forcefully replace other pins.