From a93f9509fc19fa91468ef1e4c0625af39ffd888d Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Wed, 7 Feb 2018 12:38:09 +0200 Subject: [PATCH] Merge pull request #35371 from kevinz000/patch-444 doppler arrays no longer runtime when processing < 5/10/20 bombs --- code/game/machinery/doppler_array.dm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 75e3414b59..972781dc0a 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -110,8 +110,13 @@ GLOBAL_LIST_EMPTY(doppler_arrays) if(!istype(linked_techweb)) say("Warning: No linked research system!") return - var/point_gain = techweb_scale_bomb(orig_light - 20 - linked_techweb.max_bomb_value) - if(!point_gain) + var/adjusted = orig_light - 20 - linked_techweb.max_bomb_value + if(adjusted <= 0) + say("Explosion not large enough for research calculations.") + return + var/point_gain = techweb_scale_bomb(adjusted) + if(point_gain <= 0) + say("Explosion not large enough for research calculations.") return linked_techweb.max_bomb_value = orig_light - 20 linked_techweb.research_points += point_gain