shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5345 from Citadel-Station-13/upstream-merge-35371

Browse Source 
[MIRROR] doppler arrays no longer runtime when processing < 5/10/20 bombs
This commit is contained in:
deathride58
2018-02-07 19:07:53 +00:00
committed by GitHub
parent 3da6459362 e02c6a31cf
commit 7736dddcf6
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/doppler_array.dm
+7 -2
View File
@@ -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