mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 02:16:05 +00:00
Fix for recycling
This commit is contained in:
@@ -213,13 +213,18 @@ span.notsmelting {
|
|||||||
if(src.output) break
|
if(src.output) break
|
||||||
processing_objects.Add(src)
|
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)
|
for(var/oredata in typesof(/datum/processable_ore) - /datum/processable_ore)
|
||||||
var/datum/processable_ore/ore_datum = new oredata
|
var/datum/processable_ore/ore_datum = new oredata
|
||||||
ore[ore_datum.id]=ore_datum
|
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
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -227,7 +232,6 @@ span.notsmelting {
|
|||||||
if(!(ore_id in ore))
|
if(!(ore_id in ore))
|
||||||
warning("addMaterial(): Unknown material [ore_id]!")
|
warning("addMaterial(): Unknown material [ore_id]!")
|
||||||
return
|
return
|
||||||
// Oh how I wish ore[ore_id].stored-- worked.
|
|
||||||
var/datum/processable_ore/po=ore[ore_id]
|
var/datum/processable_ore/po=ore[ore_id]
|
||||||
po.stored += amount
|
po.stored += amount
|
||||||
ore[ore_id]=po
|
ore[ore_id]=po
|
||||||
@@ -381,9 +385,10 @@ span.notsmelting {
|
|||||||
if (O.recycle(src))
|
if (O.recycle(src))
|
||||||
//O.loc=null
|
//O.loc=null
|
||||||
del(O)
|
del(O)
|
||||||
continue
|
break
|
||||||
if(O && istype(O,/obj/item))
|
if(O && istype(O,/obj/item))
|
||||||
O.loc = src.output.loc
|
O.loc = src.output.loc
|
||||||
|
break
|
||||||
|
|
||||||
|
|
||||||
/obj/machinery/mineral/processing_unit_console/recycle/attack_ai(var/mob/user as mob)
|
/obj/machinery/mineral/processing_unit_console/recycle/attack_ai(var/mob/user as mob)
|
||||||
|
|||||||
@@ -38,14 +38,14 @@
|
|||||||
/datum/smelting_recipe/glass
|
/datum/smelting_recipe/glass
|
||||||
name="Glass"
|
name="Glass"
|
||||||
ingredients=list(
|
ingredients=list(
|
||||||
"sand"=1
|
"glass"=1
|
||||||
)
|
)
|
||||||
yieldtype=/obj/item/stack/sheet/glass
|
yieldtype=/obj/item/stack/sheet/glass
|
||||||
|
|
||||||
/datum/smelting_recipe/rglass
|
/datum/smelting_recipe/rglass
|
||||||
name="Reinforced Glass"
|
name="Reinforced Glass"
|
||||||
ingredients=list(
|
ingredients=list(
|
||||||
"sand"=1,
|
"glass"=1,
|
||||||
"iron"=1
|
"iron"=1
|
||||||
)
|
)
|
||||||
yieldtype=/obj/item/stack/sheet/rglass
|
yieldtype=/obj/item/stack/sheet/rglass
|
||||||
|
|||||||
Reference in New Issue
Block a user