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

Merge pull request #936 from Citadel-Station-13/upstream-merge-27184

Browse Source 
[MIRROR] Explosion flame_range now defaults to light range instead of zero
This commit is contained in:
LetterJay
2017-05-14 16:33:00 -04:00
committed by GitHub
parent ebd23c3adf 3d4356cd7c
commit 051de8da99
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/explosion.dm
+6 -1
View File
@@ -1,10 +1,15 @@
/proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, adminlog = 1, ignorecap = 0, flame_range = 0 ,silent = 0, smoke = 1)
/proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, adminlog = 1, ignorecap = 0, flame_range, silent = 0, smoke = 1)
set waitfor = 0
src = null //so we don't abort once src is deleted
epicenter = get_turf(epicenter)
if(!epicenter)
return
if(isnull(flame_range))
flame_range = light_impact_range
if(isnull(flash_range))
flash_range = devastation_range
// Archive the uncapped explosion for the doppler array
var/orig_dev_range = devastation_range
var/orig_heavy_range = heavy_impact_range