Merge remote-tracking branch 'origin/divVerent/new-laser-by-morphed'

diff --combined scripts/weapons.shader
index 1243955c8b66cf7c69663922d64b9f26a0f9fc34,d9eac2bb90f14af51fee96ba0208bb8707841bd0..5a2532e6408eece8229a61845602b289da8f2212
--- 1/scripts/weapons.shader
--- 2/scripts/weapons.shader
+++ b/scripts/weapons.shader
@@@ -54,6 -54,14 +54,6 @@@ shotgun
                rgbgen lightingDiffuse
        }
  }
 -nex
 -{
 -      dpreflectcube cubemaps/default/sky
 -      {
 -              map textures/nex.tga
 -              rgbgen lightingDiffuse
 -      }
 -}
  rl
  {
        dpreflectcube cubemaps/default/sky
@@@ -62,11 -70,11 +62,11 @@@
                rgbgen lightingDiffuse
        }
  }
- laser
+ models/weapons/laser
  {
        dpreflectcube cubemaps/default/sky
        {
-               map textures/laser.tga
+               map models/weapons/laser.tga
                rgbgen lightingDiffuse
        }
  }