From 1b138562b48a7a562eaa6bf115f604d4533a41df Mon Sep 17 00:00:00 2001 From: AnturK Date: Thu, 30 Mar 2017 00:21:51 +0200 Subject: [PATCH] Minor runtimes fixes. (#25566) * Fixes power monitor runtime * Fixes reagent data runtime * Nullspace is no smoking zone --- code/game/objects/effects/effect_system/effects_smoke.dm | 2 ++ code/modules/hydroponics/seeds.dm | 2 +- .../modular_computers/file_system/programs/powermonitor.dm | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm index 3f890153601..c41acdcf853 100644 --- a/code/game/objects/effects/effect_system/effects_smoke.dm +++ b/code/game/objects/effects/effect_system/effects_smoke.dm @@ -73,6 +73,8 @@ /obj/effect/particle_effect/smoke/proc/spread_smoke() var/turf/t_loc = get_turf(src) + if(!t_loc) + return var/list/newsmokes = list() for(var/turf/T in t_loc.GetAtmosAdjacentTurfs()) var/obj/effect/particle_effect/smoke/foundsmoke = locate() in T //Don't spread smoke where there's already smoke! diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 537c5e15115..7c2d58d8a80 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -163,7 +163,7 @@ T.reagents.add_reagent(reagent_id, 1 + round(potency * reagents_add[reagent_id], 1), list("blood_type"="O-")) continue - T.reagents.add_reagent(reagent_id, 1 + round(potency * reagents_add[reagent_id]), 1) + T.reagents.add_reagent(reagent_id, 1 + round(potency * reagents_add[reagent_id],1)) return 1 diff --git a/code/modules/modular_computers/file_system/programs/powermonitor.dm b/code/modules/modular_computers/file_system/programs/powermonitor.dm index 316b90ec00c..d09fe31f03d 100644 --- a/code/modules/modular_computers/file_system/programs/powermonitor.dm +++ b/code/modules/modular_computers/file_system/programs/powermonitor.dm @@ -81,7 +81,7 @@ if(istype(A)) data["areas"] += list(list( "name" = A.area.name, - "charge" = A.cell.percent(), + "charge" = A.cell ? A.cell.percent() : 0, "load" = A.lastused_total, "charging" = A.charging, "eqp" = A.equipment,