July 5th TG sync (#1883)

July 5th TG sync

code/modules/cargo/exports/intel.dm

@@ -3,6 +3,7 @@
 // Selling Syndicate docs to NT
 /datum/export/intel
 	cost = 25000
+	k_elasticity = 0
 	unit_name = "original article"
 	message = "of enemy intelligence"
 	var/global/originals_recieved = list()
@@ -71,4 +72,4 @@
 	unit_name = "recovered article"
 	message = "of Syndicate intelligence"
 	export_types = list(/obj/item/documents/syndicate)
-	// Syndicate only wants originals of their docs recovered.
+	// Syndicate only wants originals of their docs recovered.

code/modules/cargo/exports/large_objects.dm

@@ -3,6 +3,7 @@
 // Crates, boxes, lockers.
 /datum/export/large/crate
 	cost = 500
+	k_elasticity = 0
 	unit_name = "crate"
 	export_types = list(/obj/structure/closet/crate)
 	exclude_types = list(/obj/structure/closet/crate/large, /obj/structure/closet/crate/wooden)

code/modules/cargo/exports/manifest.dm

@@ -2,6 +2,7 @@
 // +200 credits flat.
 /datum/export/manifest_correct
 	cost = 200
+	k_elasticity = 0
 	unit_name = "approved manifest"
 	export_types = list(/obj/item/weapon/paper/manifest)
 
@@ -18,6 +19,7 @@
 // Refunds the package cost minus the cost of crate.
 /datum/export/manifest_error_denied
 	cost = -500
+	k_elasticity = 0
 	unit_name = "correctly denied manifest"
 	export_types = list(/obj/item/weapon/paper/manifest)
 
@@ -73,4 +75,4 @@
 
 /datum/export/manifest_correct_denied/get_cost(obj/O)
 	var/obj/item/weapon/paper/manifest/M = O
-	return ..() - M.order_cost
+	return ..() - M.order_cost

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"
 

code/modules/cargo/exports/organs.dm

@@ -75,7 +75,18 @@
 	if(C.preserved)
 		return ..() * 2
 	return ..()
-
+	
+// Kitty Organs.
+	
+/datum/export/organ/cat/ears
+	cost = 1000
+	unit_name = "cat ears"
+	export_types = list(/obj/item/organ/ears/cat)
+	
+/datum/export/organ/cat/tail
+	cost = 1000
+	unit_name = "cat tail"
+	export_types = list(/obj/item/organ/tail/cat)
 
 // Human organs.
 

code/modules/cargo/exports/parts.dm

@@ -15,18 +15,7 @@
 	unit_name = "solar panel control board"
 	export_types = list(/obj/item/weapon/circuitboard/computer/solar_control)
 
-
-
 /datum/export/swarmer
 	cost = 2000
 	unit_name = "deactivated alien deconstruction drone"
-	export_types = list(/obj/item/device/unactivated_swarmer)
-
-/datum/export/swarmer/applies_to(obj/O, contr = 0, emag = 0)
-	if(!..())
-		return FALSE
-
-	var/obj/item/device/unactivated_swarmer/S = O
-	if(!S.crit_fail)
-		return FALSE
-	return TRUE
+	export_types = list(/obj/item/device/deactivated_swarmer)

code/modules/cargo/exports/seeds.dm

@@ -1,5 +1,6 @@
 /datum/export/seed
 	cost = 100 // Gets multiplied by potency
+	k_elasticity = 1	//price inelastic/quantity elastic, only need to export a few samples
 	unit_name = "new plant species sample"
 	export_types = list(/obj/item/seeds)
 	var/needs_discovery = FALSE // Only for undiscovered species

code/modules/cargo/exports/sheets.dm

@@ -111,10 +111,6 @@
 	unit_name = "cable piece"
 	export_types = list(/obj/item/stack/cable_coil)
 
-/datum/export/stack/cable/get_cost(O)
-	return round(..())
-
-
 // Weird Stuff
 
 // Alien Alloy. Like plasteel, but better.