diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm index 3ef10cbbb64..3cb64ed49f3 100644 --- a/code/__DEFINES/atmospherics.dm +++ b/code/__DEFINES/atmospherics.dm @@ -93,7 +93,7 @@ #define COLD_FIRE_SPREAD_RADIOSITY_SCALE 0.95 #define COLD_FIRE_GROWTH_RATE 40000 #define FREON_MAXIMUM_BURN_TEMPERATURE 293 -#define FREON_LOWER_TEMPERATURE 30 //minimum temperature allowed for the burn to go, we would have negative pressure otherwise +#define FREON_LOWER_TEMPERATURE 60 //minimum temperature allowed for the burn to go, we would have negative pressure otherwise #define FREON_OXYGEN_FULLBURN 10 //GASES diff --git a/code/__DEFINES/reactions.dm b/code/__DEFINES/reactions.dm index fd24313369d..cc579521be9 100644 --- a/code/__DEFINES/reactions.dm +++ b/code/__DEFINES/reactions.dm @@ -12,7 +12,7 @@ #define WATER_VAPOR_FREEZE 200 //freon reaction #define FREON_BURN_RATE_DELTA 4 -#define FIRE_FREON_ENERGY_RELEASED -200000 //amount of heat absorbed per mole of burnt freon in the tile +#define FIRE_FREON_ENERGY_RELEASED -300000 //amount of heat absorbed per mole of burnt freon in the tile #define N2O_DECOMPOSITION_MIN_ENERGY 1400 #define N2O_DECOMPOSITION_ENERGY_RELEASED 200000 diff --git a/code/datums/materials/basemats.dm b/code/datums/materials/basemats.dm index f62076698b2..51873225a44 100644 --- a/code/datums/materials/basemats.dm +++ b/code/datums/materials/basemats.dm @@ -259,13 +259,13 @@ Unless you know what you're doing, only use the first three numbers. They're in alpha = 150 categories = list(MAT_CATEGORY_RIGID = TRUE) sheet_type = /obj/item/stack/sheet/hot_ice - value_per_unit = 0.5 - beauty_modifier = 0.5 + value_per_unit = 0.75 + beauty_modifier = 0.75 /datum/material/hot_ice/on_applied(atom/source, amount, material_flags) . = ..() - source.AddComponent(/datum/component/hot_ice, "plasma", amount*50, amount*20+300) + source.AddComponent(/datum/component/hot_ice, "plasma", amount*150, amount*20+300) /datum/material/hot_ice/on_removed(atom/source, amount, material_flags) - qdel(source.GetComponent(/datum/component/hot_ice, "plasma", amount*50, amount*20+300)) + qdel(source.GetComponent(/datum/component/hot_ice, "plasma", amount*150, amount*20+300)) return ..() diff --git a/code/game/objects/items/stacks/sheets/hot_ice.dm b/code/game/objects/items/stacks/sheets/hot_ice.dm index bb64f5e6cb7..2e5d299fec8 100644 --- a/code/game/objects/items/stacks/sheets/hot_ice.dm +++ b/code/game/objects/items/stacks/sheets/hot_ice.dm @@ -5,7 +5,7 @@ singular_name = "hot ice" icon = 'icons/obj/stack_objects.dmi' custom_materials = list(/datum/material/hot_ice=MINERAL_MATERIAL_AMOUNT) - grind_results = list(/datum/reagent/toxin/plasma = 200) + grind_results = list(/datum/reagent/toxin/plasma = 300) material_type = /datum/material/hot_ice /obj/item/stack/sheet/hot_ice/suicide_act(mob/living/carbon/user) diff --git a/code/modules/atmospherics/gasmixtures/gas_types.dm b/code/modules/atmospherics/gasmixtures/gas_types.dm index 1b67d2b9565..36e0565891b 100644 --- a/code/modules/atmospherics/gasmixtures/gas_types.dm +++ b/code/modules/atmospherics/gasmixtures/gas_types.dm @@ -156,7 +156,7 @@ GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(/datum/gas/oxygen, /datum/g /datum/gas/freon id = "freon" - specific_heat = 300 + specific_heat = 600 name = "Freon" gas_overlay = "freon" moles_visible = MOLES_GAS_VISIBLE *30 diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm index 7626deff5ec..17b2e8fdc27 100644 --- a/code/modules/atmospherics/gasmixtures/reactions.dm +++ b/code/modules/atmospherics/gasmixtures/reactions.dm @@ -267,7 +267,7 @@ datum/gas_reaction/freonfire/react(datum/gas_mixture/air, datum/holder) temperature_scale = 0 else temperature_scale = (FREON_MAXIMUM_BURN_TEMPERATURE - temperature)/(FREON_MAXIMUM_BURN_TEMPERATURE - FREON_LOWER_TEMPERATURE) //calculate the scale based on the temperature - if(temperature_scale > 0) + if(temperature_scale >= 0) oxygen_burn_rate = OXYGEN_BURN_RATE_BASE - temperature_scale if(cached_gases[/datum/gas/oxygen][MOLES] > cached_gases[/datum/gas/freon][MOLES]*FREON_OXYGEN_FULLBURN) freon_burn_rate = (cached_gases[/datum/gas/freon][MOLES]*temperature_scale)/FREON_BURN_RATE_DELTA @@ -281,7 +281,7 @@ datum/gas_reaction/freonfire/react(datum/gas_mixture/air, datum/holder) ASSERT_GAS(/datum/gas/carbon_dioxide,air) cached_gases[/datum/gas/carbon_dioxide][MOLES] += freon_burn_rate - if(temperature < 150 && temperature > 130 && prob(2)) + if(temperature < 160 && temperature > 120 && prob(2)) new /obj/item/stack/sheet/hot_ice(location) energy_released += FIRE_FREON_ENERGY_RELEASED * (freon_burn_rate) @@ -458,7 +458,7 @@ datum/gas_reaction/freonfire/react(datum/gas_mixture/air, datum/holder) /datum/gas/plasma = 40, /datum/gas/carbon_dioxide = 20, /datum/gas/bz = 20, - "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST + "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST + 100 ) /datum/gas_reaction/freonformation/react(datum/gas_mixture/air) @@ -472,7 +472,7 @@ datum/gas_reaction/freonfire/react(datum/gas_mixture/air, datum/holder) return NO_REACTION cached_gases[/datum/gas/plasma][MOLES] -= heat_efficency * 5 cached_gases[/datum/gas/carbon_dioxide][MOLES] -= heat_efficency - cached_gases[/datum/gas/bz][MOLES] -= heat_efficency * 0.5 + cached_gases[/datum/gas/bz][MOLES] -= heat_efficency * 0.25 cached_gases[/datum/gas/freon][MOLES] += heat_efficency * 2 if(energy_used > 0) diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index b6307460f77..876f4c9d782 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -113,7 +113,7 @@ /obj/machinery/portable_atmospherics/canister/nob name = "hyper-noblium canister" desc = "Hyper-Noblium. More noble than all other gases." - icon_state = "freon" + icon_state = "nob" gas_type = /datum/gas/hypernoblium /obj/machinery/portable_atmospherics/canister/nitryl diff --git a/code/modules/cargo/exports/large_objects.dm b/code/modules/cargo/exports/large_objects.dm index 8d95fb56f43..9373e6b8514 100644 --- a/code/modules/cargo/exports/large_objects.dm +++ b/code/modules/cargo/exports/large_objects.dm @@ -130,7 +130,7 @@ var/obj/machinery/portable_atmospherics/canister/C = O var/worth = 10 var/gases = C.air_contents.gases - C.air_contents.assert_gases(/datum/gas/bz,/datum/gas/stimulum,/datum/gas/hypernoblium,/datum/gas/miasma,/datum/gas/tritium,/datum/gas/pluoxium) + C.air_contents.assert_gases(/datum/gas/bz,/datum/gas/stimulum,/datum/gas/hypernoblium,/datum/gas/miasma,/datum/gas/tritium,/datum/gas/pluoxium,/datum/gas/freon) worth += gases[/datum/gas/bz][MOLES]*4 worth += gases[/datum/gas/stimulum][MOLES]*100 @@ -138,4 +138,5 @@ worth += gases[/datum/gas/miasma][MOLES]*10 worth += gases[/datum/gas/tritium][MOLES]*5 worth += gases[/datum/gas/pluoxium][MOLES]*5 + worth += gases[/datum/gas/freon][MOLES]*15 return worth diff --git a/icons/obj/atmos.dmi b/icons/obj/atmos.dmi index d71a21cd9c8..74e98d49b1f 100644 Binary files a/icons/obj/atmos.dmi and b/icons/obj/atmos.dmi differ diff --git a/icons/obj/stack_objects.dmi b/icons/obj/stack_objects.dmi index bb919e16a95..a8073c88907 100644 Binary files a/icons/obj/stack_objects.dmi and b/icons/obj/stack_objects.dmi differ