Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit

code/modules/cargo/centcom_podlauncher.dm

@@ -344,7 +344,7 @@
 			if (temp_pod.effectShrapnel == TRUE) //If already doing custom damage, set back to default (no shrapnel)
 				temp_pod.effectShrapnel = FALSE
 				return
-			var/shrapnelInput = input("Please enter the type of pellet cloud you'd like to create on landing (Can be any projectile!)", "Projectile Typepath",  0) in sortList(subtypesof(/obj/item/projectile), GLOBAL_PROC_REF(cmp_typepaths_asc))
+			var/shrapnelInput = input("Please enter the type of pellet cloud you'd like to create on landing (Can be any projectile!)", "Projectile Typepath",  0) in sort_list(subtypesof(/obj/item/projectile), GLOBAL_PROC_REF(cmp_typepaths_asc))
 			if (isnull(shrapnelInput))
 				return
 			var/shrapnelMagnitude = input("Enter the magnitude of the pellet cloud. This is usually a value around 1-5. Please note that Ryll-Ryll has asked me to tell you that if you go too crazy with the projectiles you might crash the server. So uh, be gentle!", "Shrapnel Magnitude", 0) as null|num

code/modules/cargo/exports.dm

@@ -117,7 +117,7 @@ Credit dupes that require a lot of manual work shouldn't be removed, unless they
 // Checks the amount of exportable in object. Credits in the bill, sheets in the stack, etc.
 // Usually acts as a multiplier for a cost, so item that has 0 amount will be skipped in export.
 /datum/export/proc/get_amount(obj/O)
-	return 1
+	return TRUE
 
 // Checks if the item is fit for export datum.
 /datum/export/proc/applies_to(obj/O, allowed_categories = NONE, apply_elastic = TRUE)

code/modules/cargo/exports/materials.dm

@@ -11,12 +11,12 @@
 
 /datum/export/material/get_amount(obj/O)
 	if(!material_id)
-		return 0
+		return FALSE
 	if(!isitem(O))
-		return 0
+		return FALSE
 	var/obj/item/I = O
 	if(!(SSmaterials.GetMaterialRef(material_id) in I.custom_materials))
-		return 0
+		return FALSE
 
 	var/amount = I.custom_materials[SSmaterials.GetMaterialRef(material_id)]
 

code/modules/cargo/exports/seeds.dm

@@ -9,9 +9,9 @@
 /datum/export/seed/get_cost(obj/O)
 	var/obj/item/seeds/S = O
 	if(!needs_discovery && (S.type in discoveredPlants))
-		return 0
+		return FALSE
 	if(needs_discovery && !(S.type in discoveredPlants))
-		return 0
+		return FALSE
 	return ..() * S.rarity // That's right, no bonus for potency. Send a crappy sample first to "show improvement" later.
 
 /datum/export/seed/sell_object(obj/O)
@@ -31,7 +31,7 @@
 	var/obj/item/seeds/S = O
 	var/cost = ..()
 	if(!cost)
-		return 0
+		return FALSE
 
 	var/potDiff = (S.potency - discoveredPlants[S.type])
 

code/modules/cargo/exports/sheets.dm

@@ -6,7 +6,7 @@
 	var/obj/item/stack/S = O
 	if(istype(S))
 		return S.amount
-	return 0
+	return FALSE
 
 // Hides