Merge branch 'master' into upstream-merge-29940

2017-08-21 23:29:24 -05:00
parent 87b3df3069 b5e7f7f7fe
commit a0cf777040
364 changed files with 4317 additions and 3134 deletions
@@ -245,7 +245,7 @@
 	anchored = TRUE
 	invisibility = INVISIBILITY_ABSTRACT
 	opacity = 0
-	mouse_opacity = 0
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	var/mob/holder = null
 	var/phase_time = 0
 	var/phase_time_length = 3