cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9934 from lass9030/reaction-scaling

Browse Source 
Reaction scaling
This commit is contained in:
tigercat2000
2018-10-23 17:19:13 -07:00
committed by GitHub
parent 13a283eed6 8a023482a4
commit fb08ded489
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+7 -7
View File
@@ -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, min(10, created_volume), min(11, created_volume + 1))
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, min(10, created_volume), min(11, created_volume + 1))
/datum/chemical_reaction/liquid_dark_matter
name = "Liquid Dark Matter"
@@ -122,9 +122,9 @@
/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)
var/turf/simulated/T = get_turf(holder.my_atom)
goonchem_vortex(T, 0, 5, 6)
goonchem_vortex(T, 0, min(10, created_volume), min(11, created_volume + 1))
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, min(10, created_volume), min(11, created_volume + 1))
/datum/chemical_reaction/blackpowder
name = "Black Powder"
@@ -411,7 +411,7 @@ 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(min(8, round(created_volume * 2)), 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")
holder.del_reagent("teslium") //Clear all remaining Teslium and Uranium, but leave all other reagents untouched.