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

Conflicts:
	code/game/objects/structures.dm
	code/game/objects/structures/inflatable.dm
This commit is contained in:
PsiOmega
2014-11-29 10:09:03 +01:00
13 changed files with 42 additions and 68 deletions
-9
View File
@@ -316,15 +316,6 @@
dir = ini_dir
update_nearby_tiles(need_rebuild=1)
//This proc has to do with airgroups and atmos, it has nothing to do with smoothwindows, that's update_nearby_tiles().
/obj/structure/window/proc/update_nearby_tiles(need_rebuild)
if(!air_master)
return 0
air_master.mark_for_update(get_turf(src))
return 1
//checks if this window is full-tile one
/obj/structure/window/proc/is_fulltile()
if(dir & (dir - 1))