From e2bb3cee01b27ed51413a51889e4b5848d6c944f Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Wed, 28 Jun 2023 15:56:41 +0200 Subject: [PATCH] You can now order gas canisters from cargo (#21400) * canister restocks * adds Destroy() * sirryan suggestions * Sean review --- .../structures/crates_lockers/largecrate.dm | 6 +++ .../supply/supply_packs/pack_engineering.dm | 42 +++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index fcf26027552..0660bce2600 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -49,6 +49,12 @@ else return ..() +/obj/structure/largecrate/Destroy() + var/turf/src_turf = get_turf(src) + for(var/obj/O in contents) + O.forceMove(src_turf) + return ..() + /obj/structure/largecrate/mule /obj/structure/largecrate/lisa diff --git a/code/modules/supply/supply_packs/pack_engineering.dm b/code/modules/supply/supply_packs/pack_engineering.dm index 83b6e4fb6e2..48ea37887c2 100644 --- a/code/modules/supply/supply_packs/pack_engineering.dm +++ b/code/modules/supply/supply_packs/pack_engineering.dm @@ -220,3 +220,45 @@ containername = "thermo-electric generator crate" access = ACCESS_CE announce_beacons = list("Engineering" = list("Chief Engineer's Desk", "Atmospherics")) + +/datum/supply_packs/engineering/canister/nitrogen + name = "Nitrogen canister" + contains = list(/obj/machinery/atmospherics/portable/canister/nitrogen) + cost = 50 + containertype = /obj/structure/largecrate + containername = "nitrogen canister crate" + +/datum/supply_packs/engineering/canister/oxygen + name = "Oxygen canister" + contains = list(/obj/machinery/atmospherics/portable/canister/oxygen) + cost = 50 + containertype = /obj/structure/largecrate + containername = "oxygen canister crate" + +/datum/supply_packs/engineering/canister/air + name = "Air canister" + contains = list(/obj/machinery/atmospherics/portable/canister/air) + cost = 50 + containertype = /obj/structure/largecrate + containername = "Air canister crate" + +/datum/supply_packs/engineering/canister/sleeping_agent + name = "Nitrous oxide canister" + contains = list(/obj/machinery/atmospherics/portable/canister/sleeping_agent) + cost = 250 + containertype = /obj/structure/largecrate + containername = "Nitrous oxide canister crate" + +/datum/supply_packs/engineering/canister/carbon_dioxide + name = "Carbon dioxide canister" + contains = list(/obj/machinery/atmospherics/portable/canister/carbon_dioxide) + cost = 250 + containertype = /obj/structure/largecrate + containername = "Carbon dioxide canister crate" + +/datum/supply_packs/engineering/canister/toxins + name = "Plasma canister" + contains = list(/obj/machinery/atmospherics/portable/canister/toxins) + cost = 250 + containertype = /obj/structure/largecrate + containername = "Plasma canister crate"