up to upstream-merge-27868

2017-06-11 00:04:00 -05:00
parent 4c8cf31f73
commit b80a184d97
39 changed files with 333 additions and 411 deletions
@@ -29,7 +29,7 @@
 	if(charge)
 		. = min(charge, 250)
 		charge = use(.)
-		updateicon()
+		update_icon()

 /obj/machinery/light/power_drain(clockcult_user)
 	if(on)