Merge pull request #12846 from VOREStation/upstream-merge-8577

[MIRROR] Vehicle Runtime Fix

code/modules/vehicles/cargo_train.dm

@@ -129,6 +129,8 @@
 /obj/vehicle/train/engine/turn_on()
 	if(!key)
 		return
+	if(!cell)
+		return
 	else
 		..()
 		update_stats()
@@ -230,7 +232,9 @@
 	if (on)
 		to_chat(usr, "You start [src]'s engine.")
 	else
-		if(cell.charge < charge_use)
+		if(!cell)
+			to_chat(usr, "[src] doesn't appear to have a power cell!")
+		else if(cell.charge < charge_use)
 			to_chat(usr, "[src] is out of power.")
 		else
 			to_chat(usr, "[src]'s engine won't start.")

code/modules/vehicles/vehicle.dm

@@ -193,6 +193,8 @@
 /obj/vehicle/proc/turn_on()
 	if(!mechanical || stat)
 		return FALSE
+	if(!cell)
+		return FALSE
 	if(powered && cell.charge < charge_use)
 		return FALSE
 	on = 1