July 5th TG sync (#1883)

July 5th TG sync

code/modules/cargo/exports/materials.dm

@@ -11,7 +11,7 @@
 /datum/export/material/get_amount(obj/O)
 	if(!material_id)
 		return 0
-	if(!istype(O, /obj/item))
+	if(!isitem(O))
 		return 0
 	var/obj/item/I = O
 	if(!(material_id in I.materials))
@@ -25,10 +25,7 @@
 	else if(istype(I, /obj/item/weapon/ore))
 		amount *= 0.8 // Station's ore redemption equipment is really goddamn good.
 
-	return round(amount)
-
-/datum/export/material/get_cost(obj/O)
-	return round(..() / MINERAL_MATERIAL_AMOUNT)
+	return round(amount/MINERAL_MATERIAL_AMOUNT)
 
 // Materials. Nothing but plasma is really worth selling. Better leave it all to RnD and sell some plasma instead.
 
@@ -47,6 +44,7 @@
 // Plasma. The oil of 26 century. The reason why you are here.
 /datum/export/material/plasma
 	cost = 300
+	k_elasticity = 0
 	material_id = MAT_PLASMA
 	message = "cm3 of plasma"