Merge pull request #629 from Citadel-Station-13/upstream-merge-26654

[MIRROR] Rechargers no longer flash the charged animation before charging
This commit is contained in:
LetterJay
2017-05-01 07:41:53 -05:00
committed by GitHub
Regular → Executable
+5 -2
View File
@@ -61,7 +61,7 @@
G.loc = src
charging = G
use_power = 2
update_icon()
update_icon(scan = TRUE)
else
to_chat(user, "<span class='notice'>[src] isn't connected to anything!</span>")
return 1
@@ -162,10 +162,13 @@
..()
/obj/machinery/recharger/update_icon(using_power = 0) //we have an update_icon() in addition to the stuff in process to make it feel a tiny bit snappier.
/obj/machinery/recharger/update_icon(using_power = 0, scan) //we have an update_icon() in addition to the stuff in process to make it feel a tiny bit snappier.
if(stat & (NOPOWER|BROKEN) || !anchored)
icon_state = "rechargeroff"
return
if(scan)
icon_state = "rechargeroff"
return
if(panel_open)
icon_state = "rechargeropen"
return