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

Merge branch 'master' into upstream-merge-35383

Browse Source
This commit is contained in:
deathride58
2018-02-07 19:13:41 +00:00
committed by GitHub
parent 0d7d8095bb b8f9807e39
commit e2a6e36ae5
44 changed files with 1164 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/doppler_array.dm
+5 -1
View File
@@ -110,11 +110,15 @@ 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
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
var/point_gain = techweb_scale_bomb(adjusted)
if(point_gain <= 0)
say("Explosion not large enough for research calculations.")
return