Skip to content

Commit

Permalink
Merge branch 'research_no_plus' into 'dev'
Browse files Browse the repository at this point in the history
Fixes certain generated chem names glitching nanoUI

Closes #8932

See merge request cmdevs/ColonialMarines!4301
  • Loading branch information
CM Dev committed Apr 11, 2020
2 parents 38375e0 + d3866b7 commit 49bc5b3
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 4 deletions.
4 changes: 0 additions & 4 deletions code/modules/reagents/chemistry_machinery/chem_simulator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -280,10 +280,6 @@
suffix += property_codings[P] + "[C.properties[P]]"
else //This property was added through relation
suffix += property_codings[P] + "[C.properties[P]]"
if(C.overdose > O.overdose)
suffix += "+"
else if(C.overdose < O.overdose)
suffix += "-"
return O.name + suffix

/obj/structure/machinery/chem_simulator/proc/amplify()
Expand Down
36 changes: 36 additions & 0 deletions html/changelogs/research_no_plus.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: "Research chem names no longer end on a + or -. Apparently this was the reason some chems would glitch in nanoUI and become unpillable. Thanks to Alardun for helping discover the fix to this."

0 comments on commit 49bc5b3

Please sign in to comment.