From f356703de2e1782967da1506eedc6e5362cec299 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Wed, 28 Jul 2021 18:26:27 -0400
Subject: [PATCH] powder that makes you say yes

---
 code/controllers/subsystems/machines.dm | 33 +------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/code/controllers/subsystems/machines.dm b/code/controllers/subsystems/machines.dm
index 3f7e4d352b..caded9414e 100644
--- a/code/controllers/subsystems/machines.dm
+++ b/code/controllers/subsystems/machines.dm
@@ -105,23 +105,11 @@ SUBSYSTEM_DEF(machines)
 	while(current_run.len)
 		var/datum/pipe_network/PN = current_run[current_run.len]
 		current_run.len--
-<<<<<<< HEAD
-		if(istype(PN) && !QDELETED(PN))
-||||||| parent of 471935bb8b... Merge pull request #11288 from VOREStation/Arokha/ssmachines2
-		if(QDELETED(PN))
-			global.pipe_networks.Remove(PN)
-		else
-=======
 		if(QDELETED(PN))
 			global.pipe_networks.Remove(PN)
 			DISABLE_BITFIELD(PN?.datum_flags, DF_ISPROCESSING)
 		else
->>>>>>> 471935bb8b... Merge pull request #11288 from VOREStation/Arokha/ssmachines2
 			PN.process(wait)
-		else
-			global.pipe_networks.Remove(PN)
-			if(!QDELETED(PN))
-				DISABLE_BITFIELD(PN.datum_flags, DF_ISPROCESSING)
 		if(MC_TICK_CHECK)
 			return
 
@@ -134,17 +122,10 @@ SUBSYSTEM_DEF(machines)
 	while(current_run.len)
 		var/obj/machinery/M = current_run[current_run.len]
 		current_run.len--
-		if(!istype(M) || QDELETED(M) || (M.process(wait) == PROCESS_KILL))
+		if(QDELETED(M) || (M.process(wait) == PROCESS_KILL))
 			global.processing_machines.Remove(M)
-<<<<<<< HEAD
-			if(!QDELETED(M))
-				DISABLE_BITFIELD(M.datum_flags, DF_ISPROCESSING)
-||||||| parent of 471935bb8b... Merge pull request #11288 from VOREStation/Arokha/ssmachines2
-=======
 			DISABLE_BITFIELD(M?.datum_flags, DF_ISPROCESSING)
->>>>>>> 471935bb8b... Merge pull request #11288 from VOREStation/Arokha/ssmachines2
 		if(MC_TICK_CHECK)
-			return
 
 /datum/controller/subsystem/machines/proc/process_powernets(resumed = 0)
 	if (!resumed)
@@ -155,23 +136,11 @@ SUBSYSTEM_DEF(machines)
 	while(current_run.len)
 		var/datum/powernet/PN = current_run[current_run.len]
 		current_run.len--
-<<<<<<< HEAD
-		if(istype(PN) && !QDELETED(PN))
-||||||| parent of 471935bb8b... Merge pull request #11288 from VOREStation/Arokha/ssmachines2
-		if(QDELETED(PN))
-			global.powernets.Remove(PN)
-		else
-=======
 		if(QDELETED(PN))
 			global.powernets.Remove(PN)
 			DISABLE_BITFIELD(PN?.datum_flags, DF_ISPROCESSING)
 		else
->>>>>>> 471935bb8b... Merge pull request #11288 from VOREStation/Arokha/ssmachines2
 			PN.reset(wait)
-		else
-			global.powernets.Remove(PN)
-			if(!QDELETED(PN))
-				DISABLE_BITFIELD(PN.datum_flags, DF_ISPROCESSING)
 		if(MC_TICK_CHECK)
 			return