Merge remote-tracking branch 'origin/maejong'

2 files changed, 11 insertions, 4 deletions

diff --git a/scripts/analmango.shader b/scripts/analmango.shader
index 929fed6..dfccf5e 100644
--- a/scripts/analmango.shader
+++ b/scripts/analmango.shader
@@ -729,3 +729,12 @@ textures/analmango/reactor_blueprints
 		blendFunc add
 	}
 }
+
+textures/analmango/enferderubis
+{
+	surfaceparm solid
+	deformVertexes wave 6 sin 2.3 1.7 0.3 0.3
+	{
+		map textures/analmango/enferderubis.jpg
+	}
+}
\ No newline at end of file
diff --git a/scripts/analmango_pre.shader b/scripts/analmango_pre.shader
index c2c9e0a..726bfec 100644
--- a/scripts/analmango_pre.shader
+++ b/scripts/analmango_pre.shader
@@ -1,10 +1,8 @@
-textures/analmango/transparent_red
+textures/analmango_pre/transparent_red
 {
-	qer_editorImage textures/analmango_pre/transparent_red.jpg
-
 	surfaceparm lightfilter
 	{
 		map textures/analmango_pre/transparent_red.jpg
 		blendfunc filter
-	}
+    }
 }