Revert "12/21 modernizations from TG live"

code/modules/cargo/exports/large_objects.dm

@@ -81,11 +81,23 @@
 	unit_name = "pipe dispenser"
 	export_types = list(/obj/machinery/pipedispenser)
 
+
+/datum/export/large/singularitygen
+	cost = 4000 // If you have one left after engine setup, sell it.
+	unit_name = "unused gravitational singularity generator"
+	export_types = list(/obj/machinery/the_singularitygen)
+	include_subtypes = FALSE
+
+/datum/export/large/singularitygen/tesla
+	unit_name = "unused energy ball generator"
+	export_types = list(/obj/machinery/the_singularitygen/tesla)
+
 /datum/export/large/supermatter
 	cost = 9000
 	unit_name = "supermatter shard"
 	export_types = list(/obj/machinery/power/supermatter_shard)
 
+
 // Misc
 /datum/export/large/iv
 	cost = 300

code/modules/cargo/exports/materials.dm

@@ -73,12 +73,6 @@
 	material_id = MAT_SILVER
 	message = "cm3 of silver"
 
-// Titanium.
-/datum/export/material/titanium
-	cost = 250
-	material_id = MAT_TITANIUM
-	message = "cm3 of titanium"
-
 // Metal. Common building material.
 /datum/export/material/metal
 	message = "cm3 of metal"

code/modules/cargo/exports/research.dm

@@ -7,19 +7,13 @@
 
 /datum/export/tech/get_cost(obj/O)
 	var/obj/item/weapon/disk/tech_disk/D = O
-	var/cost = 0
-	for(var/V in D.tech_stored)
-		if(!V)
-			continue
-		var/datum/tech/tech = V
-		cost += tech.getCost(techLevels[tech.id])
-	return ..() * cost
+	if(!D.stored)
+		return 0
+	var/datum/tech/tech = D.stored
+	return ..() * tech.getCost(techLevels[tech.id])
 
 /datum/export/tech/sell_object(obj/O)
 	..()
 	var/obj/item/weapon/disk/tech_disk/D = O
-	for(var/V in D.tech_stored)
-		if(!V)
-			continue
-		var/datum/tech/tech = V
-		techLevels[tech.id] = tech.level
+	var/datum/tech/tech = D.stored
+	techLevels[tech.id] = tech.level

code/modules/cargo/exports/seeds.dm

@@ -31,6 +31,6 @@
 	if(!cost)
 		return 0
 
-	var/potDiff = (S.potency - discoveredPlants[S.type])
-		
-	return round(..() * potDiff)
+	var/potDiff = max(S.potency - discoveredPlants[S.type], 0)
+
+	return round(..() * potDiff)

code/modules/cargo/exports/weapons.dm

@@ -19,7 +19,7 @@
 /datum/export/weapon/taser
 	cost = 250
 	unit_name = "advanced taser"
-	export_types = list(/obj/item/weapon/gun/energy/e_gun/advtaser)
+	export_types = list(/obj/item/weapon/gun/energy/gun/advtaser)
 
 /datum/export/weapon/laser
 	cost = 250
@@ -34,18 +34,18 @@
 /datum/export/weapon/energy_gun
 	cost = 900
 	unit_name = "energy gun"
-	export_types = list(/obj/item/weapon/gun/energy/e_gun)
+	export_types = list(/obj/item/weapon/gun/energy/gun)
 
 
 /datum/export/weapon/wt550
 	cost = 1400
 	unit_name = "WT-550 automatic rifle"
-	export_types = list(/obj/item/weapon/gun/ballistic/automatic/wt550)
+	export_types = list(/obj/item/weapon/gun/projectile/automatic/wt550)
 
 /datum/export/weapon/shotgun
 	cost = 350
 	unit_name = "combat shotgun"
-	export_types = list(/obj/item/weapon/gun/ballistic/shotgun/automatic/combat)
+	export_types = list(/obj/item/weapon/gun/projectile/shotgun/automatic/combat)
 
 
 /datum/export/weapon/flashbang