Skip to content

Commit

Permalink
Merge branch 'fire_radius_fix' into 'dev'
Browse files Browse the repository at this point in the history
Fixes chemfire radius

See merge request cmdevs/ColonialMarines!4302
  • Loading branch information
CM Dev committed Apr 11, 2020
2 parents e7613d1 + 400220e commit 38375e0
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 1 deletion.
2 changes: 1 addition & 1 deletion code/modules/reagents/Chemistry-Holder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ var/const/INGEST = 2
supplemented += R.intensitymod * R.volume
intensity += R.intensitymod * R.volume
duration += R.durationmod * R.volume
radius += R.radiusmod * R.
radius += R.radiusmod * R.volume
if(R.id == "phosphorus")
smokerad = min(R.volume / 10, max_fire_rad - 1)
//only integers please
Expand Down
36 changes: 36 additions & 0 deletions html/changelogs/fire_radius_fix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
#################################

# Your name.
author: TobiNerd

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "Fixed chembomb fire radius modifier not multiplying by chem volume."

0 comments on commit 38375e0

Please sign in to comment.