diff --git a/gldefs.ammo b/gldefs.ammo
index 126cc2b8f..1f858b9b5 100644
--- a/gldefs.ammo
+++ b/gldefs.ammo
@@ -1,3 +1,34 @@
+HardwareShader Texture "models/ExplodiumBullet.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/ExplodiumBullet_mask.png"
+	Texture "envtex" "models/envmap/lavaenv.png"
+	Texture "rimtex" "models/envmap/lavarim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".8"
+	Define "RIMFACT" = ".9"
+	Define "RIMSTEP" = ".2"
+}
+HardwareShader Texture "models/ExplodiumCasing.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/ExplodiumCasing_mask.png"
+	Texture "envtex" "models/envmap/goldenv.png"
+	Texture "rimtex" "models/envmap/goldrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".4"
+	Define "RIMFACT" = ".8"
+}
+HardwareShader Texture "models/ExplodiumCasing_Used.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/ExplodiumCasing_Used_mask.png"
+	Texture "envtex" "models/envmap/goldenv.png"
+	Texture "rimtex" "models/envmap/goldrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".4"
+	Define "RIMFACT" = ".8"
+}
 HardwareShader Texture "models/Shell_Normal.png"
 {
 	Shader "shaders/glsl/Envmask.fp"
@@ -84,6 +115,143 @@ HardwareShader Texture "models/SparksterAmmo.png"
 	Define "ENVFACT" = ".75"
 	Define "RIMFACT" = ".9"
 }
