From 0a232698b1ce96c54df59023ac55bfef0f6ec655 Mon Sep 17 00:00:00 2001 From: MisterLayne Date: Fri, 25 Aug 2017 16:25:01 -0400 Subject: [PATCH] Fixes the problem with the solar control computers where they were not fixable if they were destroyed and the glass was removed. --- code/modules/power/solar.dm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 7e4de1841c..dd5c5336bd 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -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 << "The broken glass falls out." - 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 << "You disconnect the monitor." - 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