Merge branch 'master' into upstream-merge-30494

2017-09-12 02:40:24 -05:00
parent 63122795f9 8223692c32
commit dac6cc56e4
173 changed files with 8361 additions and 5643 deletions
@@ -428,7 +428,7 @@

 /obj/item/device/flashlight/glowstick/update_icon()
 	item_state = "glowstick"
-	overlays.Cut()
+	cut_overlays()
 	if(!fuel)
 		icon_state = "glowstick-empty"
 		cut_overlays()