Merge pull request #541 from Citadel-Station-13/upstream-merge-26400

[MIRROR] Fixes bugs with shuttles breaking pipes, wires and disposals
2017-04-24 18:03:34 -05:00
parent c2263c1ff1 3afe339198
commit 7f44459847
9 changed files with 166 additions and 47 deletions
@@ -409,13 +409,13 @@
 	NC.cableColor("red")
 	NC.d1 = 0
 	NC.d2 = fdirn
-	NC.updateicon()
+	NC.update_icon()

 	var/datum/powernet/PN
 	if(last_piece && last_piece.d2 != chassis.dir)
 		last_piece.d1 = min(last_piece.d2, chassis.dir)
 		last_piece.d2 = max(last_piece.d2, chassis.dir)
-		last_piece.updateicon()
+		last_piece.update_icon()
 		PN = last_piece.powernet

 	if(!PN)