cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6401 from Menshin/solars_runtime_fix

Browse Source 
Fixes controless solar tracker runtime
This commit is contained in:
hornygranny
2014-12-17 11:04:29 -08:00
parent 7ea29f961e 672b476f23
commit 5a26db0285
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/solar.dm
+4 -5
View File
@@ -33,9 +33,10 @@ var/list/solars_list = list()
//set the control of the panel to a given computer if closer than SOLAR_MAX_DIST
/obj/machinery/power/solar/proc/set_control(var/obj/machinery/power/solar_control/SC)
if(SC && (get_dist(src, SC) > SOLAR_MAX_DIST))
if(!SC || (get_dist(src, SC) > SOLAR_MAX_DIST))
return 0
control = SC
SC.connected_panels |= src
return 1
//set the control of the panel to null and removes it from the control list of the previous control computer if needed
@@ -323,12 +324,10 @@ var/list/solars_list = list()
var/obj/machinery/power/solar/S = M
if(!S.control) //i.e unconnected
S.set_control(src)
connected_panels |= S
else if(istype(M, /obj/machinery/power/tracker))
if(!connected_tracker) //if there's already a tracker connected to the computer don't add another
var/obj/machinery/power/tracker/T = M
if(!T.control) //i.e unconnected
connected_tracker = T
T.set_control(src)
//called by the sun controller, update the facing angle (either manually or via tracking) and rotates the panels accordingly
@@ -484,10 +483,10 @@ var/list/solars_list = list()
set_panels(targetdir)
if(href_list["search_connected"])
src.search_for_connected()
search_for_connected()
if(connected_tracker && track == 2)
connected_tracker.set_angle(sun.angle)
src.set_panels(cdir)
set_panels(cdir)
src.updateUsrDialog()
return
code/modules/power/tracker.dm
+2 -1
View File
@@ -27,9 +27,10 @@
//set the control of the tracker to a given computer if closer than SOLAR_MAX_DIST
/obj/machinery/power/tracker/proc/set_control(var/obj/machinery/power/solar_control/SC)
if(SC && (get_dist(src, SC) > SOLAR_MAX_DIST))
if(!SC || (get_dist(src, SC) > SOLAR_MAX_DIST))
return 0
control = SC
SC.connected_tracker = src
return 1
//set the control of the tracker to null and removes it from the previous control computer if needed