diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm index 5c9684835e4..f9403f86dec 100644 --- a/code/modules/atmospherics/machinery/portable/scrubber.dm +++ b/code/modules/atmospherics/machinery/portable/scrubber.dm @@ -41,7 +41,7 @@ /obj/machinery/portable_atmospherics/scrubber/proc/scrub(var/datum/gas_mixture/mixture) if(air_contents.return_pressure() >= overpressure_m * ONE_ATMOSPHERE) return - + var/transfer_moles = min(1, volume_rate / mixture.volume) * mixture.total_moles() var/datum/gas_mixture/filtering = mixture.remove(transfer_moles) // Remove part of the mixture to filter. @@ -137,6 +137,9 @@ /obj/machinery/portable_atmospherics/scrubber/huge/movable movable = TRUE +/obj/machinery/portable_atmospherics/scrubber/huge/movable/cargo + anchored = FALSE + /obj/machinery/portable_atmospherics/scrubber/huge/update_icon() icon_state = "scrubber:[on]" diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index c3b0ac63130..ba477ab1add 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -804,6 +804,30 @@ contains = list(/obj/item/vending_refill/engivend) crate_name = "engineering supply crate" +/datum/supply_pack/engineering/portapump + name = "Portable Air Pump Crate" + desc = "Did someone let the air out of the shuttle again? We've got you covered. Contains two portable air pumps." + cost = 2500 + contains = list(/obj/machinery/portable_atmospherics/pump, + /obj/machinery/portable_atmospherics/pump) + crate_name = "portable air pump crate" + +/datum/supply_pack/engineering/portascrubber + name = "Portable Scrubber Crate" + desc = "Clean up that pesky plasma leak with your very own set of two portable scrubbers." + cost = 2500 + contains = list(/obj/machinery/portable_atmospherics/scrubber, + /obj/machinery/portable_atmospherics/scrubber) + crate_name = "portable scrubber crate" + +/datum/supply_pack/engineering/hugescrubber + name = "Huge Portable Scrubber Crate" + desc = "A huge portable scrubber for huge atmospherics mistakes." + cost = 5000 + contains = list(/obj/machinery/portable_atmospherics/scrubber/huge/movable/cargo) + crate_name = "huge portable scrubber crate" + crate_type = /obj/structure/closet/crate/large + /datum/supply_pack/engineering/bsa name = "Bluespace Artillery Parts" desc = "The pride of Nanotrasen Naval Command. The legendary Bluespace Artillery Cannon is a devastating feat of human engineering and testament to wartime determination. Highly advanced research is required for proper construction. "