Merge branch 'master' into upstream-merge-26965

2017-06-19 15:39:01 -05:00
parent a544d99f9f 8120278819
commit 42368581c5
423 changed files with 304918 additions and 166801 deletions
@@ -142,6 +142,9 @@
 	diag_hud_set_mechstat()
 	diag_hud_set_mechtracking()

+/obj/mecha/get_cell()
+	return cell
+

 /obj/mecha/Destroy()
 	go_out()
@@ -154,7 +157,7 @@
 			M.forceMove(loc)

 	if(prob(30))
-		explosion(get_turf(loc), 0, 0, 1, 3)
+		explosion(get_turf(loc), 0, 0, 1, 3)

 	if(wreckage)
 		var/obj/structure/mecha_wreckage/WR = new wreckage(loc, AI)