diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm index 0f102110e8..c213161a3b 100644 --- a/code/modules/vehicles/cargo_train.dm +++ b/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.") diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index dcb909a2f5..b9eada1d12 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/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