diff --git a/language.version b/language.version
index 4b74c860a..ed52a507c 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r534 \cu(Fri 30 Sep 12:21:03 CEST 2022)\c-";
-SWWM_SHORTVER="\cw1.3pre r534 \cu(2022-09-30 12:21:03)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r535 \cu(Fri 30 Sep 12:53:56 CEST 2022)\c-";
+SWWM_SHORTVER="\cw1.3pre r535 \cu(2022-09-30 12:53:56)\c-";
diff --git a/zscript/compat/swwm_hdoom.zsc b/zscript/compat/swwm_hdoom.zsc
index e833719bb..c78833f15 100644
--- a/zscript/compat/swwm_hdoom.zsc
+++ b/zscript/compat/swwm_hdoom.zsc
@@ -165,7 +165,7 @@ Class SWWMHDoomHandler : StaticEventHandler
 	override void RenderOverlay( RenderEvent e )
 	{
 		if ( !detected || (timer < 50) || (timer > 150) ) return;
-		if ( !scr ) scr = TexMan.CheckForTexture("graphics/hdscreen.png",TexMan.Type_Any);
+		if ( !scr ) scr = TexMan.CheckForTexture("graphics/hdscreen.png");
 		double ar = Screen.GetAspectRatio();
 		Vector2 tsize = TexMan.GetScaledSize(scr);
 		Vector2 vsize = (Screen.GetWidth(),Screen.GetHeight());
diff --git a/zscript/compat/swwm_shame.zsc b/zscript/compat/swwm_shame.zsc
index f3d395885..3ed6c8a35 100644
--- a/zscript/compat/swwm_shame.zsc
+++ b/zscript/compat/swwm_shame.zsc
@@ -84,7 +84,7 @@ Class SWWMBrutalHandler : StaticEventHandler
 	override void RenderOverlay( RenderEvent e )
 	{
 		if ( !detected ) return;
-		if ( !scr ) scr = TexMan.CheckForTexture("graphics/bdscreen.png",TexMan.Type_Any);
+		if ( !scr ) scr = TexMan.CheckForTexture("graphics/bdscreen.png");
 		Screen.Dim("Red",(timer/350.)-.2,0,0,Screen.GetWidth(),Screen.GetHeight());
 		double ar = Screen.GetAspectRatio();
 		Vector2 tsize = TexMan.GetScaledSize(scr);
diff --git a/zscript/dlc1/swwm_dlcweapons_canvas.zsc b/zscript/dlc1/swwm_dlcweapons_canvas.zsc
index 434dd8ac3..8c578ec26 100644
--- a/zscript/dlc1/swwm_dlcweapons_canvas.zsc
+++ b/zscript/dlc1/swwm_dlcweapons_canvas.zsc
@@ -30,10 +30,10 @@ extend Class HeavyMahSheenGun
 	override void RenderTexture( RenderEvent e )
 	{
 		if ( !AmmoLed ) AmmoLed = TexMan.GetCanvas("SHEENLED");
-		if ( !AmmoLedBase ) AmmoLedBase = TexMan.CheckForTexture("models/canvas/SheenLEDBase.png",TexMan.Type_Any);
-		if ( !AmmoLedBar ) AmmoLedBar = TexMan.CheckForTexture("models/canvas/SheenLEDBar.png",TexMan.Type_Any);
-		if ( !AmmoLedSpeed ) AmmoLedSpeed = TexMan.CheckForTexture("models/canvas/SheenLEDSpeed.png",TexMan.Type_Any);
-		if ( !AmmoLedNums ) AmmoLedNums = TexMan.CheckForTexture("models/canvas/SheenLEDNums.png",TexMan.Type_Any);
+		if ( !AmmoLedBase ) AmmoLedBase = TexMan.CheckForTexture("models/canvas/SheenLEDBase.png");
+		if ( !AmmoLedBar ) AmmoLedBar = TexMan.CheckForTexture("models/canvas/SheenLEDBar.png");
+		if ( !AmmoLedSpeed ) AmmoLedSpeed = TexMan.CheckForTexture("models/canvas/SheenLEDSpeed.png");
+		if ( !AmmoLedNums ) AmmoLedNums = TexMan.CheckForTexture("models/canvas/SheenLEDNums.png");
 		int d1 = Ammo1.Amount%10;
 		int d2 = (Ammo1.Amount/10)%10;
 		int d3 = (Ammo1.Amount/100)%10;
@@ -66,9 +66,9 @@ extend Class Quadravol
 	override void RenderTexture( RenderEvent e )
 	{
 		if ( !AmmoLed ) AmmoLed = TexMan.GetCanvas("QUADRLED");
-		if ( !AmmoLedBase ) AmmoLedBase = TexMan.CheckForTexture("models/canvas/QuadLEDBase.png",TexMan.Type_Any);
-		if ( !AmmoLedRound ) AmmoLedRound = TexMan.CheckForTexture("models/canvas/QuadLEDRound.png",TexMan.Type_Any);
-		if ( !AmmoLedCharge ) AmmoLedCharge = TexMan.CheckForTexture("models/canvas/QuadLEDCharge.png",TexMan.Type_Any);
+		if ( !AmmoLedBase ) AmmoLedBase = TexMan.CheckForTexture("models/canvas/QuadLEDBase.png");
+		if ( !AmmoLedRound ) AmmoLedRound = TexMan.CheckForTexture("models/canvas/QuadLEDRound.png");
+		if ( !AmmoLedCharge ) AmmoLedCharge = TexMan.CheckForTexture("models/canvas/QuadLEDCharge.png");
 		AmmoLed.Clear(0,0,64,64,0xFF101033);
 		AmmoLed.DrawTexture(AmmoLedBase,false,0,0,DTA_LegacyRenderStyle,STYLE_Shaded,DTA_FillColor,0xFF00FFFF);
 		Color col;
@@ -129,7 +129,7 @@ extend Class MisterRifle
 
 	private ui void DrawWindowFrame( int x, int y, int w, int h, int padx = 4, int pady = 4 )
 	{
-		if ( !FrameTex ) FrameTex = TexMan.CheckForTexture("models/canvas/MortalFrameTex.png",TexMan.Type_Any);
+		if ( !FrameTex ) FrameTex = TexMan.CheckForTexture("models/canvas/MortalFrameTex.png");
 		x -= padx/2;
 		y -= pady/2;
 		w += padx;
@@ -166,9 +166,9 @@ extend Class MisterRifle
 		if ( !MortalFontSmall ) MortalFontSmall = Font.GetFont("MortalFont20");
 		if ( !MortalFontMed ) MortalFontMed = Font.GetFont("MortalFont40");
 		if ( !MortalFontBig ) MortalFontBig = Font.GetFont("MortalFont80");
-		if ( !MortalBG ) MortalBG = TexMan.CheckForTexture("models/canvas/MortalBG.png",TexMan.Type_Any);
-		if ( !MortalIcons[0] ) MortalIcons[0] = TexMan.CheckForTexture("models/canvas/MortalFireIcons.png",TexMan.Type_Any);
-		if ( !MortalIcons[1] ) MortalIcons[1] = TexMan.CheckForTexture("models/canvas/MortalGrenadeIcons.png",TexMan.Type_Any);
+		if ( !MortalBG ) MortalBG = TexMan.CheckForTexture("models/canvas/MortalBG.png");
+		if ( !MortalIcons[0] ) MortalIcons[0] = TexMan.CheckForTexture("models/canvas/MortalFireIcons.png");
+		if ( !MortalIcons[1] ) MortalIcons[1] = TexMan.CheckForTexture("models/canvas/MortalGrenadeIcons.png");
 		TouchScreen.DrawTexture(MortalBG,false,0,0);
 		TouchScreen.Dim("Black",.8,0,0,256,22);
 		String str = "MR\cu-\c-"..serialnum;
@@ -271,7 +271,7 @@ extend Class MisterRifle
 		}
 		// Holo sub-screen
 		if ( !AmmoLed ) AmmoLed = TexMan.GetCanvas("MORTLED2");
-		if ( !AmmoLedFont ) AmmoLedFont = TexMan.CheckForTexture("models/canvas/MortalFlatChars.png",TexMan.Type_Any);
+		if ( !AmmoLedFont ) AmmoLedFont = TexMan.CheckForTexture("models/canvas/MortalFlatChars.png");
 		AmmoLed.Clear(0,0,64,16,0x00000000);
 		int dg1 = (ingun/10)%10;
 		int dg2 = (ingun%10);
diff --git a/zscript/dlc1/swwm_dlcweapons_hud.zsc b/zscript/dlc1/swwm_dlcweapons_hud.zsc
index 99ecd94f1..b61fa4b83 100644
--- a/zscript/dlc1/swwm_dlcweapons_hud.zsc
+++ b/zscript/dlc1/swwm_dlcweapons_hud.zsc
@@ -7,8 +7,8 @@ extend Class ItamexHammer
 
 	override void DrawWeapon( double TicFrac, double bx, double by, double hs, Vector2 ss )
 	{
-		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/ItamexDisplay.png",TexMan.Type_Any);
-		if ( !BarTex ) BarTex = TexMan.CheckForTexture("graphics/HUD/ItamexBar.png",TexMan.Type_Any);
+		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/ItamexDisplay.png");
+		if ( !BarTex ) BarTex = TexMan.CheckForTexture("graphics/HUD/ItamexBar.png");
 		double ct = clamp(ChargeInter?ChargeInter.GetValue(TicFrac):charge,0.,100.);
 		if ( ct <= 0 ) return;
 		double ch = ct*.2;
@@ -57,11 +57,11 @@ extend Class HeavyMahSheenGun
 
 	override void DrawWeapon( double TicFrac, double bx, double by, double hs, Vector2 ss )
 	{
-		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/SheenDisplay.png",TexMan.Type_Any);
-		if ( !BulletTex[0] ) BulletTex[0] = TexMan.CheckForTexture("graphics/HUD/SheenRound.png",TexMan.Type_Any);
-		if ( !BulletTex[1] ) BulletTex[1] = TexMan.CheckForTexture("graphics/HUD/SheenCasing.png",TexMan.Type_Any);
-		if ( !SpeedTex ) SpeedTex = TexMan.CheckForTexture("graphics/HUD/SheenSpeed.png",TexMan.Type_Any);
-		if ( !BarTex ) BarTex = TexMan.CheckForTexture("graphics/HUD/SheenBar.png",TexMan.Type_Any);
+		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/SheenDisplay.png");
+		if ( !BulletTex[0] ) BulletTex[0] = TexMan.CheckForTexture("graphics/HUD/SheenRound.png");
+		if ( !BulletTex[1] ) BulletTex[1] = TexMan.CheckForTexture("graphics/HUD/SheenCasing.png");
+		if ( !SpeedTex ) SpeedTex = TexMan.CheckForTexture("graphics/HUD/SheenSpeed.png");
+		if ( !BarTex ) BarTex = TexMan.CheckForTexture("graphics/HUD/SheenBar.png");
 		Screen.DrawTexture(WeaponBox,false,bx-23,by-24,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
 		if ( firespeed == 0 ) for ( int i=0; i<2; i++ ) Screen.DrawTexture(SpeedTex,false,bx-21,(by-14)+i*8,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
 		else if ( firespeed == 1 ) for ( int i=0; i<3; i++ ) Screen.DrawTexture(SpeedTex,false,bx-21,(by-14)+i*4,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
@@ -115,9 +115,9 @@ extend Class Quadravol
 
 	override void DrawWeapon( double TicFrac, double bx, double by, double hs, Vector2 ss )
 	{
-		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/QuadravolDisplay.png",TexMan.Type_Any);
-		if ( !BulletTex[0] ) BulletTex[0] = TexMan.CheckForTexture("graphics/HUD/QuadravolRound.png",TexMan.Type_Any);
-		if ( !BulletTex[1] ) BulletTex[1] = TexMan.CheckForTexture("graphics/HUD/QuadravolCasing.png",TexMan.Type_Any);
+		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/QuadravolDisplay.png");
+		if ( !BulletTex[0] ) BulletTex[0] = TexMan.CheckForTexture("graphics/HUD/QuadravolRound.png");
+		if ( !BulletTex[1] ) BulletTex[1] = TexMan.CheckForTexture("graphics/HUD/QuadravolCasing.png");
 		if ( !ChargeFont ) ChargeFont = Font.GetFont('XekkasNum');
 		Screen.DrawTexture(WeaponBox,false,bx-16,by-44,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
 		for ( int i=0; i<clipcount; i++ )
@@ -151,10 +151,10 @@ extend Class MisterRifle
 
 	override void DrawWeapon( double TicFrac, double bx, double by, double hs, Vector2 ss )
 	{
-		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/MisterDisplay.png",TexMan.Type_Any);
-		if ( !BulletTex[0] ) BulletTex[0] = TexMan.CheckForTexture("graphics/HUD/MisterRound.png",TexMan.Type_Any);
-		if ( !BulletTex[1] ) BulletTex[1] = TexMan.CheckForTexture("graphics/HUD/MisterGrenade.png",TexMan.Type_Any);
-		if ( !BulletTex[2] ) BulletTex[2] = TexMan.CheckForTexture("graphics/HUD/MisterGrenadeCasing.png",TexMan.Type_Any);
+		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/MisterDisplay.png");
+		if ( !BulletTex[0] ) BulletTex[0] = TexMan.CheckForTexture("graphics/HUD/MisterRound.png");
+		if ( !BulletTex[1] ) BulletTex[1] = TexMan.CheckForTexture("graphics/HUD/MisterGrenade.png");
+		if ( !BulletTex[2] ) BulletTex[2] = TexMan.CheckForTexture("graphics/HUD/MisterGrenadeCasing.png");
 		if ( !ModeFont ) ModeFont = Font.GetFont('MiniHUDShadow');
 		Screen.DrawTexture(WeaponBox,false,bx-23,by-32,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
 		static const int fmod[] = {0x0050,0x0043,0x0053,0x004F};
diff --git a/zscript/games/swwm_madcat.zsc b/zscript/games/swwm_madcat.zsc
index 58e0b5102..bc394afc2 100644
--- a/zscript/games/swwm_madcat.zsc
+++ b/zscript/games/swwm_madcat.zsc
@@ -162,7 +162,7 @@ Class MadcatGame ui
 		global_state = CAT_BOOT;
 		boot_state = BS_FADEIN;
 		boot_timer = -16;
-		boot_tileset = TexMan.CheckForTexture("graphics/Games/MadcatTiles.png",TexMan.Type_Any);
+		boot_tileset = TexMan.CheckForTexture("graphics/Games/MadcatTiles.png");
 	}
 
 	// game is ticking
diff --git a/zscript/handler/swwm_handler_vanillaboss.zsc b/zscript/handler/swwm_handler_vanillaboss.zsc
index 0aa78316f..64cba2fca 100644
--- a/zscript/handler/swwm_handler_vanillaboss.zsc
+++ b/zscript/handler/swwm_handler_vanillaboss.zsc
@@ -561,9 +561,9 @@ extend Class SWWMHandler
 	{
 		if ( !ui_initialized || (bossalpha <= 0.) ) return;
 		if ( !mSmallFont ) mSmallFont = Font.GetFont('TewiFontOutline');
-		if ( !bbar_f ) bbar_f = TexMan.CheckForTexture("graphics/HUD/BossHealthBarBox.png",TexMan.Type_Any);
-		if ( !bbar_r ) bbar_r = TexMan.CheckForTexture("graphics/HUD/BossHealthBar.png",TexMan.Type_Any);
-		if ( !bbar_d ) bbar_d = TexMan.CheckForTexture("graphics/HUD/BossHealthBarDecay.png",TexMan.Type_Any);
+		if ( !bbar_f ) bbar_f = TexMan.CheckForTexture("graphics/HUD/BossHealthBarBox.png");
+		if ( !bbar_r ) bbar_r = TexMan.CheckForTexture("graphics/HUD/BossHealthBar.png");
+		if ( !bbar_d ) bbar_d = TexMan.CheckForTexture("graphics/HUD/BossHealthBarDecay.png");
 		Vector2 vpos = ((bar.ss.x-300)/2.,bar.ss.y-(bar.margin+50));
 		Screen.DrawTexture(bbar_f,false,vpos.x-2,vpos.y-2,DTA_VirtualWidthF,bar.ss.x,DTA_VirtualHeightF,bar.ss.y,DTA_KeepRatio,true,DTA_Alpha,bossalpha);
 		if ( hmax )
diff --git a/zscript/handler/swwm_statichandler_achievements.zsc b/zscript/handler/swwm_statichandler_achievements.zsc
index 99bf3c2ad..822942986 100644
--- a/zscript/handler/swwm_statichandler_achievements.zsc
+++ b/zscript/handler/swwm_statichandler_achievements.zsc
@@ -134,9 +134,9 @@ extend Class SWWMStaticHandler
 				let ac = new("SWWMAchievementInfo");
 				ac.baseindex = bidx;
 				ac.basename = ln[0];
-				ac.icon = TexMan.CheckForTexture("graphics/Achievements/Achievement"..ac.basename..".png",TexMan.Type_Any);
+				ac.icon = TexMan.CheckForTexture("graphics/Achievements/Achievement"..ac.basename..".png");
 				// fallback icon if one is not found
-				if ( !ac.icon.IsValid() ) ac.icon = TexMan.CheckForTexture("graphics/Achievements/DefaultAchievement.png",TexMan.Type_Any);
+				if ( !ac.icon.IsValid() ) ac.icon = TexMan.CheckForTexture("graphics/Achievements/DefaultAchievement.png");
 				ac.maxval = ln[1].ToInt();
 				// special cases for maxval == -1 (currently only one, so this is simplified)
 				if ( (ac.maxval == -1) && (ac.basename == "allcoll") )
diff --git a/zscript/hud/swwm_hud.zsc b/zscript/hud/swwm_hud.zsc
index c212b25cb..831ac0c93 100644
--- a/zscript/hud/swwm_hud.zsc
+++ b/zscript/hud/swwm_hud.zsc
@@ -1166,63 +1166,63 @@ Class SWWMStatusBar : BaseStatusBar
 
 	override void Init()
 	{
-		StatusTex = TexMan.CheckForTexture("graphics/HUD/StatusBox.png",TexMan.Type_Any);
-		DashTex = TexMan.CheckForTexture("graphics/HUD/DashBar.png",TexMan.Type_Any);
-		FuelTex[0] = TexMan.CheckForTexture("graphics/HUD/FuelBar.png",TexMan.Type_Any);
-		FuelTex[1] = TexMan.CheckForTexture("graphics/HUD/FuelBarS.png",TexMan.Type_Any);
-		HealthTex[0] = TexMan.CheckForTexture("graphics/HUD/HealthBar0.png",TexMan.Type_Any);
-		HealthTex[1] = TexMan.CheckForTexture("graphics/HUD/HealthBar1.png",TexMan.Type_Any);
-		HealthTex[2] = TexMan.CheckForTexture("graphics/HUD/HealthBar2.png",TexMan.Type_Any);
-		HealthTex[3] = TexMan.CheckForTexture("graphics/HUD/HealthBar3.png",TexMan.Type_Any);
-		HealthTex[4] = TexMan.CheckForTexture("graphics/HUD/HealthBarS.png",TexMan.Type_Any);
-		HealthTex[5] = TexMan.CheckForTexture("graphics/HUD/HealthBarD.png",TexMan.Type_Any);
-		HealthTex[6] = TexMan.CheckForTexture("graphics/HUD/HealthBarP.png",TexMan.Type_Any);
-		HealthTex[7] = TexMan.CheckForTexture("graphics/HUD/HealthBarF.png",TexMan.Type_Any);
-		HealthTex[8] = TexMan.CheckForTexture("graphics/HUD/HealthBarL.png",TexMan.Type_Any);
-		ScoreTex = TexMan.CheckForTexture("graphics/HUD/ScoreBox.png",TexMan.Type_Any);
-		WeaponTex = TexMan.CheckForTexture("graphics/HUD/WeaponBox.png",TexMan.Type_Any);
-		ChatTex[0] = TexMan.CheckForTexture("graphics/HUD/ChatBoxTop.png",TexMan.Type_Any);
-		ChatTex[1] = TexMan.CheckForTexture("graphics/HUD/ChatBoxLine.png",TexMan.Type_Any);
-		ChatTex[2] = TexMan.CheckForTexture("graphics/HUD/ChatBoxBottom.png",TexMan.Type_Any);
-		ChatTex[3] = TexMan.CheckForTexture("graphics/HUD/ChatBoxTop_Smol.png",TexMan.Type_Any);
-		ChatTex[4] = TexMan.CheckForTexture("graphics/HUD/ChatBoxLine_Smol.png",TexMan.Type_Any);
-		ChatTex[5] = TexMan.CheckForTexture("graphics/HUD/ChatBoxBottom_Smol.png",TexMan.Type_Any);
-		InventoryTex = TexMan.CheckForTexture("graphics/HUD/InventoryBox.png",TexMan.Type_Any);
-		EnemyBTex = TexMan.CheckForTexture("graphics/HUD/EnemyBox.png",TexMan.Type_Any);
-		EnemyHTex[0] = TexMan.CheckForTexture("graphics/HUD/EnemyBar.png",TexMan.Type_Any);
-		EnemyHTex[1] = TexMan.CheckForTexture("graphics/HUD/EnemyBarS.png",TexMan.Type_Any);
-		EnemyHTex[2] = TexMan.CheckForTexture("graphics/HUD/EnemyBarL.png",TexMan.Type_Any);
-		EnemyHTex[3] = TexMan.CheckForTexture("graphics/HUD/EnemyBar1.png",TexMan.Type_Any);
-		EnemyHTex[4] = TexMan.CheckForTexture("graphics/HUD/EnemyBar2.png",TexMan.Type_Any);
-		EnemyHTex[5] = TexMan.CheckForTexture("graphics/HUD/EnemyBar3.png",TexMan.Type_Any);
-		EnemyHTex[6] = TexMan.CheckForTexture("graphics/HUD/EnemyBarD.png",TexMan.Type_Any);
-		GenericAmmoTex[0] = TexMan.CheckForTexture("graphics/HUD/GenericAmmoBoxL.png",TexMan.Type_Any);
-		GenericAmmoTex[1] = TexMan.CheckForTexture("graphics/HUD/GenericAmmoBoxM.png",TexMan.Type_Any);
-		GenericAmmoTex[2] = TexMan.CheckForTexture("graphics/HUD/GenericAmmoBoxR.png",TexMan.Type_Any);
-		AmmoTex[0] = TexMan.CheckForTexture("graphics/HUD/AmmoBoxT.png",TexMan.Type_Any);
-		AmmoTex[1] = TexMan.CheckForTexture("graphics/HUD/AmmoBoxM.png",TexMan.Type_Any);
-		AmmoTex[2] = TexMan.CheckForTexture("graphics/HUD/AmmoBoxB.png",TexMan.Type_Any);
-		MiniBox = TexMan.CheckForTexture("graphics/HUD/MinimapBox.png",TexMan.Type_Any);
-		bgtex = TexMan.CheckForTexture("graphics/tempbg.png",TexMan.Type_Any);
-		FaceTex[0] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Head.png",TexMan.Type_Any);
-		FaceTex[1] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Flash.png",TexMan.Type_Any);
-		FaceTex[2] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Default.png",TexMan.Type_Any);
-		FaceTex[3] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Unamused.png",TexMan.Type_Any);
-		FaceTex[4] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Blink.png",TexMan.Type_Any);
-		FaceTex[5] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Grin.png",TexMan.Type_Any);
-		FaceTex[6] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Evil.png",TexMan.Type_Any);
-		FaceTex[7] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Hurt.png",TexMan.Type_Any);
-		FaceTex[8] = TexMan.CheckForTexture("graphics/HUD/DemoFace_HurtLeft.png",TexMan.Type_Any);
-		FaceTex[9] = TexMan.CheckForTexture("graphics/HUD/DemoFace_HurtRight.png",TexMan.Type_Any);
-		FaceTex[10] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Ouch.png",TexMan.Type_Any);
-		FaceTex[11] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Dead.png",TexMan.Type_Any);
-		FaceTex[12] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Smug.png",TexMan.Type_Any);
-		FaceTex[13] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Angery.png",TexMan.Type_Any);
-		FaceTex[14] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Barrier.png",TexMan.Type_Any);
-		FaceTex[15] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Rage.png",TexMan.Type_Any);
-		FaceTex[16] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Angerage.png",TexMan.Type_Any);
-		FaceTex[17] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Sad.png",TexMan.Type_Any);
-		FaceTex[18] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Wink.png",TexMan.Type_Any);
+		StatusTex = TexMan.CheckForTexture("graphics/HUD/StatusBox.png");
+		DashTex = TexMan.CheckForTexture("graphics/HUD/DashBar.png");
+		FuelTex[0] = TexMan.CheckForTexture("graphics/HUD/FuelBar.png");
+		FuelTex[1] = TexMan.CheckForTexture("graphics/HUD/FuelBarS.png");
+		HealthTex[0] = TexMan.CheckForTexture("graphics/HUD/HealthBar0.png");
+		HealthTex[1] = TexMan.CheckForTexture("graphics/HUD/HealthBar1.png");
+		HealthTex[2] = TexMan.CheckForTexture("graphics/HUD/HealthBar2.png");
+		HealthTex[3] = TexMan.CheckForTexture("graphics/HUD/HealthBar3.png");
+		HealthTex[4] = TexMan.CheckForTexture("graphics/HUD/HealthBarS.png");
+		HealthTex[5] = TexMan.CheckForTexture("graphics/HUD/HealthBarD.png");
+		HealthTex[6] = TexMan.CheckForTexture("graphics/HUD/HealthBarP.png");
+		HealthTex[7] = TexMan.CheckForTexture("graphics/HUD/HealthBarF.png");
+		HealthTex[8] = TexMan.CheckForTexture("graphics/HUD/HealthBarL.png");
+		ScoreTex = TexMan.CheckForTexture("graphics/HUD/ScoreBox.png");
+		WeaponTex = TexMan.CheckForTexture("graphics/HUD/WeaponBox.png");
+		ChatTex[0] = TexMan.CheckForTexture("graphics/HUD/ChatBoxTop.png");
+		ChatTex[1] = TexMan.CheckForTexture("graphics/HUD/ChatBoxLine.png");
+		ChatTex[2] = TexMan.CheckForTexture("graphics/HUD/ChatBoxBottom.png");
+		ChatTex[3] = TexMan.CheckForTexture("graphics/HUD/ChatBoxTop_Smol.png");
+		ChatTex[4] = TexMan.CheckForTexture("graphics/HUD/ChatBoxLine_Smol.png");
+		ChatTex[5] = TexMan.CheckForTexture("graphics/HUD/ChatBoxBottom_Smol.png");
+		InventoryTex = TexMan.CheckForTexture("graphics/HUD/InventoryBox.png");
+		EnemyBTex = TexMan.CheckForTexture("graphics/HUD/EnemyBox.png");
+		EnemyHTex[0] = TexMan.CheckForTexture("graphics/HUD/EnemyBar.png");
+		EnemyHTex[1] = TexMan.CheckForTexture("graphics/HUD/EnemyBarS.png");
+		EnemyHTex[2] = TexMan.CheckForTexture("graphics/HUD/EnemyBarL.png");
+		EnemyHTex[3] = TexMan.CheckForTexture("graphics/HUD/EnemyBar1.png");
+		EnemyHTex[4] = TexMan.CheckForTexture("graphics/HUD/EnemyBar2.png");
+		EnemyHTex[5] = TexMan.CheckForTexture("graphics/HUD/EnemyBar3.png");
+		EnemyHTex[6] = TexMan.CheckForTexture("graphics/HUD/EnemyBarD.png");
+		GenericAmmoTex[0] = TexMan.CheckForTexture("graphics/HUD/GenericAmmoBoxL.png");
+		GenericAmmoTex[1] = TexMan.CheckForTexture("graphics/HUD/GenericAmmoBoxM.png");
+		GenericAmmoTex[2] = TexMan.CheckForTexture("graphics/HUD/GenericAmmoBoxR.png");
+		AmmoTex[0] = TexMan.CheckForTexture("graphics/HUD/AmmoBoxT.png");
+		AmmoTex[1] = TexMan.CheckForTexture("graphics/HUD/AmmoBoxM.png");
+		AmmoTex[2] = TexMan.CheckForTexture("graphics/HUD/AmmoBoxB.png");
+		MiniBox = TexMan.CheckForTexture("graphics/HUD/MinimapBox.png");
+		bgtex = TexMan.CheckForTexture("graphics/tempbg.png");
+		FaceTex[0] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Head.png");
+		FaceTex[1] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Flash.png");
+		FaceTex[2] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Default.png");
+		FaceTex[3] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Unamused.png");
+		FaceTex[4] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Blink.png");
+		FaceTex[5] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Grin.png");
+		FaceTex[6] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Evil.png");
+		FaceTex[7] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Hurt.png");
+		FaceTex[8] = TexMan.CheckForTexture("graphics/HUD/DemoFace_HurtLeft.png");
+		FaceTex[9] = TexMan.CheckForTexture("graphics/HUD/DemoFace_HurtRight.png");
+		FaceTex[10] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Ouch.png");
+		FaceTex[11] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Dead.png");
+		FaceTex[12] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Smug.png");
+		FaceTex[13] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Angery.png");
+		FaceTex[14] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Barrier.png");
+		FaceTex[15] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Rage.png");
+		FaceTex[16] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Angerage.png");
+		FaceTex[17] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Sad.png");
+		FaceTex[18] = TexMan.CheckForTexture("graphics/HUD/DemoFace_Wink.png");
 		// other expressions will be added when needed
 		mSmallFont = Font.GetFont('TewiFont');
 		mSmallFontOutline = Font.GetFont('TewiFontOutline');
diff --git a/zscript/hud/swwm_hudextra.zsc b/zscript/hud/swwm_hudextra.zsc
index bf6cb68a4..30402a973 100644
--- a/zscript/hud/swwm_hudextra.zsc
+++ b/zscript/hud/swwm_hudextra.zsc
@@ -169,7 +169,7 @@ Class SWWMAchievementNotification : HUDMessageBase
 		txt = StringTable.Localize("$SWWM_ACHIEVEMENT_"..bname.."_TXT");
 		if ( num ) txt = String.Format(txt,SWWMUtility.ThousandsNum(num));
 		self.icon = icon;
-		frame = TexMan.CheckForTexture("graphics/HUD/AchievementNotification.png",TexMan.Type_Any);
+		frame = TexMan.CheckForTexture("graphics/HUD/AchievementNotification.png");
 		holdtics = 150;
 		fadeintics = 20;
 		fadeouttics = 30;
@@ -297,15 +297,15 @@ Class SWWMDirectMessage : HUDMessageBase
 
 	virtual SWWMDirectMessage Init( String chrn, String chrfn, String texn )
 	{
-		MessageBox = TexMan.CheckForTexture("graphics/HUD/DM/DirectMessageBox.png",TexMan.Type_Any);
-		BG = TexMan.CheckForTexture("graphics/HUD/DM/"..texn.."AvatarBG.png",TexMan.Type_Any);
-		Avatar = TexMan.CheckForTexture("graphics/HUD/DM/"..texn.."Avatar.png",TexMan.Type_Any);
+		MessageBox = TexMan.CheckForTexture("graphics/HUD/DM/DirectMessageBox.png");
+		BG = TexMan.CheckForTexture("graphics/HUD/DM/"..texn.."AvatarBG.png");
+		Avatar = TexMan.CheckForTexture("graphics/HUD/DM/"..texn.."Avatar.png");
 		for ( int i=0; i<2; i++ )
-			Blink[i] = TexMan.CheckForTexture("graphics/HUD/DM/"..texn.."AvatarBlink"..i..".png",TexMan.Type_Any);
+			Blink[i] = TexMan.CheckForTexture("graphics/HUD/DM/"..texn.."AvatarBlink"..i..".png");
 		for ( int i=0; i<5; i++ )
-			Talk[i] = TexMan.CheckForTexture("graphics/HUD/DM/"..texn.."AvatarTalk"..i..".png",TexMan.Type_Any);
+			Talk[i] = TexMan.CheckForTexture("graphics/HUD/DM/"..texn.."AvatarTalk"..i..".png");
 		for ( int i=0; i<4; i++ )
-			Noiz[i] = TexMan.CheckForTexture("graphics/HUD/DM/DirectMessageStatic"..i..".png",TexMan.Type_Any);
+			Noiz[i] = TexMan.CheckForTexture("graphics/HUD/DM/DirectMessageStatic"..i..".png");
 		chrname = chrn;
 		chrfullname = chrfn;
 		seqnum = -1;
@@ -710,7 +710,7 @@ Class DSMapTitle : HUDMessageBase
 		fadeintics = 20;
 		fadeouttics = 40;
 		ultics = 50;
-		atlas = TexMan.CheckForTexture("graphics/dsmapfont.png",TexMan.Type_Any);
+		atlas = TexMan.CheckForTexture("graphics/dsmapfont.png");
 		if ( !atlas.IsValid() || atlas.IsNull() ) ThrowAbortException("font atlas texture not found");
 		let lmp = Wads.CheckNumForFullname("graphics/dsmapfont.txt");
 		if ( lmp == -1 ) ThrowAbortException("font definition file not found");
@@ -743,7 +743,7 @@ Class DSMapTitle : HUDMessageBase
 			ch++;
 		}
 		if ( ch != 256 ) ThrowAbortException("font definition does not list all 256 glyphs");
-		atlas_sub = TexMan.CheckForTexture("graphics/dsmapfont_sub.png",TexMan.Type_Any);
+		atlas_sub = TexMan.CheckForTexture("graphics/dsmapfont_sub.png");
 		if ( !atlas_sub.IsValid() || atlas_sub.IsNull() ) ThrowAbortException("sub font atlas texture not found");
 		lmp = Wads.CheckNumForFullname("graphics/dsmapfont_sub.txt");
 		if ( lmp == -1 ) ThrowAbortException("sub font definition file not found");
diff --git a/zscript/items/swwm_powerups.zsc b/zscript/items/swwm_powerups.zsc
index 23a15dbe2..5203e30c2 100644
--- a/zscript/items/swwm_powerups.zsc
+++ b/zscript/items/swwm_powerups.zsc
@@ -1899,7 +1899,7 @@ Class SWWMLamp : Inventory
 		if ( pickup && !deathmatch ) return false;
 		bActivated = true;
 		bActive = !bActive;
-		if ( !OnIcon ) OnIcon = TexMan.CheckForTexture("graphics/HUD/Icons/I_Lamp.png",TexMan.Type_MiscPatch);
+		if ( !OnIcon ) OnIcon = TexMan.CheckForTexture("graphics/HUD/Icons/I_Lamp.png");
 		Icon = bActive?OnIcon:default.Icon;
 		// don't consume on use
 		Amount++;
diff --git a/zscript/kbase/swwm_kbase.zsc b/zscript/kbase/swwm_kbase.zsc
index 4149694ad..7e32125be 100644
--- a/zscript/kbase/swwm_kbase.zsc
+++ b/zscript/kbase/swwm_kbase.zsc
@@ -154,10 +154,10 @@ Class DemolitionistMenu : GenericMenu
 			isclosing = true;
 			return;
 		}
-		FancyBg = TexMan.CheckForTexture("graphics/tempbg.png",TexMan.Type_MiscPatch);
-		FrameTex = TexMan.CheckForTexture("graphics/KBase/FrameTex.png",TexMan.Type_MiscPatch);
-		VSepTex = TexMan.CheckForTexture("graphics/KBase/VSepTex.png",TexMan.Type_MiscPatch);
-		HSepTex = TexMan.CheckForTexture("graphics/KBase/HSepTex.png",TexMan.Type_MiscPatch);
+		FancyBg = TexMan.CheckForTexture("graphics/tempbg.png");
+		FrameTex = TexMan.CheckForTexture("graphics/KBase/FrameTex.png");
+		VSepTex = TexMan.CheckForTexture("graphics/KBase/VSepTex.png");
+		HSepTex = TexMan.CheckForTexture("graphics/KBase/HSepTex.png");
 		mSmallFont = Font.GetFont('TewiFont');
 		mTinyFont = Font.GetFont('MiniwiFont');
 		// note that we can assume 640x400 will always be the smallest resolution allowed by gzdoom, but we still need to handle widescreen
diff --git a/zscript/kbase/swwm_kbasetab_secret.zsc b/zscript/kbase/swwm_kbasetab_secret.zsc
index 52de829e9..9b186687e 100644
--- a/zscript/kbase/swwm_kbasetab_secret.zsc
+++ b/zscript/kbase/swwm_kbasetab_secret.zsc
@@ -15,19 +15,19 @@ Class DemolitionistSecretTab : DemolitionistMenuTab
 		bHidden = true;
 		if ( gameinfo.gametype&GAME_Hexen )
 		{
-			img = TexMan.CheckForTexture("graphics/KBase/Drawing_Kirin.png",TexMan.Type_Any);
+			img = TexMan.CheckForTexture("graphics/KBase/Drawing_Kirin.png");
 			sub = StringTable.Localize("$SWWM_FROMKIRIN");
 			String str = StringTable.Localize("$SWWM_KIRINPOEM");
 			l = master.mSmallFont.BreakLines(str,600);
 		}
 		else if ( (gameinfo.gametype&GAME_Heretic) || SWWMUtility.IsEviternity() )
 		{
-			img = TexMan.CheckForTexture("graphics/KBase/Drawing_Ibuki.png",TexMan.Type_Any);
+			img = TexMan.CheckForTexture("graphics/KBase/Drawing_Ibuki.png");
 			sub = StringTable.Localize("$SWWM_CUTIECLUB");
 		}
 		else
 		{
-			img = TexMan.CheckForTexture("graphics/KBase/Drawing_Saya.png",TexMan.Type_Any);
+			img = TexMan.CheckForTexture("graphics/KBase/Drawing_Saya.png");
 			sub = StringTable.Localize("$SWWM_TODEMO");
 		}
 		maxofs = max(0,320-int(master.ws.y-40));
diff --git a/zscript/kbase/swwm_kbasetab_stats.zsc b/zscript/kbase/swwm_kbasetab_stats.zsc
index 361c70e38..627e9fc7f 100644
--- a/zscript/kbase/swwm_kbasetab_stats.zsc
+++ b/zscript/kbase/swwm_kbasetab_stats.zsc
@@ -678,11 +678,11 @@ Class DemolitionistMenuAchievementItem : DemolitionistMenuListItem
 		Super.Init(master,"");
 		self.a = a;
 		self.width = width;
-		AchievementUnknown = TexMan.CheckForTexture("graphics/Achievements/HiddenAchievement.png",TexMan.Type_Any);
-		BaseBox = TexMan.CheckForTexture("graphics/Achievements/NoAchievement.png",TexMan.Type_Any);
-		BarTex[0] = TexMan.CheckForTexture("graphics/Achievements/BarAchievementBase.png",TexMan.Type_Any);
-		BarTex[1] = TexMan.CheckForTexture("graphics/Achievements/BarAchievementProgress.png",TexMan.Type_Any);
-		BarTex[2] = TexMan.CheckForTexture("graphics/Achievements/BarAchievementDone.png",TexMan.Type_Any);
+		AchievementUnknown = TexMan.CheckForTexture("graphics/Achievements/HiddenAchievement.png");
+		BaseBox = TexMan.CheckForTexture("graphics/Achievements/NoAchievement.png");
+		BarTex[0] = TexMan.CheckForTexture("graphics/Achievements/BarAchievementBase.png");
+		BarTex[1] = TexMan.CheckForTexture("graphics/Achievements/BarAchievementProgress.png");
+		BarTex[2] = TexMan.CheckForTexture("graphics/Achievements/BarAchievementDone.png");
 		ShouldObscure = (swwm_filterachievements==1);
 		Update();
 		return self;
diff --git a/zscript/menu/swwm_achievementmenu.zsc b/zscript/menu/swwm_achievementmenu.zsc
index e4e33e36c..ac3e6daa9 100644
--- a/zscript/menu/swwm_achievementmenu.zsc
+++ b/zscript/menu/swwm_achievementmenu.zsc
@@ -43,9 +43,9 @@ Class SWWMAchievementMenu : GenericMenu
 			i--;
 		}
 		ShouldObscure = (swwm_filterachievements==1);
-		AchievementUnknown = TexMan.CheckForTexture("graphics/Achievements/HiddenAchievement.png",TexMan.Type_Any);
-		SelectBox = TexMan.CheckForTexture("graphics/Achievements/SelectAchievement.png",TexMan.Type_Any);
-		BaseBox = TexMan.CheckForTexture("graphics/Achievements/NoAchievement.png",TexMan.Type_Any);
+		AchievementUnknown = TexMan.CheckForTexture("graphics/Achievements/HiddenAchievement.png");
+		SelectBox = TexMan.CheckForTexture("graphics/Achievements/SelectAchievement.png");
+		BaseBox = TexMan.CheckForTexture("graphics/Achievements/NoAchievement.png");
 		mSmallFont = Font.GetFont('TewiFontOutline');
 		mTinyFont = Font.GetFont('MiniwiFontOutline');
 	}
diff --git a/zscript/menu/swwm_credits.zsc b/zscript/menu/swwm_credits.zsc
index f6d4b005d..419df812c 100644
--- a/zscript/menu/swwm_credits.zsc
+++ b/zscript/menu/swwm_credits.zsc
@@ -15,7 +15,7 @@ Class SWWMCreditsEntry ui
 		mSmallFont = Font.GetFont('TewiFont');
 		if ( s != "" )
 		{
-			Sprite = TexMan.CheckForTexture(s,TexMan.Type_Any);
+			Sprite = TexMan.CheckForTexture(s);
 			Vector2 ofs = TexMan.GetScaledOffset(Sprite);
 			sheight = int(ofs.y);
 		}
@@ -132,9 +132,9 @@ Class SWWMCreditsMenu : GenericMenu
 		Animated = true;
 		mSmallFont = Font.GetFont('TewiFont');
 		mBigFont = Font.GetFont('TewiFontOutline');
-		bgtex = TexMan.CheckForTexture("graphics/tempbg.png",TexMan.Type_Any);
+		bgtex = TexMan.CheckForTexture("graphics/tempbg.png");
 		UpdateSize();
-		logo = TexMan.CheckForTexture("graphics/M_DEMOLITIONIST.png",TexMan.Type_Any);
+		logo = TexMan.CheckForTexture("graphics/M_DEMOLITIONIST.png");
 		logosz = TexMan.GetScaledSize(logo);
 		logosz *= (2./3.);
 		logosz.y += 36.;
diff --git a/zscript/menu/swwm_help.zsc b/zscript/menu/swwm_help.zsc
index e027281d8..e852ad989 100644
--- a/zscript/menu/swwm_help.zsc
+++ b/zscript/menu/swwm_help.zsc
@@ -33,7 +33,7 @@ Class SWWMHelpMenu : GenericMenu
 		prevpage = -1;
 		fadetic = MenuTime();
 		pagedir = 0;
-		bgtex = TexMan.CheckForTexture("graphics/tempbg.png",TexMan.Type_Any);
+		bgtex = TexMan.CheckForTexture("graphics/tempbg.png");
 		mSmallFont = Font.GetFont('TewiFont');
 		mSmallFont2 = Font.GetFont('TewiFontOutline');
 		for ( int i=0; i<NUM_HELP_PAGES; i++ )
diff --git a/zscript/menu/swwm_inter.zsc b/zscript/menu/swwm_inter.zsc
index 3c592aa93..f8bb79e6f 100644
--- a/zscript/menu/swwm_inter.zsc
+++ b/zscript/menu/swwm_inter.zsc
@@ -77,7 +77,7 @@ Class SWWMStatScreen : StatusScreen abstract
 		if ( whichart ) Screen.Clear(0,0,Screen.GetWidth(),Screen.GetHeight(),"Black");
 		else
 		{
-			if ( !bgtex ) bgtex = TexMan.CheckForTexture("graphics/InterBG.png",TexMan.Type_MiscPatch);
+			if ( !bgtex ) bgtex = TexMan.CheckForTexture("graphics/InterBG.png");
 			tsize = TexMan.GetScaledSize(bgtex);
 			sar = tsize.x/tsize.y;
 			if ( sar > ar ) vsize = (tsize.y*ar,tsize.y);
@@ -90,7 +90,7 @@ Class SWWMStatScreen : StatusScreen abstract
 		{
 			String artstr = StringTable.Localize(String.Format("$SWWM_FANART%d",whichart));
 			int semic = artstr.IndexOf(";");
-			if ( !arttex ) arttex = TexMan.CheckForTexture(String.Format("graphics/Fanart/%s",(semic==-1)?artstr:artstr.Left(semic)),TexMan.Type_MiscPatch);
+			if ( !arttex ) arttex = TexMan.CheckForTexture(String.Format("graphics/Fanart/%s",(semic==-1)?artstr:artstr.Left(semic)));
 			tsize = TexMan.GetScaledSize(arttex);
 			sar = tsize.x/tsize.y;
 			if ( sar > ar ) vsize = (tsize.y*ar,tsize.y);
diff --git a/zscript/menu/swwm_menus.zsc b/zscript/menu/swwm_menus.zsc
index 82fd0695e..1e58bf0b5 100644
--- a/zscript/menu/swwm_menus.zsc
+++ b/zscript/menu/swwm_menus.zsc
@@ -298,7 +298,7 @@ Class SWWMMainMenu : SWWMCleanMenu
 		else
 		{
 			c.SetString("2");
-			return TexMan.CheckForTexture(StringTable.Localize("$SWWM_MENUPOSE2"),TexMan.Type_Any);
+			return TexMan.CheckForTexture(StringTable.Localize("$SWWM_MENUPOSE2"));
 		}
 		int npose = StringTable.Localize("$SWWM_NMENUPOSE").ToInt();
 		for ( int i=1; i<=npose; i++ )
@@ -310,11 +310,11 @@ Class SWWMMainMenu : SWWMCleanMenu
 		if ( candidates.Size() == 0 )
 		{
 			c.SetString("2");
-			return TexMan.CheckForTexture(StringTable.Localize("$SWWM_MENUPOSE2"),TexMan.Type_Any);
+			return TexMan.CheckForTexture(StringTable.Localize("$SWWM_MENUPOSE2"));
 		}
 		int which = candidates[Random[UIStuff](0,candidates.Size()-1)];
 		c.SetString(str..";"..which);
-		return TexMan.CheckForTexture(StringTable.Localize("$SWWM_MENUPOSE"..which),TexMan.Type_Any);
+		return TexMan.CheckForTexture(StringTable.Localize("$SWWM_MENUPOSE"..which));
 	}
 
 	override void Init( Menu parent, ListMenuDescriptor desc )
@@ -347,7 +347,7 @@ Class SWWMMainMenu : SWWMCleanMenu
 		theta = clamp(4.*frametime,0.,1.);
 		if ( prevms ) demopos = SWWMUtility.Lerp(demopos,-40,theta);
 		double alph = clamp(1.-(demopos/100),0.,1.);
-		if ( !gradtex ) gradtex = TexMan.CheckForTexture("graphics/M_GRAD.png",TexMan.Type_Any);
+		if ( !gradtex ) gradtex = TexMan.CheckForTexture("graphics/M_GRAD.png");
 		double scl = Screen.GetHeight()/960.;
 		Screen.DrawTexture(gradtex,false,0,Screen.GetHeight(),DTA_DestWidth,Screen.GetWidth(),DTA_DestHeight,256*CleanYFac_1,DTA_LegacyRenderStyle,STYLE_Shaded,DTA_FillColor,Color(0,0,0),DTA_TopOffset,256,DTA_Alpha,.35);
 		Screen.DrawTexture(gradtex,false,Screen.GetWidth()/2,Screen.GetHeight(),DTA_Rotate,90,DTA_DestHeight,Screen.GetHeight(),DTA_DestWidthF,600*scl*alph,DTA_LegacyRenderStyle,STYLE_Shaded,DTA_FillColor,Color(0,0,0),DTA_TopOffset,256,DTA_Alpha,alph*.5);
@@ -615,7 +615,7 @@ class ListMenuItemSWWMLogo : ListMenuItem
 	void Init( ListMenuDescriptor desc )
 	{
 		Super.Init(desc.mXpos,desc.mYpos);
-		mTexture = TexMan.CheckForTexture("graphics/M_DEMOLITIONIST.png",TexMan.Type_Any);
+		mTexture = TexMan.CheckForTexture("graphics/M_DEMOLITIONIST.png");
 	}
 
 	private int GetMenuYOffset()
diff --git a/zscript/menu/swwm_title.zsc b/zscript/menu/swwm_title.zsc
index f0b21e767..ca790dcd5 100644
--- a/zscript/menu/swwm_title.zsc
+++ b/zscript/menu/swwm_title.zsc
@@ -135,8 +135,8 @@ Class SWWMTitleStuff : EventHandler
 		if ( !mSmallFont ) mSmallFont = Font.GetFont('TewiFont');
 		if ( !mBigFont ) mBigFont = Font.GetFont('TewiFontOutline');
 		if ( !lfade ) lfade = TexMan.GetCanvas("LOGOFADE");
-		if ( !tex[2] ) tex[2] = TexMan.CheckForTexture("graphics/tempbg.png",TexMan.Type_Any);
-		if ( !tex[5] ) tex[5] = TexMan.CheckForTexture("graphics/DemoIcon.png",TexMan.Type_Any);
+		if ( !tex[2] ) tex[2] = TexMan.CheckForTexture("graphics/tempbg.png");
+		if ( !tex[5] ) tex[5] = TexMan.CheckForTexture("graphics/DemoIcon.png");
 		Vector2 tsize, vsize;
 		if ( titletimer < -300 )
 		{
@@ -238,10 +238,10 @@ Class SWWMTitleStuff : EventHandler
 
 	private ui void Render_NewTitle( RenderEvent e, double GameSecs )
 	{
-		if ( !tex[4] ) tex[4] = TexMan.CheckForTexture("graphics/NewLogo.png",TexMan.Type_Any);
+		if ( !tex[4] ) tex[4] = TexMan.CheckForTexture("graphics/NewLogo.png");
 		for ( int i=0; i<13; i++ )
 		{
-			if ( !letters[i] ) letters[i] = TexMan.CheckForTexture("graphics/NewLogo_Letter"..i..".png",TexMan.Type_Any);
+			if ( !letters[i] ) letters[i] = TexMan.CheckForTexture("graphics/NewLogo_Letter"..i..".png");
 		}
 		double alf = clamp(GameSecs-1,0.,1.);
 		alf *= 1.-clamp(GameSecs-4,0.,1.);
diff --git a/zscript/swwm_thinkers_player.zsc b/zscript/swwm_thinkers_player.zsc
index e94cc1d7b..35f3b446c 100644
--- a/zscript/swwm_thinkers_player.zsc
+++ b/zscript/swwm_thinkers_player.zsc
@@ -576,7 +576,7 @@ Class SWWMLoreLibrary : SWWMStaticThinker
 		e.assoc = "$"..assoc;
 		e.read = false;
 		// image for certain entries
-		e.img = TexMan.CheckForTexture("graphics/KBase/PFP_"..ref..".png",TexMan.Type_Any);
+		e.img = TexMan.CheckForTexture("graphics/KBase/PFP_"..ref..".png");
 		// "new lore" message
 		if ( (level.maptime > 0) && (gametic > lastaddtic) && (myplayer == players[consoleplayer]) && (!menuactive || (menuactive == Menu.OnNoPause)) && (myplayer.mo is 'Demolitionist') )
 			Console.Printf(StringTable.Localize("$SWWM_NEWLORE"));
diff --git a/zscript/utility/swwm_utility.zsc b/zscript/utility/swwm_utility.zsc
index 104d627da..b1e6385dc 100644
--- a/zscript/utility/swwm_utility.zsc
+++ b/zscript/utility/swwm_utility.zsc
@@ -1894,27 +1894,27 @@ Class SWWMUtility
 		String tn = TexMan.GetName(checkme);
 		// special case: alt texture names in Doom 2 In Spain Only
 		if ( (tn ~== "MARBFAC2") || (tn ~== "SP_MAR01") )
-			return true, TexMan.CheckForTexture("defaced_MARBFAC2",TexMan.Type_Any);
+			return true, TexMan.CheckForTexture("defaced_MARBFAC2");
 		if ( (tn ~== "MARBFAC3") || (tn ~== "SP_MAR02"))
-			return true, TexMan.CheckForTexture("defaced_MARBFAC3",TexMan.Type_Any);
+			return true, TexMan.CheckForTexture("defaced_MARBFAC3");
 		if ( (tn ~== "MARBFAC4") || (tn ~== "SP_MAR03") )
-			return true, TexMan.CheckForTexture("defaced_MARBFAC4",TexMan.Type_Any);
+			return true, TexMan.CheckForTexture("defaced_MARBFAC4");
 		if ( (tn ~== "MARBFACE") || (tn ~== "SP_MAR04") )
-			return true, TexMan.CheckForTexture("defaced_MARBFACE",TexMan.Type_Any);
+			return true, TexMan.CheckForTexture("defaced_MARBFACE");
 		if ( (tn ~== "ZZWOLF2") )
-			return true, TexMan.CheckForTexture("defaced_ZZWOLF2",TexMan.Type_Any);
+			return true, TexMan.CheckForTexture("defaced_ZZWOLF2");
 		if ( (tn ~== "ZZWOLF3") )
-			return true, TexMan.CheckForTexture("defaced_ZZWOLF3",TexMan.Type_Any);
+			return true, TexMan.CheckForTexture("defaced_ZZWOLF3");
 		if ( (tn ~== "ZZWOLF4") )
-			return true, TexMan.CheckForTexture("defaced_ZZWOLF4",TexMan.Type_Any);
+			return true, TexMan.CheckForTexture("defaced_ZZWOLF4");
 		if ( (tn ~== "ZZWOLF6") )
-			return true, TexMan.CheckForTexture("defaced_ZZWOLF6",TexMan.Type_Any);
+			return true, TexMan.CheckForTexture("defaced_ZZWOLF6");
 		if ( (tn ~== "ZZWOLF7") )
-			return true, TexMan.CheckForTexture("defaced_ZZWOLF7",TexMan.Type_Any);
+			return true, TexMan.CheckForTexture("defaced_ZZWOLF7");
 		if ( (tn ~== "ZZWOLF12") )
-			return true, TexMan.CheckForTexture("defaced_ZZWOLF12",TexMan.Type_Any);
+			return true, TexMan.CheckForTexture("defaced_ZZWOLF12");
 		if ( (tn ~== "ZZWOLF13") )
-			return true, TexMan.CheckForTexture("defaced_ZZWOLF13",TexMan.Type_Any);
+			return true, TexMan.CheckForTexture("defaced_ZZWOLF13");
 		return false, checkme;
 	}
 
diff --git a/zscript/weapons/swwm_blazeit.zsc b/zscript/weapons/swwm_blazeit.zsc
index a997a1be3..486219d07 100644
--- a/zscript/weapons/swwm_blazeit.zsc
+++ b/zscript/weapons/swwm_blazeit.zsc
@@ -111,10 +111,10 @@ Class Hellblazer : SWWMWeapon
 		static const Class<Ammo> types[] = {"HellblazerMissiles","HellblazerCrackshots","HellblazerRavagers","HellblazerWarheads"};
 		if ( !LockIcon[0] )
 		{
-			LockIcon[0] = TexMan.CheckForTexture("graphics/HUD/HellblazerMissileLock.png",TexMan.Type_Any);
-			LockIcon[1] = TexMan.CheckForTexture("graphics/HUD/HellblazerCrackshotLock.png",TexMan.Type_Any);
-			LockIcon[2] = TexMan.CheckForTexture("graphics/HUD/HellblazerRavagerLock.png",TexMan.Type_Any);
-			LockIcon[3] = TexMan.CheckForTexture("graphics/HUD/HellblazerWarheadLock.png",TexMan.Type_Any);
+			LockIcon[0] = TexMan.CheckForTexture("graphics/HUD/HellblazerMissileLock.png");
+			LockIcon[1] = TexMan.CheckForTexture("graphics/HUD/HellblazerCrackshotLock.png");
+			LockIcon[2] = TexMan.CheckForTexture("graphics/HUD/HellblazerRavagerLock.png");
+			LockIcon[3] = TexMan.CheckForTexture("graphics/HUD/HellblazerWarheadLock.png");
 		}
 		int curtype = 0;
 		for ( int i=0; i<4; i++ )
diff --git a/zscript/weapons/swwm_cbt_fx.zsc b/zscript/weapons/swwm_cbt_fx.zsc
index f849ad421..bb3061fcd 100644
--- a/zscript/weapons/swwm_cbt_fx.zsc
+++ b/zscript/weapons/swwm_cbt_fx.zsc
@@ -535,12 +535,12 @@ Class BusterWall : Thinker
 		// shush
 		hs.flags |= Sector.SECF_SILENTMOVE;
 		// filler texture
-		TextureID rubble = TexMan.CheckForTexture("ASHWALL2",TexMan.Type_Any);
+		TextureID rubble = TexMan.CheckForTexture("ASHWALL2");
 		// equivalents for other iwads
-		if ( !rubble.IsValid() ) rubble = TexMan.CheckForTexture("ASHWALL",TexMan.Type_Any);
-		if ( !rubble.IsValid() ) rubble = TexMan.CheckForTexture("LOOSERCK",TexMan.Type_Any);
-		if ( !rubble.IsValid() ) rubble = TexMan.CheckForTexture("WASTE03",TexMan.Type_Any);
-		if ( !rubble.IsValid() ) rubble = TexMan.CheckForTexture("-noflat-",TexMan.Type_Any);	// an unfortunate fallback should none of those exist
+		if ( !rubble.IsValid() ) rubble = TexMan.CheckForTexture("ASHWALL");
+		if ( !rubble.IsValid() ) rubble = TexMan.CheckForTexture("LOOSERCK");
+		if ( !rubble.IsValid() ) rubble = TexMan.CheckForTexture("WASTE03");
+		if ( !rubble.IsValid() ) rubble = TexMan.CheckForTexture("-noflat-");	// an unfortunate fallback should none of those exist
 		// activate all shoot/use specials (not locked) associated with this sector's two-sided lines
 		for ( int i=0; i<hs.Lines.Size(); i++ )
 		{
diff --git a/zscript/weapons/swwm_cbt_ui.zsc b/zscript/weapons/swwm_cbt_ui.zsc
index 28e13bdb9..db31aac3e 100644
--- a/zscript/weapons/swwm_cbt_ui.zsc
+++ b/zscript/weapons/swwm_cbt_ui.zsc
@@ -27,11 +27,11 @@ Class WallbusterReloadMenu : GenericMenu
 			Close();
 			return;
 		}
-		MainWindow = TexMan.CheckForTexture("graphics/HUD/WallbusterMenu.png",TexMan.Type_Any);
-		AmmoIcon[0] = TexMan.CheckForTexture("graphics/HUD/MenuShellRed.png",TexMan.Type_Any);
-		AmmoIcon[1] = TexMan.CheckForTexture("graphics/HUD/MenuShellGreen.png",TexMan.Type_Any);
-		AmmoIcon[2] = TexMan.CheckForTexture("graphics/HUD/MenuShellBlue.png",TexMan.Type_Any);
-		AmmoIcon[3] = TexMan.CheckForTexture("graphics/HUD/MenuShellPurple.png",TexMan.Type_Any);
+		MainWindow = TexMan.CheckForTexture("graphics/HUD/WallbusterMenu.png");
+		AmmoIcon[0] = TexMan.CheckForTexture("graphics/HUD/MenuShellRed.png");
+		AmmoIcon[1] = TexMan.CheckForTexture("graphics/HUD/MenuShellGreen.png");
+		AmmoIcon[2] = TexMan.CheckForTexture("graphics/HUD/MenuShellBlue.png");
+		AmmoIcon[3] = TexMan.CheckForTexture("graphics/HUD/MenuShellPurple.png");
 		mSmallFont = Font.GetFont('TewiFont');
 		mTinyFont = Font.GetFont('MiniwiFont');
 		MenuSound("menu/demotab");
diff --git a/zscript/weapons/swwm_thiccboolet.zsc b/zscript/weapons/swwm_thiccboolet.zsc
index f5bb5df49..df3bc800b 100644
--- a/zscript/weapons/swwm_thiccboolet.zsc
+++ b/zscript/weapons/swwm_thiccboolet.zsc
@@ -334,10 +334,10 @@ Class SilverBullet : SWWMWeapon
 			else
 			{
 				PPShader.SetEnabled("SilverScope",false);
-				if ( !scope ) scope = TexMan.CheckForTexture("graphics/SBScope.png",TexMan.Type_Any);
+				if ( !scope ) scope = TexMan.CheckForTexture("graphics/SBScope.png");
 				Screen.DrawTexture(scope,false,ss.x*.5,ss.y*.5,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_LegacyRenderStyle,STYLE_Multiply);
 			}
-			if ( !reticle ) reticle = TexMan.CheckForTexture("graphics/SBReticle.png",TexMan.Type_Any);
+			if ( !reticle ) reticle = TexMan.CheckForTexture("graphics/SBReticle.png");
 			Screen.DrawTexture(reticle,false,ss.x*.5,ss.y*.5,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_LegacyRenderStyle,STYLE_Stencil,DTA_FillColor,Color(0,0,0));
 			return;
 		}
diff --git a/zscript/weapons/swwm_weapons_hud.zsc b/zscript/weapons/swwm_weapons_hud.zsc
index acb809dbc..c9fe9d962 100644
--- a/zscript/weapons/swwm_weapons_hud.zsc
+++ b/zscript/weapons/swwm_weapons_hud.zsc
@@ -8,8 +8,8 @@ extend Class DeepImpact
 
 	override void DrawWeapon( double TicFrac, double bx, double by, double hs, Vector2 ss )
 	{
-		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/DeepImpactDisplay.png",TexMan.Type_Any);
-		if ( !AmmoBar ) AmmoBar = TexMan.CheckForTexture("graphics/HUD/DeepImpactBar.png",TexMan.Type_Any);
+		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/DeepImpactDisplay.png");
+		if ( !AmmoBar ) AmmoBar = TexMan.CheckForTexture("graphics/HUD/DeepImpactBar.png");
 		if ( !AmmoFont ) AmmoFont = Font.GetFont("MiniHudShadow");
 		Screen.DrawTexture(WeaponBox,false,bx-24,by-25,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
 		double chg = clamp(ChargeInter?ChargeInter.GetValue(TicFrac):clipcount,0.,100.);
@@ -28,8 +28,8 @@ extend Class ExplodiumGun
 
 	override void DrawWeapon( double TicFrac, double bx, double by, double hs, Vector2 ss )
 	{
-		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/ExplodiumDisplay.png",TexMan.Type_Any);
-		if ( !RoundTex ) RoundTex = TexMan.CheckForTexture("graphics/HUD/ExplodiumRound.png",TexMan.Type_Any);
+		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/ExplodiumDisplay.png");
+		if ( !RoundTex ) RoundTex = TexMan.CheckForTexture("graphics/HUD/ExplodiumRound.png");
 		Screen.DrawTexture(WeaponBox,false,bx-10,by-21,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
 		if ( chambered ) Screen.DrawTexture(RoundTex,false,bx-8,by-19,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
 		for ( int i=0; i<clipcount; i++ ) Screen.DrawTexture(RoundTex,false,bx-8,by-(16-i*2),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
@@ -41,8 +41,8 @@ extend Class DualExplodiumGun
 
 	override void DrawWeapon( double TicFrac, double bx, double by, double hs, Vector2 ss )
 	{
-		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/ExplodiumDisplay.png",TexMan.Type_Any);
-		if ( !RoundTex ) RoundTex = TexMan.CheckForTexture("graphics/HUD/ExplodiumRound.png",TexMan.Type_Any);
+		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/ExplodiumDisplay.png");
+		if ( !RoundTex ) RoundTex = TexMan.CheckForTexture("graphics/HUD/ExplodiumRound.png");
 		Screen.DrawTexture(WeaponBox,false,bx-22,by-21,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
 		if ( chambered ) Screen.DrawTexture(RoundTex,false,bx-20,by-19,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
 		for ( int i=0; i<clipcount; i++ ) Screen.DrawTexture(RoundTex,false,bx-20,by-(16-i*2),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
@@ -60,13 +60,13 @@ extend Class Spreadgun
 	override void DrawWeapon( double TicFrac, double bx, double by, double hs, Vector2 ss )
 	{
 		static const Class<Ammo> types[] = {"RedShell","GreenShell","BlueShell","PurpleShell","BlackShell","GoldShell"};
-		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/SpreadgunDisplay.png",TexMan.Type_Any);
-		if ( !RoundTex[0] ) RoundTex[0] = TexMan.CheckForTexture("graphics/HUD/ShellRed.png",TexMan.Type_Any);
-		if ( !RoundTex[1] ) RoundTex[1] = TexMan.CheckForTexture("graphics/HUD/ShellGreen.png",TexMan.Type_Any);
-		if ( !RoundTex[2] ) RoundTex[2] = TexMan.CheckForTexture("graphics/HUD/ShellBlue.png",TexMan.Type_Any);
-		if ( !RoundTex[3] ) RoundTex[3] = TexMan.CheckForTexture("graphics/HUD/ShellPurple.png",TexMan.Type_Any);
-		if ( !RoundTex[4] ) RoundTex[4] = TexMan.CheckForTexture("graphics/HUD/ShellBlack.png",TexMan.Type_Any);
-		if ( !RoundTex[5] ) RoundTex[5] = TexMan.CheckForTexture("graphics/HUD/ShellGold.png",TexMan.Type_Any);
+		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/SpreadgunDisplay.png");
+		if ( !RoundTex[0] ) RoundTex[0] = TexMan.CheckForTexture("graphics/HUD/ShellRed.png");
+		if ( !RoundTex[1] ) RoundTex[1] = TexMan.CheckForTexture("graphics/HUD/ShellGreen.png");
+		if ( !RoundTex[2] ) RoundTex[2] = TexMan.CheckForTexture("graphics/HUD/ShellBlue.png");
+		if ( !RoundTex[3] ) RoundTex[3] = TexMan.CheckForTexture("graphics/HUD/ShellPurple.png");
+		if ( !RoundTex[4] ) RoundTex[4] = TexMan.CheckForTexture("graphics/HUD/ShellBlack.png");
+		if ( !RoundTex[5] ) RoundTex[5] = TexMan.CheckForTexture("graphics/HUD/ShellGold.png");
 		Screen.DrawTexture(WeaponBox,false,bx-13,by-8,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
 		if ( !chambered ) return;
 		for ( int i=0; i<6; i++ )
@@ -86,12 +86,12 @@ extend Class Wallbuster
 	override void DrawWeapon( double TicFrac, double bx, double by, double hs, Vector2 ss )
 	{
 		static const Class<Ammo> types[] = {"RedShell","GreenShell","BlueShell","PurpleShell"};
-		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/WallbusterDisplay.png",TexMan.Type_Any);
-		if ( !RoundTex[0] ) RoundTex[0] = TexMan.CheckForTexture("graphics/HUD/ShellRedSmall.png",TexMan.Type_Any);
-		if ( !RoundTex[1] ) RoundTex[1] = TexMan.CheckForTexture("graphics/HUD/ShellGreenSmall.png",TexMan.Type_Any);
-		if ( !RoundTex[2] ) RoundTex[2] = TexMan.CheckForTexture("graphics/HUD/ShellBlueSmall.png",TexMan.Type_Any);
-		if ( !RoundTex[3] ) RoundTex[3] = TexMan.CheckForTexture("graphics/HUD/ShellPurpleSmall.png",TexMan.Type_Any);
-		if ( !CursorTex ) CursorTex = TexMan.CheckForTexture("graphics/HUD/WallbusterCursor.png",TexMan.Type_Any);
+		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/WallbusterDisplay.png");
+		if ( !RoundTex[0] ) RoundTex[0] = TexMan.CheckForTexture("graphics/HUD/ShellRedSmall.png");
+		if ( !RoundTex[1] ) RoundTex[1] = TexMan.CheckForTexture("graphics/HUD/ShellGreenSmall.png");
+		if ( !RoundTex[2] ) RoundTex[2] = TexMan.CheckForTexture("graphics/HUD/ShellBlueSmall.png");
+		if ( !RoundTex[3] ) RoundTex[3] = TexMan.CheckForTexture("graphics/HUD/ShellPurpleSmall.png");
+		if ( !CursorTex ) CursorTex = TexMan.CheckForTexture("graphics/HUD/WallbusterCursor.png");
 		Screen.DrawTexture(WeaponBox,false,bx-12,by-75,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
 		int curpos = 73-(rotation[5]*15+rotation[rotation[5]]*2);
 		Screen.DrawTexture(CursorTex,false,bx-10,by-curpos,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
@@ -116,10 +116,10 @@ extend Class Eviscerator
 
 	override void DrawWeapon( double TicFrac, double bx, double by, double hs, Vector2 ss )
 	{
-		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/EvisceratorDisplay.png",TexMan.Type_Any);
-		if ( !RoundTex ) RoundTex = TexMan.CheckForTexture("graphics/HUD/EvisceratorRound.png",TexMan.Type_Any);
-		if ( !SpreadIcon[0] ) SpreadIcon[0] = TexMan.CheckForTexture("graphics/HUD/EvisceratorWide.png",TexMan.Type_Any);
-		if ( !SpreadIcon[1] ) SpreadIcon[1] = TexMan.CheckForTexture("graphics/HUD/EvisceratorTight.png",TexMan.Type_Any);
+		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/EvisceratorDisplay.png");
+		if ( !RoundTex ) RoundTex = TexMan.CheckForTexture("graphics/HUD/EvisceratorRound.png");
+		if ( !SpreadIcon[0] ) SpreadIcon[0] = TexMan.CheckForTexture("graphics/HUD/EvisceratorWide.png");
+		if ( !SpreadIcon[1] ) SpreadIcon[1] = TexMan.CheckForTexture("graphics/HUD/EvisceratorTight.png");
 		Screen.DrawTexture(WeaponBox,false,bx-10,by-20,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
 		Screen.DrawTexture(RoundTex,false,bx-8,by-8,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_ColorOverlay,chambered?Color(0,0,0,0):Color(128,0,0,0));
 		Screen.DrawTexture(SpreadIcon[extended],false,bx-8,by-18,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
@@ -134,11 +134,11 @@ extend Class Hellblazer
 	override void DrawWeapon( double TicFrac, double bx, double by, double hs, Vector2 ss )
 	{
 		static const Class<Ammo> types[] = {"HellblazerMissiles","HellblazerCrackshots","HellblazerRavagers","HellblazerWarheads"};
-		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/HellblazerDisplay.png",TexMan.Type_Any);
-		if ( !RoundTex[0] ) RoundTex[0] = TexMan.CheckForTexture("graphics/HUD/HellblazerMissile.png",TexMan.Type_Any);
-		if ( !RoundTex[1] ) RoundTex[1] = TexMan.CheckForTexture("graphics/HUD/HellblazerCrackshot.png",TexMan.Type_Any);
-		if ( !RoundTex[2] ) RoundTex[2] = TexMan.CheckForTexture("graphics/HUD/HellblazerRavager.png",TexMan.Type_Any);
-		if ( !RoundTex[3] ) RoundTex[3] = TexMan.CheckForTexture("graphics/HUD/HellblazerWarhead.png",TexMan.Type_Any);
+		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/HellblazerDisplay.png");
+		if ( !RoundTex[0] ) RoundTex[0] = TexMan.CheckForTexture("graphics/HUD/HellblazerMissile.png");
+		if ( !RoundTex[1] ) RoundTex[1] = TexMan.CheckForTexture("graphics/HUD/HellblazerCrackshot.png");
+		if ( !RoundTex[2] ) RoundTex[2] = TexMan.CheckForTexture("graphics/HUD/HellblazerRavager.png");
+		if ( !RoundTex[3] ) RoundTex[3] = TexMan.CheckForTexture("graphics/HUD/HellblazerWarhead.png");
 		Screen.DrawTexture(WeaponBox,false,bx-13,by-29,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
 		int curtype = 0;
 		for ( int i=0; i<4; i++ )
@@ -192,9 +192,9 @@ extend Class Sparkster
 
 	override void DrawWeapon( double TicFrac, double bx, double by, double hs, Vector2 ss )
 	{
-		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/BiosparkDisplay.png",TexMan.Type_Any);
-		if ( !RoundTex[0] ) RoundTex[0] = TexMan.CheckForTexture("graphics/HUD/BiosparkShot.png",TexMan.Type_Any);
-		if ( !RoundTex[1] ) RoundTex[1] = TexMan.CheckForTexture("graphics/HUD/BiosparkRed.png",TexMan.Type_Any);
+		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/BiosparkDisplay.png");
+		if ( !RoundTex[0] ) RoundTex[0] = TexMan.CheckForTexture("graphics/HUD/BiosparkShot.png");
+		if ( !RoundTex[1] ) RoundTex[1] = TexMan.CheckForTexture("graphics/HUD/BiosparkRed.png");
 		bool blinking = (failtime>gametic)&&((failtime-gametic)%16>=8);
 		if ( doublestacc )
 		{
@@ -242,13 +242,13 @@ extend Class SilverBullet
 
 	override void DrawWeapon( double TicFrac, double bx, double by, double hs, Vector2 ss )
 	{
-		if ( !WeaponBox[0] ) WeaponBox[0] = TexMan.CheckForTexture("graphics/HUD/SilverBulletDisplay.png",TexMan.Type_Any);
-		if ( !WeaponBox[1] ) WeaponBox[1] = TexMan.CheckForTexture("graphics/HUD/SilverBulletZoomDisplay.png",TexMan.Type_Any);
-		if ( !ZoomBar ) ZoomBar = TexMan.CheckForTexture("graphics/HUD/SilverBulletZoomBar.png",TexMan.Type_Any);
-		if ( !RoundTex[0] ) RoundTex[0] = TexMan.CheckForTexture("graphics/HUD/SilverBulletXSB.png",TexMan.Type_Any);
-		if ( !RoundTex[1] ) RoundTex[1] = TexMan.CheckForTexture("graphics/HUD/SilverBulletFCB.png",TexMan.Type_Any);
-		if ( !RoundTex[2] ) RoundTex[2] = TexMan.CheckForTexture("graphics/HUD/SilverBulletXSBCasing.png",TexMan.Type_Any);
-		if ( !RoundTex[3] ) RoundTex[3] = TexMan.CheckForTexture("graphics/HUD/SilverBulletFCBCasing.png",TexMan.Type_Any);
+		if ( !WeaponBox[0] ) WeaponBox[0] = TexMan.CheckForTexture("graphics/HUD/SilverBulletDisplay.png");
+		if ( !WeaponBox[1] ) WeaponBox[1] = TexMan.CheckForTexture("graphics/HUD/SilverBulletZoomDisplay.png");
+		if ( !ZoomBar ) ZoomBar = TexMan.CheckForTexture("graphics/HUD/SilverBulletZoomBar.png");
+		if ( !RoundTex[0] ) RoundTex[0] = TexMan.CheckForTexture("graphics/HUD/SilverBulletXSB.png");
+		if ( !RoundTex[1] ) RoundTex[1] = TexMan.CheckForTexture("graphics/HUD/SilverBulletFCB.png");
+		if ( !RoundTex[2] ) RoundTex[2] = TexMan.CheckForTexture("graphics/HUD/SilverBulletXSBCasing.png");
+		if ( !RoundTex[3] ) RoundTex[3] = TexMan.CheckForTexture("graphics/HUD/SilverBulletFCBCasing.png");
 		double zl = clamp(ZoomInter?ZoomInter.GetValue(TicFrac):(zoomlevel*10),0.,160.);
 		if ( zl >= 10. )
 		{
@@ -271,8 +271,8 @@ extend Class CandyGun
 
 	override void DrawWeapon( double TicFrac, double bx, double by, double hs, Vector2 ss )
 	{
-		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/ExplodiumDisplay.png",TexMan.Type_Any);
-		if ( !RoundTex ) RoundTex = TexMan.CheckForTexture("graphics/HUD/CandyRound.png",TexMan.Type_Any);
+		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/ExplodiumDisplay.png");
+		if ( !RoundTex ) RoundTex = TexMan.CheckForTexture("graphics/HUD/CandyRound.png");
 		Screen.DrawTexture(WeaponBox,false,bx-10,by-21,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
 		if ( chambered ) Screen.DrawTexture(RoundTex,false,bx-8,by-19,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
 		for ( int i=0; i<clipcount; i++ ) Screen.DrawTexture(RoundTex,false,bx-8,by-(16-i*2),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
@@ -286,11 +286,11 @@ extend Class Ynykron
 
 	override void DrawWeapon( double TicFrac, double bx, double by, double hs, Vector2 ss )
 	{
-		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/YnykronDisplay.png",TexMan.Type_Any);
-		if ( !ChargeBar[0] ) ChargeBar[0] = TexMan.CheckForTexture("graphics/HUD/YnykronBarBeam.png",TexMan.Type_Any);
-		if ( !ChargeBar[1] ) ChargeBar[1] = TexMan.CheckForTexture("graphics/HUD/YnykronBarVortex.png",TexMan.Type_Any);
-		if ( !BoxSide[0] ) BoxSide[0] = TexMan.CheckForTexture("graphics/HUD/YnykronIconBeam.png",TexMan.Type_Any);
-		if ( !BoxSide[1] ) BoxSide[1] = TexMan.CheckForTexture("graphics/HUD/YnykronIconVortex.png",TexMan.Type_Any);
+		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/YnykronDisplay.png");
+		if ( !ChargeBar[0] ) ChargeBar[0] = TexMan.CheckForTexture("graphics/HUD/YnykronBarBeam.png");
+		if ( !ChargeBar[1] ) ChargeBar[1] = TexMan.CheckForTexture("graphics/HUD/YnykronBarVortex.png");
+		if ( !BoxSide[0] ) BoxSide[0] = TexMan.CheckForTexture("graphics/HUD/YnykronIconBeam.png");
+		if ( !BoxSide[1] ) BoxSide[1] = TexMan.CheckForTexture("graphics/HUD/YnykronIconVortex.png");
 		Screen.DrawTexture(WeaponBox,false,bx-10,by-40,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
 		double chg = clamp(ChargeInter?ChargeInter.GetValue(TicFrac):(chargelevel*10),0.,400.);
 		double ch = chg/16.;