Merge pull request #11397 from Baystation12/dev-freeze

Dev freeze
This commit is contained in:
PsiOmegaDelta
2015-10-31 16:43:02 +01:00
2 changed files with 12 additions and 2 deletions

View File

@@ -348,9 +348,8 @@ var/list/solars_list = list()
/obj/machinery/power/solar_control/initialize()
..()
if(!powernet) return
if(!connect_to_network()) return
set_panels(cdir)
connect_to_network()
/obj/machinery/power/solar_control/update_icon()
if(stat & BROKEN)