cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-31 00:58:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Freon fixes, tweaks and balancing (#50153)

Browse Source 
* balancing, fixes, tweaks

* freon specific_heat increase

* fix an issue with negative temperature

* changed HyperNob canister color

* done change request and tweaked more the hardcap limit
This commit is contained in:
Ghilker
2020-03-28 21:31:35 +01:00
committed by GitHub
parent 34c93e55ab
commit 22cf0dc785
10 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/atmospherics/gasmixtures/gas_types.dm
+1 -1
View File
@@ -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
code/modules/atmospherics/gasmixtures/reactions.dm
+4 -4
View File
@@ -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)
code/modules/atmospherics/machinery/portable/canister.dm
+1 -1
View File
@@ -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
code/modules/cargo/exports/large_objects.dm
+2 -1
View File
@@ -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