mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-11 23:23:28 +01:00
Back to how it was before, when it was even working at all.
This commit is contained in:
@@ -120,7 +120,7 @@ Class Procs:
|
||||
var/speed_process = 0 // Process as fast as possible?
|
||||
|
||||
/obj/machinery/initialize()
|
||||
// addAtProcessing() //Testing this in new conveyors
|
||||
addAtProcessing()
|
||||
. = ..()
|
||||
power_change()
|
||||
|
||||
@@ -128,19 +128,11 @@ Class Procs:
|
||||
if(use_power)
|
||||
myArea = get_area_master(src)
|
||||
|
||||
/* machines += src
|
||||
if(!speed_process)
|
||||
machine_processing += src
|
||||
else
|
||||
fast_processing += src */ //Also testing in NEW conveyors
|
||||
|
||||
/obj/machinery/new() //new for trying to get the conveyors working with machinery, not world
|
||||
machines += src
|
||||
if(!speed_process)
|
||||
machine_processing += src
|
||||
else
|
||||
fast_processing += src
|
||||
. = ..()
|
||||
|
||||
/obj/machinery/Destroy()
|
||||
if(myArea)
|
||||
|
||||
@@ -217,17 +217,17 @@
|
||||
id = newid
|
||||
update()
|
||||
|
||||
/* spawn(5) // allow map load
|
||||
spawn(5) // allow map load
|
||||
conveyors = list()
|
||||
for(var/obj/machinery/conveyor/C in machines) //This works if it's: `C in world` , but that's bad practice. Best to try to fix it.
|
||||
if(C.id == id)
|
||||
conveyors += C */ //Moving this to initialise to see if it gets around the bug... do we need the spawn thing? Let's find out.
|
||||
conveyors += C //Moving this to initialise to see if it gets around the bug... do we need the spawn thing? Let's find out.
|
||||
|
||||
/obj/machinery/conveyor_switch/initialize() //This whole thing is new
|
||||
/*/obj/machinery/conveyor_switch/initialize() //This whole thing is new
|
||||
conveyors = list()
|
||||
for(var/obj/machinery/conveyor/C in machines)
|
||||
for(var/obj/machinery/conveyor/C in world) //This works if it's: `C in world` , but that's bad practice. Best to try to fix it so it's in machines
|
||||
if(C.id == id)
|
||||
conveyors += C
|
||||
conveyors += C*/
|
||||
|
||||
|
||||
// update the icon depending on the position
|
||||
|
||||
Reference in New Issue
Block a user