cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-29 19:42:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/game/objects/structures.dm
	code/game/objects/structures/inflatable.dm
This commit is contained in:
PsiOmega
2014-11-29 10:05:21 +01:00
parent 2899bb31af 6b50ada69b
commit 0f8156e77e
13 changed files with 42 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/game/objects/effects/effect_system.dm
View File

@@ -697,15 +697,6 @@ steam.start() -- spawns the effect
if(air_group) return 0
return !density
proc/update_nearby_tiles(need_rebuild)
if(!air_master)
return 0
air_master.mark_for_update(get_turf(src))
return 1
/datum/effect/effect/system/reagents_explosion
var/amount // TNT equivalent
var/flashing = 0 // does explosion creates flash effect?