Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#35291)

* Ore Stacking

* honk

* honk

* component memes

* honk2

* fix overlay off-by-1, sheet singular names

* Give the ores more descriptive names since sheets also have

* whoops debug memes

* atom editor memes

* fixes

* snowdin fix
This commit is contained in:
vuonojenmustaturska
2018-02-05 23:27:35 +02:00
committed by AnturK
parent 3b994347cd
commit c4fd8715a5
56 changed files with 347 additions and 310 deletions
+2 -2
View File
@@ -83,10 +83,10 @@
return ..()
/obj/machinery/mineral/processing_unit/HasProximity(atom/movable/AM)
if(istype(AM, /obj/item/ore) && AM.loc == get_step(src, input_dir))
if(istype(AM, /obj/item/stack/ore) && AM.loc == get_step(src, input_dir))
process_ore(AM)
/obj/machinery/mineral/processing_unit/proc/process_ore(obj/item/ore/O)
/obj/machinery/mineral/processing_unit/proc/process_ore(obj/item/stack/ore/O)
GET_COMPONENT(materials, /datum/component/material_container)
var/material_amount = materials.get_item_material_amount(O)
if(!materials.has_space(material_amount))