Merge pull request #6854 from Citadel-Station-13/upstream-merge-37968

[MIRROR] Field generators are now workable by silicons again... but not wirelessly
2018-05-23 06:45:37 -05:00
parent adb8c077ab 45c4d05fb1
commit d45c85bf78
1 changed files with 1 additions and 4 deletions
@@ -64,10 +64,7 @@ field_generator power level display
 	if(active == FG_ONLINE)
 		calc_power()

-/obj/machinery/field/generator/attack_hand(mob/user)
-	. = ..()
-	if(.)
-		return
+/obj/machinery/field/generator/interact(mob/user)
 	if(state == FG_WELDED)
 		if(get_dist(src, user) <= 1)//Need to actually touch the thing to turn it on
 			if(active >= FG_CHARGING)