cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 21:19:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Line ending conflict resolution.

Browse Source
This commit is contained in:
Zuhayr
2014-12-22 23:27:06 +10:30
parent 5895615f72 9a4dd0b6ea
commit 32d799e53e
11 changed files with 164 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/solar.dm
+5
View File
@@ -22,6 +22,9 @@ var/list/solars_list = list()
var/turn_angle = 0
var/obj/machinery/power/solar_control/control = null
/obj/machinery/power/solar/drain_power()
return -1
/obj/machinery/power/solar/New(var/turf/loc, var/obj/item/solar_assembly/S)
..(loc)
Make(S)
@@ -302,6 +305,8 @@ var/list/solars_list = list()
var/obj/machinery/power/tracker/connected_tracker = null
var/list/connected_panels = list()
/obj/machinery/power/solar_control/drain_power()
return -1
/obj/machinery/power/solar_control/New()
..()