From a1734c97e98cda12bab87e94792d2276fc44eb77 Mon Sep 17 00:00:00 2001
From: Leshana <Leshana@users.noreply.github.com>
Date: Thu, 28 Dec 2017 15:21:14 -0500
Subject: [PATCH] Moved makepowernets() into SSmachines initialization proc.

---
 code/game/objects/explosion.dm       |  2 +-
 code/modules/admin/verbs/debug.dm    |  6 +++---
 code/modules/maps/tg/map_template.dm |  2 +-
 code/modules/power/pacman2.dm        |  2 +-
 code/modules/power/power.dm          | 16 ----------------
 code/modules/shuttles/shuttle.dm     |  2 +-
 code/modules/turbolift/turbolift.dm  |  2 +-
 7 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm
index 0bf146f037..f6eec0de71 100644
--- a/code/game/objects/explosion.dm
+++ b/code/game/objects/explosion.dm
@@ -104,7 +104,7 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa
 		sleep(8)
 
 		if(!powernet_rebuild_was_deferred_already && defer_powernet_rebuild)
-			makepowernets()
+			SSmachines.makepowernets()
 			defer_powernet_rebuild = 0
 	return 1
 
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index f7a5d79c03..09c97fdcf1 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -277,9 +277,9 @@
 /client/proc/cmd_debug_make_powernets()
 	set category = "Debug"
 	set name = "Make Powernets"
-	makepowernets()
-	log_admin("[key_name(src)] has remade the powernet. makepowernets() called.")
-	message_admins("[key_name_admin(src)] has remade the powernets. makepowernets() called.", 0)
+	SSmachines.makepowernets()
+	log_admin("[key_name(src)] has remade the powernet. SSmachines.makepowernets() called.")
+	message_admins("[key_name_admin(src)] has remade the powernets. SSmachines.makepowernets() called.", 0)
 	feedback_add_details("admin_verb","MPWN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_debug_tog_aliens()
diff --git a/code/modules/maps/tg/map_template.dm b/code/modules/maps/tg/map_template.dm
index 54b08c74d9..4307149b5f 100644
--- a/code/modules/maps/tg/map_template.dm
+++ b/code/modules/maps/tg/map_template.dm
@@ -98,7 +98,7 @@ var/list/global/map_templates = list()
 	admin_notice("<span class='danger'>[i] pipe\s initialized.</span>", R_DEBUG)
 
 	admin_notice("<span class='danger'>Rebuilding powernets due to submap creation.</span>", R_DEBUG)
-	makepowernets()
+	SSmachines.makepowernets()
 
 	admin_notice("<span class='danger'>Submap initializations finished.</span>", R_DEBUG)
 
diff --git a/code/modules/power/pacman2.dm b/code/modules/power/pacman2.dm
index fc5b58709a..b6b904e65a 100644
--- a/code/modules/power/pacman2.dm
+++ b/code/modules/power/pacman2.dm
@@ -84,7 +84,7 @@
 					user << "<font color='blue'>You secure the generator to the floor.</font>"
 				else
 					user << "<font color='blue'>You unsecure the generator from the floor.</font>"
-				makepowernets()
+				SSmachines.makepowernets()
 			else if(istype(O, /obj/item/weapon/screwdriver))
 				open = !open
 				playsound(loc, O.usesound, 50, 1)
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index 76320db479..ba833d858f 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -230,22 +230,6 @@
 					. += C
 	return .
 
-/hook/startup/proc/buildPowernets()
-	return makepowernets()
-
-// rebuild all power networks from scratch - only called at world creation or by the admin verb
-/proc/makepowernets()
-	for(var/datum/powernet/PN in powernets)
-		qdel(PN)
-	powernets.Cut()
-
-	for(var/obj/structure/cable/PC in cable_list)
-		if(!PC.powernet)
-			var/datum/powernet/NewPN = new()
-			NewPN.add_cable(PC)
-			propagate_network(PC,PC.powernet)
-	return 1
-
 //remove the old powernet and replace it with a new one throughout the network.
 /proc/propagate_network(var/obj/O, var/datum/powernet/PN)
 	//world.log << "propagating new network"
diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm
index d87e378e41..d9dea08d99 100644
--- a/code/modules/shuttles/shuttle.dm
+++ b/code/modules/shuttles/shuttle.dm
@@ -221,7 +221,7 @@
 		break
 
 	if(update_power)
-		makepowernets()
+		SSmachines.makepowernets()
 	return
 
 //returns 1 if the shuttle has a valid arrive time
diff --git a/code/modules/turbolift/turbolift.dm b/code/modules/turbolift/turbolift.dm
index 90273250cb..a34611316e 100644
--- a/code/modules/turbolift/turbolift.dm
+++ b/code/modules/turbolift/turbolift.dm
@@ -103,7 +103,7 @@
 	origin.move_contents_to(destination)
 
 	if((locate(/obj/machinery/power) in destination) || (locate(/obj/structure/cable) in destination))
-		makepowernets()
+		SSmachines.makepowernets()
 
 	current_floor = next_floor
 	control_panel_interior.visible_message("The elevator [moving_upwards ? "rises" : "descends"] smoothly.")