From d854909e0fb7ce2cea50221411df92c807943e98 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Wed, 7 Dec 2016 20:40:07 -0500 Subject: [PATCH] Freon Removal (#22025) * Freon Removal * Removes more freon sources --- code/modules/cargo/packs.dm | 13 ++--------- code/modules/holodeck/turfs.dm | 2 +- .../chemistry/recipes/slime_extracts.dm | 22 ------------------- 3 files changed, 3 insertions(+), 34 deletions(-) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 9a8cec8bf18..31157ac6b76 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -36,10 +36,10 @@ /datum/supply_pack/emergency group = "Emergency" - + /datum/supply_pack/emergency/vehicle name = "Biker Gang Kit" //TUNNEL SNAKES OWN THIS TOWN - cost = 2000 + cost = 2000 contraband = TRUE contains = list(/obj/vehicle/atv, /obj/item/key, @@ -911,15 +911,6 @@ crate_type = /obj/structure/closet/crate/secure dangerous = TRUE -/datum/supply_pack/science/freon_canister - name = "Freon Canister" - cost = 6000 - access_any = list(access_rd, access_atmospherics) - contains = list(/obj/machinery/portable_atmospherics/canister/freon) - crate_name = "freon canister crate" - crate_type = /obj/structure/closet/crate/secure - dangerous = TRUE - /datum/supply_pack/science/research name = "Machine Prototype Crate" cost = 8000 diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm index 458497cae59..789c9abe115 100644 --- a/code/modules/holodeck/turfs.dm +++ b/code/modules/holodeck/turfs.dm @@ -104,7 +104,7 @@ slowdown = 2 /turf/open/floor/holofloor/snow/cold - initial_gas_mix = "freon=7500;TEMP=0" + initial_gas_mix = "TEMP=0" /turf/open/floor/holofloor/asteroid name = "asteroid sand" diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm index 50f7beda419..b5863ec4e71 100644 --- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm +++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm @@ -272,28 +272,6 @@ //Dark Blue -/datum/chemical_reaction/slime/slimefreeze - name = "Slime Freeze" - id = "m_freeze" - required_reagents = list("plasma" = 1) - required_container = /obj/item/slime_extract/darkblue - required_other = 1 - -/datum/chemical_reaction/slime/slimefreeze/on_reaction(datum/reagents/holder) - feedback_add_details("slime_cores_used","[type]") - var/turf/T = get_turf(holder.my_atom) - T.visible_message("The slime extract begins to vibrate adorably!") - addtimer(src, "freeze", 50, TIMER_NORMAL, holder) - spawn(60) - ..() - -/datum/chemical_reaction/slime/slimefreeze/proc/freeze(datum/reagents/holder) - if(holder && holder.my_atom) - var/turf/open/T = get_turf(holder.my_atom) - if(istype(T)) - T.atmos_spawn_air("freon=50;TEMP=120") - - /datum/chemical_reaction/slime/slimefireproof name = "Slime Fireproof"