Merge branch 'master' of https://github.com/tgstation/-tg-station into MeteorsSuck

Conflicts:
	code/game/turfs/simulated/walls.dm
This commit is contained in:
Cheridan
2014-05-13 14:03:42 -05:00
172 changed files with 2622 additions and 12201 deletions
+1 -1
View File
@@ -304,7 +304,7 @@
/obj/structure/window/Destroy()
density = 0
air_update_turf(1)
if(anchored)playsound(src, "shatter", 70, 1)
playsound(src, "shatter", 70, 1)
update_nearby_icons()
..()