cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 13:39:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source 
Conflicts:
	code/controllers/_DynamicAreaLighting_TG.dm
	code/game/objects/effects/chem/chemsmoke.dm
	code/game/objects/explosion.dm
This commit is contained in:
PsiOmegaDelta
2015-07-10 12:57:46 +02:00
parent 6246d3bd9d e0ed7c3e69
commit 265802d270
5 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/chem/chemsmoke.dm
+4 -2
View File
@@ -55,8 +55,10 @@
targetTurfs = new()
for(var/turf/T in view(range, location)) //build affected area list
if(cheap_pythag(T.x - location.x, T.y - location.y) <= range) //cull turfs to circle
//build affected area list
for(var/turf/T in view(range, location))
//cull turfs to circle
if(sqrt((T.x - location.x)**2 + (T.y - location.y)**2) <= range)
targetTurfs += T
wallList = new()