From f001f3aa4a916d2537f2b35c9073df83a4feb187 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 24 Feb 2018 06:06:46 -0600 Subject: [PATCH] [MIRROR] Readjusts doppler array formula for thermonuclear explosions (#5684) * Merge pull request #35914 from DaedalusGame/every-bomb-is-precious-but-not-diamond-level-precious-did-you-know-that-diamonds-arent-actually-worth-anything Readjusts doppler array formula for thermonuclear explosions * Readjusts doppler array formula for thermonuclear explosions --- code/game/machinery/doppler_array.dm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index ccb68c11dc..3ba1b473c7 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -109,24 +109,22 @@ GLOBAL_LIST_EMPTY(doppler_arrays) . = ..() if(!istype(linked_techweb)) say("Warning: No linked research system!") - return - var/adjusted = orig_light - 10 - linked_techweb.max_bomb_value + return + var/adjusted = orig_light - 10 if(adjusted <= 0) say("Explosion not large enough for research calculations.") return - var/point_gain = techweb_scale_bomb(adjusted) + var/point_gain = techweb_scale_bomb(adjusted) - techweb_scale_bomb(linked_techweb.max_bomb_value) if(point_gain <= 0) - say("Explosion not large enough for research calculations.") + say("Explosion not large enough for research calculations.") return - linked_techweb.max_bomb_value = orig_light - 10 + linked_techweb.max_bomb_value = adjusted linked_techweb.research_points += point_gain say("Gained [point_gain] points from explosion dataset.") -/obj/machinery/doppler_array/research/science - /obj/machinery/doppler_array/research/science/Initialize() . = ..() linked_techweb = SSresearch.science_tech /proc/techweb_scale_bomb(lightradius) - return (lightradius ** 0.5) * 5000 + return (lightradius ** 0.5) * 3000