Alien Ruin fix, various cherrypicked upstream fixes

Also adds new buildmode

code/modules/cargo/bounties/item.dm

@@ -28,7 +28,11 @@
 /datum/bounty/item/ship(obj/O)
 	if(!applies_to(O))
 		return
-	shipped_count += 1
+	if(istype(O,/obj/item/stack))
+		var/obj/item/stack/O_is_a_stack = O
+		shipped_count += O_is_a_stack.amount
+	else
+		shipped_count += 1
 
 /datum/bounty/item/compatible_with(datum/other_bounty)
 	return type != other_bounty.type