diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 33f4a475e86..574a3445ce0 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -78,7 +78,7 @@ By design, d1 is the smallest direction and d2 is the highest if(powernet) cut_cable_from_powernet() // update the powernets cable_list -= src //remove it from global cable list - ..() // then go ahead and delete the cable + return ..() // then go ahead and delete the cable /////////////////////////////////// // General procedures diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index 5e7e935e1f7..d4aad807b51 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -15,9 +15,9 @@ idle_power_usage = 0 active_power_usage = 0 -/obj/machinery/power/Del() +/obj/machinery/power/Destroy() disconnect_from_network() - ..() + return ..() /////////////////////////////// // General procedures diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index 9fc6765e6fa..8b4f5d32aee 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -23,7 +23,7 @@ /obj/machinery/power/tracker/Destroy() unset_control() //remove from control computer - ..() + return ..() //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) @@ -70,7 +70,7 @@ S.give_glass() playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) user.visible_message("[user] takes the glass off the tracker.") - del(src) // qdel + qdel(src) // qdel return ..()