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

code/modules/cargo/packs.dm

@@ -158,6 +158,18 @@
 		crate_value -= I.cost
 		new I.item(C)
 
+/datum/supply_pack/emergency/plasma_spacesuit
+	name = "Plasmaman Space Envirosuits"
+	desc = "Contains two space-worthy envirosuits for Plasmamen. Order now and we'll throw in two free helmets! Requires EVA access to open."
+	cost = 4000
+	access = ACCESS_EVA
+	contains = list(/obj/item/clothing/suit/space/eva/plasmaman,
+					/obj/item/clothing/suit/space/eva/plasmaman,
+					/obj/item/clothing/head/helmet/space/plasmaman,
+					/obj/item/clothing/head/helmet/space/plasmaman)
+	crate_name = "plasmaman EVA crate"
+	crate_type = /obj/structure/closet/crate/secure
+
 /datum/supply_pack/emergency/plasmaman
 	name = "Plasmaman Supply Kit"
 	desc = "Keep those Plasmamen alive with two sets of Plasmaman outfits. Each set contains a plasmaman jumpsuit, internals tank, and helmet."