Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

This commit is contained in:
meyar
2013-05-24 07:55:24 -04:00
3 changed files with 189 additions and 168 deletions

View File

@@ -99,4 +99,9 @@ obj/machinery/recharger/update_icon() //we have an update_icon() in addition to
if(charging)
icon_state = "recharger1"
else
icon_state = "recharger0"
icon_state = "recharger0"
obj/machinery/recharger/wallcharger
name = "wall recharger"
icon = 'icons/obj/stationobjs.dmi'
icon_state = "wrecharger0"