mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-30 08:29:57 +01:00
Fixes Phoron Salts Again (#5585)
Because I'm an idiot I realised that phoron salt bombs are actually impossible because water turns to ice when frozen, and you need frozen water in order to make a working bomb. I also fixed a few bugs regarding cryo/pyro mixes in reagents. It only took me 5 hours to figure out. I also made Phoron Salts containers spawn with a stable temperature so admins don't blow up when they mess around with it. I adjusted the explosion size of phoron salts so that absolute best case scenario, you can make a bomb that has the destructive radius of a screen.
This commit is contained in:
@@ -48,7 +48,7 @@
|
||||
return get_thermal_energy() / volume
|
||||
|
||||
/datum/reagent/proc/add_thermal_energy(var/added_energy)
|
||||
thermal_energy += added_energy
|
||||
thermal_energy = max(0,thermal_energy + added_energy)
|
||||
return added_energy
|
||||
|
||||
/datum/reagent/proc/set_thermal_energy(var/set_energy)
|
||||
@@ -110,14 +110,15 @@
|
||||
/datum/reagents/proc/has_all_temperatures(var/list/required_temperatures_min, var/list/required_temperatures_max)
|
||||
|
||||
for(var/datum/reagent/current in reagent_list)
|
||||
|
||||
var/current_temperature = current.get_temperature()
|
||||
|
||||
if(current.id in required_temperatures_min) //The current temperature must be greater than this temperature
|
||||
var/current_temperature = current.get_temperature()
|
||||
var/required_temperature = required_temperatures_min[current.id]
|
||||
if(current_temperature < required_temperature) //Current temperature is less than the required temperature,
|
||||
return FALSE
|
||||
|
||||
if(current.id in required_temperatures_max) //The current temperature must be less than this temperature.
|
||||
var/current_temperature = current.get_temperature()
|
||||
var/required_temperature = required_temperatures_max[current.id]
|
||||
if(current_temperature > required_temperature) //Current temperature is greater than the required temperature.
|
||||
return FALSE
|
||||
|
||||
Reference in New Issue
Block a user