Skip to content

Commit

Permalink
Merge pull request tgstation#54223 from Putnam3145/patch-2
Browse files Browse the repository at this point in the history
Rebalances pluox gen back to pre-newgas levels
  • Loading branch information
ShizCalev authored Oct 8, 2020
2 parents e9c47aa + c131d80 commit bdb4150
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions code/game/turfs/open/_open.dm
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,9 @@
if (air.gases[/datum/gas/carbon_dioxide] && air.gases[/datum/gas/oxygen])
pulse_strength = min(pulse_strength, air.gases[/datum/gas/carbon_dioxide][MOLES] * 1000, air.gases[/datum/gas/oxygen][MOLES] * 2000) //Ensures matter is conserved properly
air.gases[/datum/gas/carbon_dioxide][MOLES] = max(air.gases[/datum/gas/carbon_dioxide][MOLES] - (pulse_strength * 0.001),0)
air.gases[/datum/gas/oxygen][MOLES] = max(air.gases[/datum/gas/oxygen][MOLES]-(pulse_strength * 0.002),0)
air.gases[/datum/gas/oxygen][MOLES] = max(air.gases[/datum/gas/oxygen][MOLES]-(pulse_strength * 0.0005),0)
air.assert_gas(/datum/gas/pluoxium)
air.gases[/datum/gas/pluoxium][MOLES] +=(pulse_strength * 0.004)
air.gases[/datum/gas/pluoxium][MOLES] +=(pulse_strength * 0.00025)
air.garbage_collect()
air_update_turf()
if (air.gases[/datum/gas/hydrogen])
Expand Down

0 comments on commit bdb4150

Please sign in to comment.