fix fixedRatio when VideoBuffer::Resize'ing, fixes #121
Merge pull request #159 from mniip/stamps

fix resizing in VideoBuffer::Resize, fixes #121
proton collision reaction (might need to be modified). Also some ways to go to/from protons
new element: VIRS (also solid and gas virus states). Cured by SOAP (CURE element was not added)
Make effect of PROT on wifi and portals independent of channel temperature ranges

Cold PROT decreases channel by 1, v cold by 10. Hot PROT increases channel by 1, v hot by 10.
Since the effect is specified in terms of effect on channel number not on temperature, this will
cause less problems if the temperature gap is ever decreased to add more channels.
fix BCOL melting and not burning when heat sim is off
fix segfault on wordwrapping a string with a character >=128
Include elements[].Enabled in check for invalid lava ctype
Don't reset decorations when sparking with INWR+CRAY(most things)

INWR+CRAY(SOAP) will reset decorations
Enabled check for PIPE too
Revert "Don't reset decorations when sparking with INWR+CRAY(most things)"

This reverts commit 5ad67f7778ede58e9708c43587d694e446a2377b.
CRAY: only set decoration colour after passing through FILT
Missing breaks in readOPS

Causing some elements to be loaded incorrectly
Merge remote-tracking branch 'upstream/master' into mymod-dev