+HardwareShader Texture "models/SilverBulletAmmo.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/SilverBulletAmmo_mask.png"
+	Texture "envtex" "models/envmap/iceenv.png"
+	Texture "rimtex" "models/envmap/icerim.png"
+	Texture "envtex2" "models/envmap/goldenv.png"
+	Texture "rimtex2" "models/envmap/goldrim.png"
+	Texture "envtex3" "models/envmap/silverenv.png"
+	Texture "rimtex3" "models/envmap/silverrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".6"
+	Define "RIMFACT" = ".5"
+	Define "RIMSTEP" = "0."
+	Define "ENV_THREELAYER"
+	Define "ENVFACT2" = "1.1"
+	Define "RIMFACT2" = "1.3"
+	Define "RIMSTEP2" = "0."
+	Define "ENVFACT3" = ".8"
+	Define "RIMFACT3" = ".9"
+	Define "RIMSTEP3" = ".2"
+}
+HardwareShader Texture "models/SilverBulletAmmo_Empty.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/SilverBulletAmmo_Empty_mask.png"
+	Texture "envtex" "models/envmap/iceenv.png"
+	Texture "rimtex" "models/envmap/icerim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".7"
+	Define "RIMFACT" = ".8"
+	Define "RIMSTEP" = "0."
+}
+HardwareShader Texture "models/SilverBulletBullet.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/SilverBulletBullet_mask.png"
+	Texture "envtex" "models/envmap/goldenv.png"
+	Texture "rimtex" "models/envmap/goldrim.png"
+	Texture "envtex2" "models/envmap/silverenv.png"
+	Texture "rimtex2" "models/envmap/silverrim.png"
+	Define "ENVFACT" = "1.1"
+	Define "RIMFACT" = "1.3"
+	Define "RIMSTEP" = "0."
+	Define "ENV_TWOLAYER"
+	Define "ENVFACT2" = ".8"
+	Define "RIMFACT2" = ".9"
+	Define "RIMSTEP2" = ".2"
+}
+HardwareShader Texture "models/SilverBulletBullet_Used.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/SilverBulletBullet_Used_mask.png"
+	Texture "envtex" "models/envmap/goldenv.png"
+	Texture "rimtex" "models/envmap/goldrim.png"
+	Texture "envtex2" "models/envmap/silverenv.png"
+	Texture "rimtex2" "models/envmap/silverrim.png"
+	Define "ENVFACT" = "1.1"
+	Define "RIMFACT" = "1.3"
+	Define "RIMSTEP" = "0."
+	Define "ENV_TWOLAYER"
+	Define "ENVFACT2" = ".8"
+	Define "RIMFACT2" = ".9"
+	Define "RIMSTEP2" = ".2"
+}
+HardwareShader Texture "models/YnykronAmmo.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/YnykronAmmo_mask.png"
+	Texture "envtex" "models/envmap/leadenv.png"
+	Texture "rimtex" "models/envmap/leadrim.png"
+	Texture "envtex2" "models/envmap/dekaenv.png"
+	Texture "rimtex2" "models/envmap/dekarim.png"
+	Texture "envtex3" "models/envmap/puroenv.png"
+	Texture "rimtex3" "models/envmap/purorim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".8"
+	Define "RIMFACT" = ".9"
+	Define "RIMSTEP" = "0."
+	Define "ENV_THREELAYER"
+	Define "ENVFACT2" = "1.1"
+	Define "RIMFACT2" = ".9"
+	Define "RIMSTEP2" = ".3"
+	Define "ENVFACT3" = ".8"
+	Define "RIMFACT3" = "1.1"
+	Define "RIMSTEP3" = ".2"
+}
+HardwareShader Texture "models/CandyBullet.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/ExplodiumBullet_mask.png"
+	Texture "envtex" "models/envmap/purpenv.png"
+	Texture "rimtex" "models/envmap/purprim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".9"
+	Define "RIMFACT" = ".4"
+	Define "RIMSTEP" = "0."
+}
+HardwareShader Texture "models/CandyCasing.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/ExplodiumCasing_mask.png"
+	Texture "envtex" "models/envmap/purpenv.png"
+	Texture "rimtex" "models/envmap/purprim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".4"
+	Define "RIMFACT" = ".8"
+}
+HardwareShader Texture "models/CandyCasing_Used.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/ExplodiumCasing_Used_mask.png"
+	Texture "envtex" "models/envmap/purpenv.png"
+	Texture "rimtex" "models/envmap/purprim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".4"
+	Define "RIMFACT" = ".8"
+}
+Brightmap Texture "models/YnykronAmmo.png"
+{
+	map "models/YnykronAmmo_bright.png"
+}
+HardwareShader Texture "models/YnykronRod.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/YnykronRod_mask.png"
+	Texture "envtex" "models/envmap/puroenv.png"
+	Texture "rimtex" "models/envmap/purorim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".8"
+	Define "RIMFACT" = "1.1"
+	Define "RIMSTEP" = ".2"
+}
+Brightmap Texture "models/YnykronRod.png"
+{
+	map "models/YnykronRod_bright.png"
+}
 Brightmap Texture "models/Fabricator.png"
 {
 	map "models/Fabricator_bright.png"
diff --git a/gldefs.demolitionist b/gldefs.demolitionist
index ed1963c9b..b1660a569 100644
--- a/gldefs.demolitionist
+++ b/gldefs.demolitionist
@@ -66,63 +66,372 @@ Brightmap Texture "models/DemoTags.png"
 {
 	Map "models/DemoTags_bright.png"
 }
+HardwareShader Texture "models/DemoTags.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoArms_mask.png"
+	Texture "envtex" "models/envmap/iceenv.png"
+	Texture "rimtex" "models/envmap/icerim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT2" = "1.2"
+	Define "RIMFACT2" = "1.4"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoTagsBlue.png"
 {
 	Map "models/DemoTags_bright.png"
 }
+HardwareShader Texture "models/DemoTagsBlue.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoArms_mask.png"
+	Texture "envtex" "models/envmap/iceenv.png"
+	Texture "rimtex" "models/envmap/icerim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT2" = "1.2"
+	Define "RIMFACT2" = "1.4"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoTagsCyan.png"
 {
 	Map "models/DemoTags_bright.png"
 }
+HardwareShader Texture "models/DemoTagsCyan.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoArms_mask.png"
+	Texture "envtex" "models/envmap/iceenv.png"
+	Texture "rimtex" "models/envmap/icerim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT2" = "1.2"
+	Define "RIMFACT2" = "1.4"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoTagsDragonfly.png"
 {
 	Map "models/DemoTags_bright.png"
 }
+HardwareShader Texture "models/DemoTagsDragonfly.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoArms_mask.png"
+	Texture "envtex" "models/envmap/iceenv.png"
+	Texture "rimtex" "models/envmap/icerim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT2" = "1.2"
+	Define "RIMFACT2" = "1.4"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoTagsGold.png"
 {
 	Map "models/DemoTags_bright.png"
 }
+HardwareShader Texture "models/DemoTagsGold.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoArms_mask.png"
+	Texture "envtex" "models/envmap/iceenv.png"
+	Texture "rimtex" "models/envmap/icerim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT2" = "1.2"
+	Define "RIMFACT2" = "1.4"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoTagsMagenta.png"
 {
 	Map "models/DemoTags_bright.png"
 }
+HardwareShader Texture "models/DemoTagsMagenta.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoArms_mask.png"
+	Texture "envtex" "models/envmap/iceenv.png"
+	Texture "rimtex" "models/envmap/icerim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT2" = "1.2"
+	Define "RIMFACT2" = "1.4"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoTagsOrange.png"
 {
 	Map "models/DemoTags_bright.png"
 }
+HardwareShader Texture "models/DemoTagsOrange.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoArms_mask.png"
+	Texture "envtex" "models/envmap/iceenv.png"
+	Texture "rimtex" "models/envmap/icerim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT2" = "1.2"
+	Define "RIMFACT2" = "1.4"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoTagsPeach.png"
 {
 	Map "models/DemoTags_bright.png"
 }
+HardwareShader Texture "models/DemoTagsPeach.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoArms_mask.png"
+	Texture "envtex" "models/envmap/iceenv.png"
+	Texture "rimtex" "models/envmap/icerim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT2" = "1.2"
+	Define "RIMFACT2" = "1.4"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoTagsPink.png"
 {
 	Map "models/DemoTags_bright.png"
 }
+HardwareShader Texture "models/DemoTagsPink.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoArms_mask.png"
+	Texture "envtex" "models/envmap/iceenv.png"
+	Texture "rimtex" "models/envmap/icerim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT2" = "1.2"
+	Define "RIMFACT2" = "1.4"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoTagsPurple.png"
 {
 	Map "models/DemoTags_bright.png"
 }
+HardwareShader Texture "models/DemoTagsPurple.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoArms_mask.png"
+	Texture "envtex" "models/envmap/iceenv.png"
+	Texture "rimtex" "models/envmap/icerim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT2" = "1.2"
+	Define "RIMFACT2" = "1.4"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoTagsRed.png"
 {
 	Map "models/DemoTags_bright.png"
 }
+HardwareShader Texture "models/DemoTagsRed.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoArms_mask.png"
+	Texture "envtex" "models/envmap/iceenv.png"
+	Texture "rimtex" "models/envmap/icerim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT2" = "1.2"
+	Define "RIMFACT2" = "1.4"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoTagsViolet.png"
 {
 	Map "models/DemoTags_bright.png"
 }
+HardwareShader Texture "models/DemoTagsViolet.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoArms_mask.png"
+	Texture "envtex" "models/envmap/iceenv.png"
+	Texture "rimtex" "models/envmap/icerim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT2" = "1.2"
+	Define "RIMFACT2" = "1.4"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoTagsWhite.png"
 {
 	Map "models/DemoTags_bright.png"
 }
+HardwareShader Texture "models/DemoTagsWhite.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoArms_mask.png"
+	Texture "envtex" "models/envmap/iceenv.png"
+	Texture "rimtex" "models/envmap/icerim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT2" = "1.2"
+	Define "RIMFACT2" = "1.4"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoTagsYellow.png"
 {
 	Map "models/DemoTags_bright.png"
 }
+HardwareShader Texture "models/DemoTagsYellow.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoArms_mask.png"
+	Texture "envtex" "models/envmap/iceenv.png"
+	Texture "rimtex" "models/envmap/icerim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT2" = "1.2"
+	Define "RIMFACT2" = "1.4"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoTagsBlack.png"
 {
 	Map "models/DemoTags_bright.png"
 }
+HardwareShader Texture "models/DemoTagsBlack.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoArms_mask.png"
+	Texture "envtex" "models/envmap/iceenv.png"
+	Texture "rimtex" "models/envmap/icerim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT2" = "1.2"
+	Define "RIMFACT2" = "1.4"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoTagsRust.png"
 {
 	Map "models/DemoTags_bright.png"
 }
+HardwareShader Texture "models/DemoTagsRust.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoArms_mask.png"
+	Texture "envtex" "models/envmap/iceenv.png"
+	Texture "rimtex" "models/envmap/icerim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT2" = "1.2"
+	Define "RIMFACT2" = "1.4"
+	Define "RIMSTEP" = "0."
+}
+HardwareShader Texture "models/DemoArms.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoArms_mask.png"
+	Texture "envtex" "models/envmap/leadenv.png"
+	Texture "rimtex" "models/envmap/leadrim.png"
+	Texture "envtex2" "models/envmap/iceenv.png"
+	Texture "rimtex2" "models/envmap/icerim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = "1.5"
+	Define "RIMFACT" = "1.3"
+	Define "RIMSTEP" = "0."
+	Define "ENV_TWOLAYER"
+	Define "ENVFACT2" = "1.2"
+	Define "RIMFACT2" = "1.4"
+	Define "RIMSTEP2" = "0."
+}
+HardwareShader Texture "models/DemoBody.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoBody_mask.png"
+	Texture "envtex" "models/envmap/leadenv.png"
+	Texture "rimtex" "models/envmap/leadrim.png"
+	Texture "envtex2" "models/envmap/iceenv.png"
+	Texture "rimtex2" "models/envmap/icerim.png"
+	Texture "envtex3" "models/envmap/ekaenv.png"
+	Texture "rimtex3" "models/envmap/ekarim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = "1.5"
+	Define "RIMFACT" = "1.3"
+	Define "RIMSTEP" = "0."
+	Define "ENV_THREELAYER"
+	Define "ENVFACT2" = "1.2"
+	Define "RIMFACT2" = "1.4"
+	Define "RIMSTEP2" = "0."
+	Define "ENVFACT3" = ".8"
+	Define "RIMFACT3" = ".9"
+	Define "RIMSTEP3" = "0."
+}
+HardwareShader Texture "models/DemoHead.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoHead_mask.png"
+	Texture "envtex" "models/envmap/leadenv.png"
+	Texture "rimtex" "models/envmap/leadrim.png"
+	Texture "envtex2" "models/envmap/iceenv.png"
+	Texture "rimtex2" "models/envmap/icerim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = "1.5"
+	Define "RIMFACT" = "1.3"
+	Define "RIMSTEP" = "0."
+	Define "ENV_TWOLAYER"
+	Define "ENVFACT2" = "1.2"
+	Define "RIMFACT2" = "1.4"
+	Define "RIMSTEP2" = "0."
+}
+HardwareShader Texture "models/DemoLegs.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoLegs_mask.png"
+	Texture "envtex" "models/envmap/leadenv.png"
+	Texture "rimtex" "models/envmap/leadrim.png"
+	Texture "envtex2" "models/envmap/iceenv.png"
+	Texture "rimtex2" "models/envmap/icerim.png"
+	Texture "envtex3" "models/envmap/lavaenv.png"
+	Texture "rimtex3" "models/envmap/lavarim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = "1.5"
+	Define "RIMFACT" = "1.3"
+	Define "RIMSTEP" = "0."
+	Define "ENV_THREELAYER"
+	Define "ENVFACT2" = "1.2"
+	Define "RIMFACT2" = "1.4"
+	Define "RIMSTEP2" = "0."
+	Define "ENVFACT3" = ".8"
+	Define "RIMFACT3" = ".9"
+	Define "RIMSTEP3" = "0."
+}
+HardwareShader Texture "models/DemoKeys.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoKeys_mask.png"
+	Texture "envtex" "models/envmap/silverenv.png"
+	Texture "rimtex" "models/envmap/silverrim.png"
+	Texture "envtex2" "models/envmap/goldenv.png"
+	Texture "rimtex2" "models/envmap/goldrim.png"
+	Texture "envtex3" "models/envmap/iceenv.png"
+	Texture "rimtex3" "models/envmap/icerim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".9"
+	Define "RIMFACT" = "1.2"
+	Define "RIMSTEP" = "0."
+	Define "ENV_THREELAYER"
+	Define "ENVFACT2" = ".8"
+	Define "RIMFACT2" = ".9"
+	Define "RIMSTEP2" = "0."
+	Define "ENVFACT3" = ".5"
+	Define "RIMFACT3" = ".8"
+	Define "RIMSTEP3" = "0."
+}
+HardwareShader Texture "models/DemoMisc.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoMisc_mask.png"
+	Texture "envtex" "models/envmap/leadenv.png"
+	Texture "rimtex" "models/envmap/leadrim.png"
+	Texture "envtex2" "models/envmap/silverenv.png"
+	Texture "rimtex2" "models/envmap/silverrim.png"
+	Texture "envtex3" "models/envmap/iceenv.png"
+	Texture "rimtex3" "models/envmap/icerim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = "1.2"
+	Define "RIMFACT" = "1.1"
+	Define "RIMSTEP" = ".2"
+	Define "ENV_THREELAYER"
+	Define "ENVFACT2" = ".9"
+	Define "RIMFACT2" = "1.2"
+	Define "RIMSTEP2" = "0."
+	Define "ENVFACT3" = ".5"
+	Define "RIMFACT3" = ".8"
+	Define "RIMSTEP3" = "0."
+}
+HardwareShader Texture "models/DemoSoft.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoSoft_mask.png"
+	Texture "envtex" "models/envmap/darkenv.png"
+	Texture "rimtex" "models/envmap/darkrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".3"
+	Define "RIMFACT" = ".5"
+	Define "RIMSTEP" = ".0"
+}
diff --git a/gldefs.funstuff b/gldefs.funstuff
index 033a89362..c7eeb07e1 100644
--- a/gldefs.funstuff
+++ b/gldefs.funstuff
@@ -2,6 +2,17 @@ Brightmap Texture "models/SayaBean.png"
 {
 	Map "models/SayaBean_bright.png"
 }
