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

Merge pull request #3736 from MisterLayne/8/25/2017_fixes_solar_computer

Browse Source 
~Solar Computer Fix~
This commit is contained in:
Neerti
2017-08-27 01:32:56 -04:00
committed by GitHub
parent 1cf09f35af 0a232698b1
commit b80e2ff9bc
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/solar.dm
+3 -5
View File
@@ -302,7 +302,7 @@ var/list/solars_list = list()
M.unset_control()
if(connected_tracker)
connected_tracker.unset_control()
..()
return ..()
/obj/machinery/power/solar_control/disconnect_from_network()
..()
@@ -408,25 +408,23 @@ var/list/solars_list = list()
if(do_after(user, 20))
if (src.stat & BROKEN)
user << "<font color='blue'>The broken glass falls out.</font>"
var/obj/structure/frame/A = new /obj/structure/frame( src.loc )
var/obj/structure/frame/A = new /obj/structure/frame/computer( src.loc )
new /obj/item/weapon/material/shard( src.loc )
var/obj/item/weapon/circuitboard/solar_control/M = new /obj/item/weapon/circuitboard/solar_control( A )
for (var/obj/C in src)
C.loc = src.loc
A.circuit = M
A.frame_type = "computer"
A.state = 3
A.icon_state = "computer_3"
A.anchored = 1
qdel(src)
else
user << "<font color='blue'>You disconnect the monitor.</font>"
var/obj/structure/frame/A = new /obj/structure/frame( src.loc )
var/obj/structure/frame/A = new /obj/structure/frame/computer( src.loc )
var/obj/item/weapon/circuitboard/solar_control/M = new /obj/item/weapon/circuitboard/solar_control( A )
for (var/obj/C in src)
C.loc = src.loc
A.circuit = M
A.frame_type = "computer"
A.state = 4
A.icon_state = "computer_4"
A.anchored = 1