Skip to content

Commit

Permalink
Fixes smoke not creating enough reagents (tgstation#12337)
Browse files Browse the repository at this point in the history
* Fixes smoke not creating enough reagents

* Okay, this worked
  • Loading branch information
yoyobatty authored and steamport committed Nov 21, 2019
1 parent 3679837 commit 473f95e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 4 additions & 2 deletions hippiestation/code/modules/reagents/chemistry/holder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,12 @@
R.reaction_turf(A, R.volume * volume_modifier, show_message)
if(world.time >= next_react)
R.handle_state_change(A, R.volume * special_modifier, cached_my_atom)
next_react = world.time + 1
if(method == VAPOR)
next_react = world.time + 1
if("OBJ")
if(R.reagent_state != SOLID)
R.reaction_obj(A, R.volume * volume_modifier, show_message)
if(world.time >= next_react)
R.handle_state_change(get_turf(A), R.volume * special_modifier, cached_my_atom)
next_react = world.time + 1
if(method == VAPOR)
next_react = world.time + 1
6 changes: 2 additions & 4 deletions hippiestation/code/modules/reagents/chemistry/reagents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@
if(atom && istype(atom, /obj/effect/particle_effect))
volume *= LIQUID_PARTICLE_EFFECT_EFFICIENCY//big nerf to smoke and foam duping

var/obj/effect/decal/cleanable/chempile/c = locate() in T//handles merging existing chempiles
if(istype(c))
for(var/obj/effect/decal/cleanable/chempile/c in T.contents)//handles merging existing chempiles
if(c.reagents)
if(touch_msg)
c.add_fingerprint(touch_mob)
Expand All @@ -103,8 +102,7 @@
if(atom && istype(atom, /obj/effect/particle_effect))
volume *= SOLID_PARTICLE_EFFECT_EFFICIENCY//big nerf to smoke and foam duping

var/obj/item/reagent_containers/food/snacks/solid_reagent/SR = locate() in T
if(istype(SR))
for(var/obj/item/reagent_containers/food/snacks/solid_reagent/SR in T.contents)
if(SR.reagents && SR.reagent_type == type && SR.reagents.total_volume < 200)
if(touch_msg)
SR.add_fingerprint(touch_mob)
Expand Down

0 comments on commit 473f95e

Please sign in to comment.