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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-07-28 18:26:27 -04:00
committed by GitHub
parent ef06cb4ae8
commit f356703de2
1 changed files with 1 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystems/machines.dm
+1 -32
View File
@@ -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