From bbdd501fe01999ca38b27bb1f62b6e53e2f31392 Mon Sep 17 00:00:00 2001 From: lass9030 Date: Sat, 20 Oct 2018 22:56:29 +0200 Subject: [PATCH] teslium and liquid dark matter --- .../reagents/chemistry/recipes/pyrotechnics.dm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index b08e96a8d9e..3901bdffc3e 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -97,9 +97,9 @@ /datum/chemical_reaction/sorium/on_reaction(datum/reagents/holder, created_volume) if(holder.has_reagent("stabilizing_agent")) return - holder.remove_reagent("sorium", created_volume) var/turf/simulated/T = get_turf(holder.my_atom) - goonchem_vortex(T, 1, 5, 6) + goonchem_vortex(T, 1, round(created_volume / 33), round(created_volume / 25)) + holder.remove_reagent("sorium", created_volume) /datum/chemical_reaction/sorium_vortex name = "sorium_vortex" @@ -110,7 +110,7 @@ /datum/chemical_reaction/sorium_vortex/on_reaction(datum/reagents/holder, created_volume) var/turf/simulated/T = get_turf(holder.my_atom) - goonchem_vortex(T, 1, 5, 6) + goonchem_vortex(T, 1, round(created_volume / 33), round(created_volume / 25)) /datum/chemical_reaction/liquid_dark_matter name = "Liquid Dark Matter" @@ -121,10 +121,10 @@ /datum/chemical_reaction/liquid_dark_matter/on_reaction(datum/reagents/holder, created_volume) if(holder.has_reagent("stabilizing_agent")) - return - holder.remove_reagent("liquid_dark_matter", created_volume) + return FALSE var/turf/simulated/T = get_turf(holder.my_atom) - goonchem_vortex(T, 0, 5, 6) + goonchem_vortex(T, 0, round(created_volume / 33), round(created_volume / 25)) + holder.remove_reagent("liquid_dark_matter", created_volume) /datum/chemical_reaction/ldm_vortex name = "LDM Vortex" @@ -135,7 +135,7 @@ /datum/chemical_reaction/ldm_vortex/on_reaction(datum/reagents/holder, created_volume) var/turf/simulated/T = get_turf(holder.my_atom) - goonchem_vortex(T, 0, 5, 6) + goonchem_vortex(T, 0, round(created_volume / 33), round(created_volume / 25)) /datum/chemical_reaction/blackpowder name = "Black Powder" @@ -411,9 +411,9 @@ datum/chemical_reaction/flash_powder /datum/chemical_reaction/shock_explosion/on_reaction(datum/reagents/holder, created_volume) var/turf/T = get_turf(holder.my_atom) - for(var/mob/living/carbon/C in view(6, T)) + for(var/mob/living/carbon/C in view(max(1, round(created_volume / 3)), T)) C.Beam(T,icon_state="lightning[rand(1,12)]",icon='icons/effects/effects.dmi',time=5) //What? Why are we beaming from the mob to the turf? Turf to mob generates really odd results. - C.electrocute_act(3.5, "electrical blast") + C.electrocute_act(max(1, round(created_volume / 5)), "electrical blast") holder.del_reagent("teslium") //Clear all remaining Teslium and Uranium, but leave all other reagents untouched. holder.del_reagent("uranium")