Revert "SSmachines instancing PR (#9080)"

This reverts commit 4889b33cea.
This commit is contained in:
atermonera
2023-07-23 17:45:10 -08:00
parent b3b59c5c2a
commit a8a9054d08
17 changed files with 126 additions and 150 deletions
@@ -215,11 +215,11 @@
else
speed_process = !speed_process // switching gears
if(speed_process) // high gear
end_processing()
begin_speed_processing()
STOP_MACHINE_PROCESSING(src)
START_PROCESSING(SSfastprocess, src)
else // low gear
end_speed_processing()
begin_processing()
STOP_PROCESSING(SSfastprocess, src)
START_MACHINE_PROCESSING(src)
for(var/obj/machinery/mineral/unloading_machine/unloader in refinery_area.contents)
unloader.toggle_speed()
for(var/obj/machinery/conveyor_switch/cswitch in refinery_area.contents)
@@ -109,11 +109,11 @@
else
speed_process = !speed_process // switching gears
if(speed_process) // high gear
end_processing()
begin_speed_processing()
STOP_MACHINE_PROCESSING(src)
START_PROCESSING(SSfastprocess, src)
else // low gear
end_speed_processing()
begin_processing()
STOP_PROCESSING(SSfastprocess, src)
START_MACHINE_PROCESSING(src)
/obj/machinery/mineral/stacking_machine/process()
if (src.output && src.input)
@@ -27,11 +27,11 @@
else
speed_process = !speed_process // switching gears
if(speed_process) // high gear
end_processing()
begin_speed_processing()
STOP_MACHINE_PROCESSING(src)
START_PROCESSING(SSfastprocess, src)
else // low gear
end_speed_processing()
begin_processing()
STOP_PROCESSING(SSfastprocess, src)
START_MACHINE_PROCESSING(src)
/obj/machinery/mineral/unloading_machine/process()
if (src.output && src.input)
@@ -53,4 +53,4 @@
O.loc = src.output.loc
else
return
return
return
+2 -2
View File
@@ -147,7 +147,7 @@
/obj/machinery/am_shielding/proc/setup_core()
processing = 1
begin_processing()
START_MACHINE_PROCESSING(src)
if(!control_unit) return
control_unit.linked_cores.Add(src)
control_unit.reported_core_efficiency += efficiency
@@ -199,4 +199,4 @@
qdel(src)
return
..()
return
return
+2 -2
View File
@@ -21,7 +21,7 @@
var/problem = 0 // If this is not 0 there is some sort of issue in the powernet. Monitors will display warnings.
/datum/powernet/New()
START_PROCESSING_MACHINERY(src, SSMACHINES_POWERNETS_LIST)
START_PROCESSING_POWERNET(src)
..()
/datum/powernet/Destroy()
@@ -31,7 +31,7 @@
for(var/obj/machinery/power/M in nodes)
nodes -= M
M.powernet = null
STOP_PROCESSING_MACHINERY(src, SSMACHINES_POWERNETS_LIST)
STOP_PROCESSING_POWERNET(src)
return ..()
//Returns the amount of excess power (before refunding to SMESs) from last tick.
+4 -4
View File
@@ -46,11 +46,11 @@
else
speed_process = !speed_process // switching gears
if(speed_process) // high gear
end_processing()
begin_speed_processing()
STOP_MACHINE_PROCESSING(src)
START_PROCESSING(SSfastprocess, src)
else // low gear
end_speed_processing()
begin_processing()
STOP_PROCESSING(SSfastprocess, src)
START_MACHINE_PROCESSING(src)
/obj/machinery/conveyor/proc/setmove()
if(operating == FORWARDS)
+3 -3
View File
@@ -24,7 +24,7 @@
return
if(to_be_processed.len)
spawn(1)
start_processing()
begin_processing()
else
to_chat(user, "<span class='warning'>The processor is empty.</span>")
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 1)
@@ -60,7 +60,7 @@
AM.forceMove(src)
visible_message("<span class='notice'>\the [user] places [AM] inside \the [src].</span>")
/obj/machinery/processor/proc/start_processing()
/obj/machinery/processor/proc/begin_processing()
if(processing)
return // Already doing it.
processing = TRUE
@@ -115,4 +115,4 @@
/obj/machinery/processor/MouseDrop_T(var/atom/movable/AM, var/mob/living/user)
if(user.stat || user.incapacitated(INCAPACITATION_DISABLED) || !istype(user))
return
insert(AM, user)
insert(AM, user)