cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for recycling

Browse Source
This commit is contained in:
Rob Nelson
2013-11-21 13:15:54 -08:00
parent 663b250b1c
commit 9b2fc2406f
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/mining/machine_processing.dm
View File

@@ -213,13 +213,18 @@ span.notsmelting {
if(src.output) break
processing_objects.Add(src)
for(var/recipetype in typesof(/datum/smelting_recipe) - /datum/smelting_recipe)
recipes += new recipetype
for(var/oredata in typesof(/datum/processable_ore) - /datum/processable_ore)
var/datum/processable_ore/ore_datum = new oredata
ore[ore_datum.id]=ore_datum
for(var/recipetype in typesof(/datum/smelting_recipe) - /datum/smelting_recipe)
var/datum/smelting_recipe/recipe= new recipetype
// Sanity
for(var/ingredient in recipe.ingredients)
if(!(ingredient in ore))
warning("Unknown ingredient [ingredient] in recipe [recipe.name]!")
recipes += recipe
return
return
@@ -227,7 +232,6 @@ span.notsmelting {
if(!(ore_id in ore))
warning("addMaterial(): Unknown material [ore_id]!")
return
// Oh how I wish ore[ore_id].stored-- worked.
var/datum/processable_ore/po=ore[ore_id]
po.stored += amount
ore[ore_id]=po
@@ -381,9 +385,10 @@ span.notsmelting {
if (O.recycle(src))
//O.loc=null
del(O)
continue
break
if(O && istype(O,/obj/item))
O.loc = src.output.loc
break
/obj/machinery/mineral/processing_unit_console/recycle/attack_ai(var/mob/user as mob)