Merge branch 'cib' of github.com:CIB/tgstation13 into cib

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4724 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
CIB123
2012-09-18 23:09:26 +00:00
parent 5e4535a58e
commit 4b98c9bcf5
+10 -4
View File
@@ -400,11 +400,17 @@
/obj/machinery/mecha_part_fabricator/proc/process_queue()
var/obj/item/part = listgetindex(src.queue, 1)
if(!part)
remove_from_queue(1)
return process_queue()
if(remove_from_queue(1))
return process_queue()
else
// Most likely means we have an empty queue, so stop processing
return 0
if(!(part.vars.Find("construction_time")) || !(part.vars.Find("construction_cost")))//If it shouldn't be printed
remove_from_queue(1)//Take it out of the quene
return process_queue()//Then reprocess it
if(remove_from_queue(1))//Take it out of the quene
return process_queue()//Then reprocess it
else
// Most likely means we have an empty queue, so stop processing
return 0
temp = null
while(part)
if(stat&(NOPOWER|BROKEN))