Merge branch 'master' into upstream-merge-29940

This commit is contained in:
LetterJay
2017-08-21 23:29:24 -05:00
committed by GitHub
364 changed files with 4317 additions and 3134 deletions
@@ -72,7 +72,7 @@
layer = EDGED_TURF_LAYER
pixel_x = -32
pixel_y = -32
mouse_opacity = 0
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
opacity = TRUE
/obj/structure/opacity_blocker/singularity_pull()