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:
BurgerLUA
2018-11-10 13:29:40 -08:00
committed by Werner
parent 7a23254be9
commit 575372ea6b
7 changed files with 97 additions and 24 deletions
@@ -17,9 +17,7 @@
/obj/item/weapon/grenade/chem_grenade/Initialize()
. = ..()
var/datum/reagents/R = new/datum/reagents(1000)
reagents = R
R.my_atom = src
create_reagents(1000)
/obj/item/weapon/grenade/chem_grenade/attack_self(mob/user as mob)
if(!stage || stage==1)
@@ -143,7 +141,8 @@
var/has_reagents = 0
for(var/obj/item/weapon/reagent_containers/glass/G in beakers)
if(G.reagents.total_volume) has_reagents = 1
if(G.reagents.total_volume)
has_reagents = 1
active = 0
if(!has_reagents)
@@ -159,7 +158,6 @@
return
playsound(src.loc, 'sound/effects/bamf.ogg', 50, 1)
for(var/obj/item/weapon/reagent_containers/glass/G in beakers)
G.reagents.trans_to_obj(src, G.reagents.total_volume)
@@ -324,6 +322,7 @@
beakers += B2
icon_state = initial(icon_state) +"_locked"
/obj/item/weapon/grenade/chem_grenade/teargas
name = "tear gas grenade"
desc = "Concentrated Capsaicin. Contents under pressure. Use with caution."