Merge branch 'Mirio/opium' into 'master'

Mirio/opium

See merge request xonotic/xonotic-maps.pk3dir!135

diff --combined scripts/shaderlist.txt
index 35899354e17f58b13d8080235979897243c9ffa8,16c0f8bfe8962b13d40ad66526be32b69d35e5c4..2cbdd89c7a8a9ccbc8f47ee1d1264d75b57f7f0d
--- 1/scripts/shaderlist.txt
--- 2/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -21,7 -21,6 +21,7 @@@ logo
  map_atelier
  map_boil
  map_catharsis
 +map_bromine
  map_courtfun
  map_darkzone
  map_erbium
@@@ -30,6 -29,7 +30,7 @@@ map_glowplan
  map_implosion
  map_leave_em_behind
  map_oilrig
+ map_opium
  map_silentsiege
  map_solarium
  map_space-elevator