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
+1 -1
View File
@@ -714,7 +714,7 @@
light_power = 1
light_range = 2
light_color = "#00ffff"
mouse_opacity = 0
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
flags = ABSTRACT
appearance_flags = 0
+1 -1
View File
@@ -6,7 +6,7 @@
anchored = TRUE
flags = ABSTRACT
pass_flags = PASSTABLE
mouse_opacity = 0
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
hitsound = 'sound/weapons/pierce.ogg'
var/hitsound_wall = ""