+HardwareShader Texture "models/SayasMug.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/SayasMug_mask.png"
+	Texture "envtex" "models/envmap/iceenv.png"
+	Texture "rimtex" "models/envmap/icerim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".4"
+	Define "RIMFACT" = ".8"
+	Define "RIMSTEP" = ".4"
+}
 Brightmap Texture "models/DemoPlush.png"
 {
 	Map "models/DemoPlush_bright.png"
diff --git a/gldefs.silverbullet b/gldefs.silverbullet
index 00a90df89..f5f248b79 100644
--- a/gldefs.silverbullet
+++ b/gldefs.silverbullet
@@ -2,15 +2,15 @@ HardwareShader Texture "models/SilverBullet.png"
 {
 	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/SilverBullet_mask.png"
-	Texture "envtex" "models/envmap/silverenv.png"
-	Texture "rimtex" "models/envmap/silverrim.png"
+	Texture "envtex" "models/envmap/iceenv.png"
+	Texture "rimtex" "models/envmap/icerim.png"
 	Texture "envtex2" "models/envmap/ekaenv.png"
 	Texture "rimtex2" "models/envmap/ekarim.png"
 	Texture "envtex3" "models/envmap/goldenv.png"
 	Texture "rimtex3" "models/envmap/goldrim.png"
 	Define "RIM_LIGHTING"
-	Define "ENVFACT" = ".3"
-	Define "RIMFACT" = ".2"
+	Define "ENVFACT" = ".7"
+	Define "RIMFACT" = ".8"
 	Define "RIMSTEP" = "0."
 	Define "ENV_THREELAYER"
 	Define "ENVFACT2" = ".8"
diff --git a/language.version b/language.version
index 2a9684e9e..54dcccad2 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r644 \cu(Mon 28 Nov 13:51:17 CET 2022)\c-";
-SWWM_SHORTVER="\cw1.3pre r644 \cu(2022-11-28 13:51:17)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r645 \cu(Mon 28 Nov 17:06:12 CET 2022)\c-";
+SWWM_SHORTVER="\cw1.3pre r645 \cu(2022-11-28 17:06:12)\c-";
diff --git a/models/DemoArms_mask.png b/models/DemoArms_mask.png
new file mode 100644
index 000000000..ddcf6fc94
Binary files /dev/null and b/models/DemoArms_mask.png differ
diff --git a/models/DemoBody_mask.png b/models/DemoBody_mask.png
new file mode 100644
index 000000000..32b40d791
Binary files /dev/null and b/models/DemoBody_mask.png differ
diff --git a/models/DemoHead_mask.png b/models/DemoHead_mask.png
new file mode 100644
index 000000000..1926e3bb8
Binary files /dev/null and b/models/DemoHead_mask.png differ
diff --git a/models/DemoKeys_mask.png b/models/DemoKeys_mask.png
new file mode 100644
index 000000000..07fe14031
Binary files /dev/null and b/models/DemoKeys_mask.png differ
diff --git a/models/DemoLegs_mask.png b/models/DemoLegs_mask.png
new file mode 100644
index 000000000..cb27df3c9
Binary files /dev/null and b/models/DemoLegs_mask.png differ
diff --git a/models/DemoMisc_mask.png b/models/DemoMisc_mask.png
new file mode 100644
index 000000000..5eb5af956
Binary files /dev/null and b/models/DemoMisc_mask.png differ
diff --git a/models/DemoSoft.png b/models/DemoSoft.png
index 042e94ec6..8a4b65ca4 100644
Binary files a/models/DemoSoft.png and b/models/DemoSoft.png differ
diff --git a/models/DemoSoft_mask.png b/models/DemoSoft_mask.png
new file mode 100644
index 000000000..e4027451c
Binary files /dev/null and b/models/DemoSoft_mask.png differ
diff --git a/models/DemoTags_mask.png b/models/DemoTags_mask.png
new file mode 100644
index 000000000..1a82aa659
Binary files /dev/null and b/models/DemoTags_mask.png differ
diff --git a/models/ExplodiumBullet_mask.png b/models/ExplodiumBullet_mask.png
new file mode 100644
index 000000000..a8809aed1
Binary files /dev/null and b/models/ExplodiumBullet_mask.png differ
diff --git a/models/ExplodiumCasing_Used_mask.png b/models/ExplodiumCasing_Used_mask.png
new file mode 100644
index 000000000..f6896bdda
Binary files /dev/null and b/models/ExplodiumCasing_Used_mask.png differ
diff --git a/models/ExplodiumCasing_mask.png b/models/ExplodiumCasing_mask.png
new file mode 100644
index 000000000..4a72bdbab
Binary files /dev/null and b/models/ExplodiumCasing_mask.png differ
diff --git a/models/SayasMug_mask.png b/models/SayasMug_mask.png
new file mode 100644
index 000000000..0b3bd533c
Binary files /dev/null and b/models/SayasMug_mask.png differ
diff --git a/models/SilverbulletAmmo_Empty_mask.png b/models/SilverbulletAmmo_Empty_mask.png
new file mode 100644
index 000000000..e830ded37
Binary files /dev/null and b/models/SilverbulletAmmo_Empty_mask.png differ
diff --git a/models/SilverbulletAmmo_mask.png b/models/SilverbulletAmmo_mask.png
new file mode 100644
index 000000000..e26a3672d
Binary files /dev/null and b/models/SilverbulletAmmo_mask.png differ
diff --git a/models/SilverbulletAmmo_maskB.png b/models/SilverbulletAmmo_maskB.png
new file mode 100644
index 000000000..87c634f8f
Binary files /dev/null and b/models/SilverbulletAmmo_maskB.png differ
diff --git a/models/SilverbulletAmmo_maskG.png b/models/SilverbulletAmmo_maskG.png
new file mode 100644
index 000000000..742216d75
Binary files /dev/null and b/models/SilverbulletAmmo_maskG.png differ
diff --git a/models/SilverbulletBullet_Used_mask.png b/models/SilverbulletBullet_Used_mask.png
new file mode 100644
index 000000000..da1db53b9
Binary files /dev/null and b/models/SilverbulletBullet_Used_mask.png differ
diff --git a/models/SilverbulletBullet_mask.png b/models/SilverbulletBullet_mask.png
new file mode 100644
index 000000000..4ef636dc6
Binary files /dev/null and b/models/SilverbulletBullet_mask.png differ
diff --git a/models/Silverbullet_mask.png b/models/Silverbullet_mask.png
index eed24faf6..1553f437c 100644
Binary files a/models/Silverbullet_mask.png and b/models/Silverbullet_mask.png differ
diff --git a/models/YnykronAmmo_bright.png b/models/YnykronAmmo_bright.png
new file mode 100644
index 000000000..46a77ac2f
Binary files /dev/null and b/models/YnykronAmmo_bright.png differ
diff --git a/models/YnykronAmmo_mask.png b/models/YnykronAmmo_mask.png
new file mode 100644
index 000000000..e602dc9d9
Binary files /dev/null and b/models/YnykronAmmo_mask.png differ