Merge branch 'Mirio/toxic' into matthiaskrgr/toxic

Conflicts:
	maps/toxic.map.options

diff --cc maps/drain.map.options
index b502f7550cba1702a4747c8498b7a0784c7cf08f,b502f7550cba1702a4747c8498b7a0784c7cf08f..794822837d7ce357526b29b5712555cd653a6b00
--- 1/maps/drain.map.options
--- 2/maps/drain.map.options
+++ b/maps/drain.map.options
@@@ -1,5 -1,5 +1,5 @@@
  -scale 1:1.3
---bsp + -samplesize 6
++-bsp + -samplesize 1
  -light + -dirtscale 2 -bounce 8 -bouncescale 1.2 -exposure 170 -areascale 1.25 -pointscale 1.3 -randomsamples -samples 128
  -vis +
  -minimap +

diff --cc maps/toxic.map.options
index a02c8736a7737f7c6aa239082e42201101a5325d,9e495e525184cd83bcd2e5e4055f01011ea6f2e9..04dd6297c2564793de1b77382b071aa1dcd5d68d
--- 1/maps/toxic.map.options
--- 2/maps/toxic.map.options
+++ b/maps/toxic.map.options
@@@ -3,4 -3,4 +3,4 @@@
  -vis +
  -minimap +
  -nosRGB
- Version: 6
 -Version: 7
++Version: 7