Merge remote-tracking branch 'origin/maejong'

2 files changed, 14 insertions, 12 deletions

diff --git a/scripts/analmango.shader b/scripts/analmango.shader
index 569c121..4d8cc61 100644
--- a/scripts/analmango.shader
+++ b/scripts/analmango.shader
@@ -732,25 +732,27 @@ textures/analmango/reactor_blueprints
 
 textures/analmango/enferderubis
 {
-	surfaceparm solid
+	surfaceparm nolightmap
 	deformVertexes wave 6 sin 2.3 1.7 0.3 0.3
 	{
 		map textures/analmango/enferderubis.jpg
+		rgbGen vertex
 	}
 }
 
-textures/analmango/conveyor_belt
+textures/analmango/SOSANTILIFE
 {
-	surfaceparm nomarks
-	q3map_shadeAngle 179
-
+	q3map_surfacelight 750
 	{
-		map textures/analmango/conveyor_belt.jpg
-		tcMod scroll 0 1
+		map textures/analmango/SOSANTILIFE.jpg
 	}
+}
+
+textures/analmango/theparty
+{
+	surfaceparm nonsolid
+	q3map_surfacelight 1
 	{
-		map $lightmap
-		tcGen lightmap
-		blendFunc filter
+		map textures/analmango/theparty.jpg
 	}
 }
diff --git a/scripts/analmango_pre.shader b/scripts/analmango_pre.shader
index 726bfec..6e48e8e 100644
--- a/scripts/analmango_pre.shader
+++ b/scripts/analmango_pre.shader
@@ -2,7 +2,7 @@ textures/analmango_pre/transparent_red
 {
 	surfaceparm lightfilter
 	{
-		map textures/analmango_pre/transparent_red.jpg
+		map textures/analmango_pre/transparent_red.tga
 		blendfunc filter
     }
-}
+}
\ No newline at end of file