Merge branch 'master' into upstream-merge-37597

2018-05-22 07:21:53 -05:00
parent 467819beba b3e5513185
commit 6a575f19d1
661 changed files with 12019 additions and 10559 deletions
@@ -62,9 +62,9 @@
 	if(default_deconstruction_crowbar(W))
 		return

-	if(is_wire_tool(W) && panel_open)
+	/*if(is_wire_tool(W) && panel_open)			CITADEL EDIT - They removed the wires because they don't like my cheating
 		wires.interact(user)
-		return
+		return*/

 	return ..()

@@ -185,4 +185,4 @@
 		flick("grounding_rodhit", src)
 		tesla_buckle_check(power)
 	else
-		..()
+		..()