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
@@ -23,7 +23,6 @@
 	attack_verb = list("nibbled", "bit", "gnawed", "chomped", "nommed")
 	w_class = 3
 	sharpness = IS_SHARP
-	var/emagged = 0

 /obj/item/dogborg/jaws/attack(atom/A, mob/living/silicon/robot/user)
 	..()
@@ -173,7 +172,6 @@
 	icon_state = "synthtongue"
 	hitsound = 'sound/effects/attackblob.ogg'
 	cleanspeed = 80
-	var/emagged = 0

 /obj/item/soap/tongue/New()
 	..()