From 12515e910792ef9582f1c0f32d0632ec3d06adbc Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Tue, 26 Jul 2022 21:11:06 +0200
Subject: [PATCH] Wrist tags in first person also update now.

---
 animdefs.misc                       |   1 +
 gldefs.demolitionist                |   9 +
 language.version                    |   4 +-
 modeldef.candygun                   |  49 +--
 modeldef.deepimpact                 |   2 +-
 modeldef.eviscerator                |  41 ++-
 modeldef.explodiumgun               |  49 +--
 modeldef.explodiumgun2              | 507 ++++++++++++++--------------
 modeldef.funstuff                   | 187 ----------
 modeldef.gesture                    |   6 +-
 modeldef.hellblazer                 |   2 +-
 modeldef.itemgesture                |  24 +-
 modeldef.keygesture                 |  56 +--
 modeldef.sheenhmg                   |   2 +-
 modeldef.silverbullet               |   2 +-
 modeldef.sparkster                  |   2 +-
 modeldef.spreadgun                  |   2 +-
 modeldef.wallbuster                 |   2 +-
 modeldef.ynykron                    |   2 +-
 models/DemoTags1st.png              | Bin 0 -> 7881 bytes
 shaders/glsl/DemoTags1st.fp         |   7 +
 zscript/items/swwm_funstuff.zsc     |  24 +-
 zscript/swwm_player.zsc             |   6 +-
 zscript/swwm_statichandler.zsc      |  31 ++
 zscript/weapons/swwm_baseweapon.zsc |   2 +
 25 files changed, 442 insertions(+), 577 deletions(-)
 create mode 100644 models/DemoTags1st.png
 create mode 100644 shaders/glsl/DemoTags1st.fp

diff --git a/animdefs.misc b/animdefs.misc
index d492f931c..011133225 100644
--- a/animdefs.misc
+++ b/animdefs.misc
@@ -1,2 +1,3 @@
 cameratexture LOGOFADE 64 64
 canvastexture SHEENLED 128 128
+canvastexture DEMOT1ST 256 256
diff --git a/gldefs.demolitionist b/gldefs.demolitionist
index 51e4b4f31..30052d37c 100644
--- a/gldefs.demolitionist
+++ b/gldefs.demolitionist
@@ -118,3 +118,12 @@ Brightmap Texture "models/DemoTagsYellow.png"
 {
 	Map "models/DemoTags_bright.png"
 }
+HardwareShader Texture "models/DemoTags1st.png"
+{
+	Shader "shaders/glsl/DemoTags1st.fp"
+	Texture scrtex "DEMOT1ST"
+}
+Brightmap Texture "models/DemoTags1st.png"
+{
+	Map "models/DemoTags_bright.png"
+}
diff --git a/language.version b/language.version
index d72114012..28271d740 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r219 \cu(Tue 26 Jul 18:55:49 CEST 2022)\c-";
-SWWM_SHORTVER="\cw1.3pre r219 \cu(2022-07-26 18:55:49)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r220 \cu(Tue 26 Jul 21:11:06 CEST 2022)\c-";
+SWWM_SHORTVER="\cw1.3pre r220 \cu(2022-07-26 21:11:06)\c-";
diff --git a/modeldef.candygun b/modeldef.candygun
index 1a0e02467..11c300b12 100644
--- a/modeldef.candygun
+++ b/modeldef.candygun
@@ -134,12 +134,36 @@ Model "CandyGun"
 	FrameIndex XZWZ J 2 0
 }
 
+Model "CandyGun"
+{
+	Path "models"
+
+	Model 3 "ExplodiumGun1st_d.3d"
+	SurfaceSkin 3 4 "CandyCasing_Used.png"
+
+	Scale -0.005 0.0025 0.005
+	AngleOffset -90
+	Offset 0 0 -2
+
+	// Casing
+	FrameIndex XZWC A 3 14
+	FrameIndex XZWC B 3 15
+	FrameIndex XZWC C 3 16
+	FrameIndex XZWC D 3 17
+	FrameIndex XZWC E 3 18
+	FrameIndex XZWC F 3 19
+	FrameIndex XZWC G 3 20
+	FrameIndex XZWC H 3 21
+	FrameIndex XZWC I 3 22
+	FrameIndex XZWC J 3 23
+}
+
 Model "CandyGun"
 {
 	Path "models"
 
 	Model 1 "ExplodiumGun1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "CandyGun.png"
@@ -413,30 +437,7 @@ Model "CandyGun"
 	FrameIndex XZWB X 1 152
 	FrameIndex XZWB Y 1 153
 	FrameIndex XZWB Z 1 154
-	// Casing
-	SurfaceSkin 1 0 ""
-	SurfaceSkin 1 1 ""
-	SurfaceSkin 1 2 ""
-	SurfaceSkin 1 3 ""
-	SurfaceSkin 1 4 "CandyCasing_Used.png"
-	SurfaceSkin 1 5 ""
-	FrameIndex XZWC A 1 14
-	FrameIndex XZWC B 1 15
-	FrameIndex XZWC C 1 16
-	FrameIndex XZWC D 1 17
-	FrameIndex XZWC E 1 18
-	FrameIndex XZWC F 1 19
-	FrameIndex XZWC G 1 20
-	FrameIndex XZWC H 1 21
-	FrameIndex XZWC I 1 22
-	FrameIndex XZWC J 1 23
 	/// LAST ROUND
-	SurfaceSkin 1 0 "DemoTags.png"
-	SurfaceSkin 1 1 "DemoArms.png"
-	SurfaceSkin 1 2 "DemoSoft.png"
-	SurfaceSkin 1 3 "CandyGun.png"
-	SurfaceSkin 1 4 ""
-	SurfaceSkin 1 5 "CandyGun.png"
 	// Fire
 	FrameIndex XZWC K 1 237
 	FrameIndex XZWC L 1 238
diff --git a/modeldef.deepimpact b/modeldef.deepimpact
index 1449d87e0..8d4b817fd 100644
--- a/modeldef.deepimpact
+++ b/modeldef.deepimpact
@@ -17,7 +17,7 @@ Model "DeepImpact"
 	Path "models"
 
 	Model 1 "DeepImpact1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "DeepImpact.png"
diff --git a/modeldef.eviscerator b/modeldef.eviscerator
index 5a93b4370..12c8e7cc1 100644
--- a/modeldef.eviscerator
+++ b/modeldef.eviscerator
@@ -135,12 +135,35 @@ Model "Eviscerator"
 	FrameIndex XZWZ H 2 0
 }
 
+Model "Eviscerator"
+{
+	Path "models"
+
+	Model 3 "Eviscerator1st_d.3d"
+	SurfaceSkin 3 4 "EvisceratorShell.png"
+	Scale -0.005 0.0025 0.005
+	AngleOffset -90
+	Offset 0 2 0
+
+	// Casing Ejected
+	FrameIndex XZWB D 3 51
+	FrameIndex XZWB E 3 52
+	FrameIndex XZWB F 3 53
+	FrameIndex XZWB G 3 54
+	FrameIndex XZWB H 3 55
+	FrameIndex XZWB I 3 56
+	FrameIndex XZWB J 3 57
+	FrameIndex XZWB K 3 58
+	FrameIndex XZWB L 3 59
+	FrameIndex XZWB M 3 60
+}
+
 Model "Eviscerator"
 {
 	Path "models"
 
 	Model 1 "Eviscerator1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "Eviscerator.png"
@@ -403,20 +426,4 @@ Model "Eviscerator"
 	FrameIndex XZWB A 1 247
 	FrameIndex XZWB B 1 248
 	FrameIndex XZWB C 1 249
-	// Casing Ejected
-	SurfaceSkin 1 0 ""
-	SurfaceSkin 1 1 ""
-	SurfaceSkin 1 2 ""
-	SurfaceSkin 1 3 ""
-	SurfaceSkin 1 4 "EvisceratorShell.png"
-	FrameIndex XZWB D 1 51
-	FrameIndex XZWB E 1 52
-	FrameIndex XZWB F 1 53
-	FrameIndex XZWB G 1 54
-	FrameIndex XZWB H 1 55
-	FrameIndex XZWB I 1 56
-	FrameIndex XZWB J 1 57
-	FrameIndex XZWB K 1 58
-	FrameIndex XZWB L 1 59
-	FrameIndex XZWB M 1 60
 }
diff --git a/modeldef.explodiumgun b/modeldef.explodiumgun
index a3418ab3c..4d45af1df 100644
--- a/modeldef.explodiumgun
+++ b/modeldef.explodiumgun
@@ -106,12 +106,36 @@ Model "ExplodiumGun"
 	FrameIndex XZWZ J 2 0
 }
 
+Model "ExplodiumGun"
+{
+	Path "models"
+
+	Model 3 "ExplodiumGun1st_d.3d"
+	SurfaceSkin 3 4 "ExplodiumCasing_Used.png"
+
+	Scale -0.005 0.0025 0.005
+	AngleOffset -90
+	Offset 0 0 -2
+
+	// Casing
+	FrameIndex XZWA A 3 14
+	FrameIndex XZWA B 3 15
+	FrameIndex XZWA C 3 16
+	FrameIndex XZWA D 3 17
+	FrameIndex XZWA E 3 18
+	FrameIndex XZWA F 3 19
+	FrameIndex XZWA G 3 20
+	FrameIndex XZWA H 3 21
+	FrameIndex XZWA I 3 22
+	FrameIndex XZWA J 3 23
+}
+
 Model "ExplodiumGun"
 {
 	Path "models"
 
 	Model 1 "ExplodiumGun1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "ExplodiumGun.png"
@@ -355,30 +379,7 @@ Model "ExplodiumGun"
 	FrameIndex XZW9 U 1 233
 	FrameIndex XZW9 V 1 234
 	FrameIndex XZW9 W 1 235
-	// Casing
-	SurfaceSkin 1 0 ""
-	SurfaceSkin 1 1 ""
-	SurfaceSkin 1 2 ""
-	SurfaceSkin 1 3 ""
-	SurfaceSkin 1 4 "ExplodiumCasing_Used.png"
-	SurfaceSkin 1 5 ""
-	FrameIndex XZWA A 1 14
-	FrameIndex XZWA B 1 15
-	FrameIndex XZWA C 1 16
-	FrameIndex XZWA D 1 17
-	FrameIndex XZWA E 1 18
-	FrameIndex XZWA F 1 19
-	FrameIndex XZWA G 1 20
-	FrameIndex XZWA H 1 21
-	FrameIndex XZWA I 1 22
-	FrameIndex XZWA J 1 23
 	/// LAST ROUND
-	SurfaceSkin 1 0 "DemoTags.png"
-	SurfaceSkin 1 1 "DemoArms.png"
-	SurfaceSkin 1 2 "DemoSoft.png"
-	SurfaceSkin 1 3 "ExplodiumGun.png"
-	SurfaceSkin 1 4 ""
-	SurfaceSkin 1 5 "ExplodiumGun.png"
 	// Fire
 	FrameIndex XZWA K 1 237
 	FrameIndex XZWA L 1 238
diff --git a/modeldef.explodiumgun2 b/modeldef.explodiumgun2
index 3779c0385..993ddca42 100644
--- a/modeldef.explodiumgun2
+++ b/modeldef.explodiumgun2
@@ -54,12 +54,269 @@ Model "DualExplodiumGun"
 	FrameIndex XZWZ T 2 0
 }
 
+Model "DualExplodiumGun"
+{
+	Path "models"
+
+	Model 4 "ExplodiumGun1st_d.3d"
+	SurfaceSkin 4 4 "ExplodiumCasing_Used.png"
+
+	Scale -0.005 0.0025 0.005
+	AngleOffset -90
+	Offset 3 0 -2
+
+	// Casings
+	// RIGHT
+	FrameIndex XZWA A 4 14
+	FrameIndex XZWA B 4 15
+	FrameIndex XZWA C 4 16
+	FrameIndex XZWA D 4 17
+	FrameIndex XZWA E 4 18
+	FrameIndex XZWA F 4 19
+	FrameIndex XZWA G 4 20
+	FrameIndex XZWA H 4 21
+	FrameIndex XZWA I 4 22
+	FrameIndex XZWA J 4 23
+	// LEFT
+	Model 4 "ExplodiumGun1stL_d.3d"
+	Offset -3 0 -2
+	FrameIndex XZWI A 4 14
+	FrameIndex XZWI B 4 15
+	FrameIndex XZWI C 4 16
+	FrameIndex XZWI D 4 17
+	FrameIndex XZWI E 4 18
+	FrameIndex XZWI F 4 19
+	FrameIndex XZWI G 4 20
+	FrameIndex XZWI H 4 21
+	FrameIndex XZWI I 4 22
+	FrameIndex XZWI J 4 23
+}
+
+Model "DualExplodiumGun"
+{
+	Path "models"
+
+	Model 3 "ExplodiumGun1stL_d.3d"
+	SurfaceSkin 3 0 "DemoTags1st.png"
+	SurfaceSkin 3 1 "DemoArms.png"
+	SurfaceSkin 3 2 "DemoSoft.png"
+	SurfaceSkin 3 3 "ExplodiumGun.png"
+	SurfaceSkin 3 5 "ExplodiumGun.png"
+
+	Scale -0.005 0.0025 0.005
+	AngleOffset -90
+	Offset -3 0 -2
+
+	//// LEFT
+	// Still
+	FrameIndex XZWB A 3 0
+	// Deselect
+	FrameIndex XZWA P 3 1
+	FrameIndex XZWA Q 3 2
+	FrameIndex XZWA R 3 3
+	FrameIndex XZWA S 3 4
+	// Select
+	FrameIndex XZWB B 3 5
+	FrameIndex XZWB C 3 6
+	FrameIndex XZWB D 3 7
+	FrameIndex XZWB E 3 8
+	FrameIndex XZWB F 3 9
+	FrameIndex XZWB G 3 10
+	FrameIndex XZWB H 3 11
+	// Fire
+	FrameIndex XZWB I 3 13
+	FrameIndex XZWB J 3 14
+	FrameIndex XZWB K 3 15
+	FrameIndex XZWB L 3 16
+	FrameIndex XZWB M 3 17
+	FrameIndex XZWB N 3 18
+	FrameIndex XZWB O 3 19
+	FrameIndex XZWB P 3 20
+	FrameIndex XZWB Q 3 21
+	// unused
+	FrameIndex XZWB R 3 22
+	FrameIndex XZWB S 3 23
+	// Reload (Part 1)
+	FrameIndex XZWB T 3 310
+	FrameIndex XZWB U 3 311
+	FrameIndex XZWB V 3 312
+	FrameIndex XZWB W 3 313
+	FrameIndex XZWB X 3 314
+	FrameIndex XZWB Y 3 315
+	FrameIndex XZWB Z 3 316
+	FrameIndex XZWC A 3 317
+	FrameIndex XZWC B 3 318
+	FrameIndex XZWC C 3 319
+	FrameIndex XZWC D 3 320
+	FrameIndex XZWC E 3 321
+	FrameIndex XZWC F 3 322
+	FrameIndex XZWC G 3 323
+	FrameIndex XZWC H 3 324
+	// Reload (Part 1 w/ Empty Mag)
+	SurfaceSkin 3 3 "ExplodiumGun_EmptyMag.png"
+	FrameIndex XZWC I 3 310
+	FrameIndex XZWC J 3 311
+	FrameIndex XZWC K 3 312
+	FrameIndex XZWC L 3 313
+	FrameIndex XZWC M 3 314
+	FrameIndex XZWC N 3 315
+	FrameIndex XZWC O 3 316
+	FrameIndex XZWC P 3 317
+	FrameIndex XZWC Q 3 318
+	FrameIndex XZWC R 3 319
+	FrameIndex XZWC S 3 320
+	FrameIndex XZWC T 3 321
+	FrameIndex XZWC U 3 322
+	FrameIndex XZWC V 3 323
+	FrameIndex XZWC W 3 324
+	// Reload (Part 2)
+	SurfaceSkin 3 3 "ExplodiumGun.png"
+	FrameIndex XZWC X 3 325
+	FrameIndex XZWC Y 3 326
+	FrameIndex XZWC Z 3 327
+	FrameIndex XZWD A 3 328
+	FrameIndex XZWD B 3 329
+	FrameIndex XZWD C 3 330
+	FrameIndex XZWD D 3 331
+	FrameIndex XZWD E 3 332
+	FrameIndex XZWD F 3 333
+	FrameIndex XZWD G 3 334
+	FrameIndex XZWD H 3 335
+	FrameIndex XZWD I 3 336
+	FrameIndex XZWD J 3 337
+	FrameIndex XZWD K 3 338
+	FrameIndex XZWD L 3 339
+	FrameIndex XZWD M 3 340
+	FrameIndex XZWD N 3 341
+	FrameIndex XZWD O 3 342
+	FrameIndex XZWD P 3 343
+	// Slide
+	FrameIndex XZWD W 3 65
+	FrameIndex XZWD X 3 66
+	FrameIndex XZWD Y 3 67
+	FrameIndex XZWD Z 3 68
+	FrameIndex XZWE A 3 69
+	FrameIndex XZWE B 3 70
+	FrameIndex XZWE C 3 71
+	FrameIndex XZWE D 3 72
+	FrameIndex XZWE E 3 73
+	FrameIndex XZWE F 3 74
+	FrameIndex XZWE G 3 75
+	FrameIndex XZWE H 3 76
+	FrameIndex XZWE I 3 77
+	FrameIndex XZWE J 3 78
+	FrameIndex XZWE K 3 79
+	FrameIndex XZWE L 3 80
+	FrameIndex XZWE M 3 81
+	// Melee
+	FrameIndex XZWG T 3 177
+	FrameIndex XZWG U 3 178
+	FrameIndex XZWG V 3 179
+	FrameIndex XZWG W 3 180
+	FrameIndex XZWG X 3 181
+	FrameIndex XZWG Y 3 182
+	FrameIndex XZWG Z 3 183
+	FrameIndex XZWH A 3 184
+	FrameIndex XZWH B 3 185
+	FrameIndex XZWH C 3 186
+	FrameIndex XZWH D 3 187
+	FrameIndex XZWH E 3 188
+	FrameIndex XZWH F 3 189
+	// Spin Gun
+	FrameIndex XZWH A 3 213
+	FrameIndex XZWH B 3 214
+	FrameIndex XZWH C 3 215
+	FrameIndex XZWH D 3 216
+	FrameIndex XZWH E 3 217
+	FrameIndex XZWH F 3 218
+	FrameIndex XZWH G 3 219
+	FrameIndex XZWH H 3 220
+	FrameIndex XZWH I 3 221
+	FrameIndex XZWH J 3 222
+	FrameIndex XZWH K 3 223
+	FrameIndex XZWH L 3 224
+	FrameIndex XZWH M 3 225
+	FrameIndex XZWH N 3 226
+	FrameIndex XZWH O 3 227
+	FrameIndex XZWH P 3 228
+	FrameIndex XZWH Q 3 229
+	FrameIndex XZWH R 3 230
+	FrameIndex XZWH S 3 231
+	FrameIndex XZWH T 3 232
+	FrameIndex XZWH U 3 233
+	FrameIndex XZWH V 3 234
+	FrameIndex XZWH W 3 235
+	/// LAST ROUND
+	// Fire
+	FrameIndex XZWK Q 3 237
+	FrameIndex XZWK R 3 238
+	FrameIndex XZWK S 3 239
+	FrameIndex XZWK T 3 240
+	FrameIndex XZWK U 3 241
+	FrameIndex XZWK V 3 242
+	FrameIndex XZWK W 3 243
+	FrameIndex XZWK X 3 244
+	FrameIndex XZWK Y 3 245
+	// Still
+	FrameIndex XZWK Z 3 248
+	// Reload (Part 1)
+	SurfaceSkin 3 3 "ExplodiumGun_EmptyMag.png"
+	FrameIndex XZWL A 3 346
+	FrameIndex XZWL B 3 347
+	FrameIndex XZWL C 3 348
+	FrameIndex XZWL D 3 349
+	FrameIndex XZWL E 3 350
+	FrameIndex XZWL F 3 351
+	FrameIndex XZWL G 3 352
+	FrameIndex XZWL H 3 353
+	FrameIndex XZWL I 3 354
+	FrameIndex XZWL J 3 355
+	FrameIndex XZWL K 3 356
+	FrameIndex XZWL L 3 357
+	FrameIndex XZWL M 3 358
+	FrameIndex XZWL N 3 359
+	FrameIndex XZWL O 3 360
+	// Reload (Part 2)
+	SurfaceSkin 3 3 "ExplodiumGun.png"
+	FrameIndex XZWL P 3 361
+	FrameIndex XZWL Q 3 362
+	FrameIndex XZWL R 3 363
+	FrameIndex XZWL S 3 364
+	FrameIndex XZWL T 3 365
+	FrameIndex XZWL U 3 366
+	FrameIndex XZWL V 3 367
+	FrameIndex XZWL W 3 368
+	FrameIndex XZWL X 3 369
+	FrameIndex XZWL Y 3 370
+	FrameIndex XZWL Z 3 371
+	FrameIndex XZWM A 3 372
+	FrameIndex XZWM B 3 373
+	FrameIndex XZWM C 3 374
+	FrameIndex XZWM D 3 375
+	FrameIndex XZWM E 3 376
+	FrameIndex XZWM F 3 377
+	FrameIndex XZWM G 3 378
+	FrameIndex XZWM H 3 379
+	// Lower
+	FrameIndex XZWN F 3 297
+	FrameIndex XZWN G 3 298
+	FrameIndex XZWN H 3 299
+	FrameIndex XZWN I 3 300
+	FrameIndex XZWN J 3 301 // Raise
+	FrameIndex XZWN K 3 302
+	FrameIndex XZWN L 3 303
+	FrameIndex XZWN M 3 304
+	FrameIndex XZWN N 3 305
+	FrameIndex XZWN O 3 306
+	FrameIndex XZWN P 3 307
+}
+
 Model "DualExplodiumGun"
 {
 	Path "models"
 
 	Model 1 "ExplodiumGun1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "ExplodiumGun.png"
@@ -210,190 +467,7 @@ Model "DualExplodiumGun"
 	FrameIndex XZW9 U 1 233
 	FrameIndex XZW9 V 1 234
 	FrameIndex XZW9 W 1 235
-	//// LEFT
-	Model 1 "ExplodiumGun1stL_d.3d"
-	Offset -3 0 -2
-	// Still
-	FrameIndex XZWB A 1 0
-	// Deselect
-	FrameIndex XZWA P 1 1
-	FrameIndex XZWA Q 1 2
-	FrameIndex XZWA R 1 3
-	FrameIndex XZWA S 1 4
-	// Select
-	FrameIndex XZWB B 1 5
-	FrameIndex XZWB C 1 6
-	FrameIndex XZWB D 1 7
-	FrameIndex XZWB E 1 8
-	FrameIndex XZWB F 1 9
-	FrameIndex XZWB G 1 10
-	FrameIndex XZWB H 1 11
-	// Fire
-	FrameIndex XZWB I 1 13
-	FrameIndex XZWB J 1 14
-	FrameIndex XZWB K 1 15
-	FrameIndex XZWB L 1 16
-	FrameIndex XZWB M 1 17
-	FrameIndex XZWB N 1 18
-	FrameIndex XZWB O 1 19
-	FrameIndex XZWB P 1 20
-	FrameIndex XZWB Q 1 21
-	// unused
-	FrameIndex XZWB R 1 22
-	FrameIndex XZWB S 1 23
-	// Reload (Part 1)
-	FrameIndex XZWB T 1 310
-	FrameIndex XZWB U 1 311
-	FrameIndex XZWB V 1 312
-	FrameIndex XZWB W 1 313
-	FrameIndex XZWB X 1 314
-	FrameIndex XZWB Y 1 315
-	FrameIndex XZWB Z 1 316
-	FrameIndex XZWC A 1 317
-	FrameIndex XZWC B 1 318
-	FrameIndex XZWC C 1 319
-	FrameIndex XZWC D 1 320
-	FrameIndex XZWC E 1 321
-	FrameIndex XZWC F 1 322
-	FrameIndex XZWC G 1 323
-	FrameIndex XZWC H 1 324
-	// Reload (Part 1 w/ Empty Mag)
-	SurfaceSkin 1 3 "ExplodiumGun_EmptyMag.png"
-	FrameIndex XZWC I 1 310
-	FrameIndex XZWC J 1 311
-	FrameIndex XZWC K 1 312
-	FrameIndex XZWC L 1 313
-	FrameIndex XZWC M 1 314
-	FrameIndex XZWC N 1 315
-	FrameIndex XZWC O 1 316
-	FrameIndex XZWC P 1 317
-	FrameIndex XZWC Q 1 318
-	FrameIndex XZWC R 1 319
-	FrameIndex XZWC S 1 320
-	FrameIndex XZWC T 1 321
-	FrameIndex XZWC U 1 322
-	FrameIndex XZWC V 1 323
-	FrameIndex XZWC W 1 324
-	// Reload (Part 2)
-	SurfaceSkin 1 3 "ExplodiumGun.png"
-	FrameIndex XZWC X 1 325
-	FrameIndex XZWC Y 1 326
-	FrameIndex XZWC Z 1 327
-	FrameIndex XZWD A 1 328
-	FrameIndex XZWD B 1 329
-	FrameIndex XZWD C 1 330
-	FrameIndex XZWD D 1 331
-	FrameIndex XZWD E 1 332
-	FrameIndex XZWD F 1 333
-	FrameIndex XZWD G 1 334
-	FrameIndex XZWD H 1 335
-	FrameIndex XZWD I 1 336
-	FrameIndex XZWD J 1 337
-	FrameIndex XZWD K 1 338
-	FrameIndex XZWD L 1 339
-	FrameIndex XZWD M 1 340
-	FrameIndex XZWD N 1 341
-	FrameIndex XZWD O 1 342
-	FrameIndex XZWD P 1 343
-	// Slide
-	FrameIndex XZWD W 1 65
-	FrameIndex XZWD X 1 66
-	FrameIndex XZWD Y 1 67
-	FrameIndex XZWD Z 1 68
-	FrameIndex XZWE A 1 69
-	FrameIndex XZWE B 1 70
-	FrameIndex XZWE C 1 71
-	FrameIndex XZWE D 1 72
-	FrameIndex XZWE E 1 73
-	FrameIndex XZWE F 1 74
-	FrameIndex XZWE G 1 75
-	FrameIndex XZWE H 1 76
-	FrameIndex XZWE I 1 77
-	FrameIndex XZWE J 1 78
-	FrameIndex XZWE K 1 79
-	FrameIndex XZWE L 1 80
-	FrameIndex XZWE M 1 81
-	// Melee
-	FrameIndex XZWG T 1 177
-	FrameIndex XZWG U 1 178
-	FrameIndex XZWG V 1 179
-	FrameIndex XZWG W 1 180
-	FrameIndex XZWG X 1 181
-	FrameIndex XZWG Y 1 182
-	FrameIndex XZWG Z 1 183
-	FrameIndex XZWH A 1 184
-	FrameIndex XZWH B 1 185
-	FrameIndex XZWH C 1 186
-	FrameIndex XZWH D 1 187
-	FrameIndex XZWH E 1 188
-	FrameIndex XZWH F 1 189
-	// Spin Gun
-	FrameIndex XZWH A 1 213
-	FrameIndex XZWH B 1 214
-	FrameIndex XZWH C 1 215
-	FrameIndex XZWH D 1 216
-	FrameIndex XZWH E 1 217
-	FrameIndex XZWH F 1 218
-	FrameIndex XZWH G 1 219
-	FrameIndex XZWH H 1 220
-	FrameIndex XZWH I 1 221
-	FrameIndex XZWH J 1 222
-	FrameIndex XZWH K 1 223
-	FrameIndex XZWH L 1 224
-	FrameIndex XZWH M 1 225
-	FrameIndex XZWH N 1 226
-	FrameIndex XZWH O 1 227
-	FrameIndex XZWH P 1 228
-	FrameIndex XZWH Q 1 229
-	FrameIndex XZWH R 1 230
-	FrameIndex XZWH S 1 231
-	FrameIndex XZWH T 1 232
-	FrameIndex XZWH U 1 233
-	FrameIndex XZWH V 1 234
-	FrameIndex XZWH W 1 235
-	// Casings
-	SurfaceSkin 1 0 ""
-	SurfaceSkin 1 1 ""
-	SurfaceSkin 1 2 ""
-	SurfaceSkin 1 3 ""
-	SurfaceSkin 1 4 "ExplodiumCasing_Used.png"
-	SurfaceSkin 1 5 ""
-	// RIGHT
-	Model 1 "ExplodiumGun1st_d.3d"
-	Offset 3 0 -2
-	FrameIndex XZWA A 1 14
-	FrameIndex XZWA B 1 15
-	FrameIndex XZWA C 1 16
-	FrameIndex XZWA D 1 17
-	FrameIndex XZWA E 1 18
-	FrameIndex XZWA F 1 19
-	FrameIndex XZWA G 1 20
-	FrameIndex XZWA H 1 21
-	FrameIndex XZWA I 1 22
-	FrameIndex XZWA J 1 23
-	// LEFT
-	Model 1 "ExplodiumGun1stL_d.3d"
-	Offset -3 0 -2
-	FrameIndex XZWI A 1 14
-	FrameIndex XZWI B 1 15
-	FrameIndex XZWI C 1 16
-	FrameIndex XZWI D 1 17
-	FrameIndex XZWI E 1 18
-	FrameIndex XZWI F 1 19
-	FrameIndex XZWI G 1 20
-	FrameIndex XZWI H 1 21
-	FrameIndex XZWI I 1 22
-	FrameIndex XZWI J 1 23
 	/// LAST ROUND
-	SurfaceSkin 1 0 "DemoTags.png"
-	SurfaceSkin 1 1 "DemoArms.png"
-	SurfaceSkin 1 2 "DemoSoft.png"
-	SurfaceSkin 1 3 "ExplodiumGun.png"
-	SurfaceSkin 1 4 ""
-	SurfaceSkin 1 5 "ExplodiumGun.png"
-	// RIGHT
-	Model 1 "ExplodiumGun1st_d.3d"
-	Offset 3 0 -2
 	// Fire
 	FrameIndex XZWI K 1 237
 	FrameIndex XZWI L 1 238
@@ -456,71 +530,6 @@ Model "DualExplodiumGun"
 	FrameIndex XZWN C 1 305
 	FrameIndex XZWN D 1 306
 	FrameIndex XZWN E 1 307
-	// LEFT
-	Model 1 "ExplodiumGun1stL_d.3d"
-	Offset -3 0 -2
-	// Fire
-	FrameIndex XZWK Q 1 237
-	FrameIndex XZWK R 1 238
-	FrameIndex XZWK S 1 239
-	FrameIndex XZWK T 1 240
-	FrameIndex XZWK U 1 241
-	FrameIndex XZWK V 1 242
-	FrameIndex XZWK W 1 243
-	FrameIndex XZWK X 1 244
-	FrameIndex XZWK Y 1 245
-	// Still
-	FrameIndex XZWK Z 1 248
-	// Reload (Part 1)
-	SurfaceSkin 1 3 "ExplodiumGun_EmptyMag.png"
-	FrameIndex XZWL A 1 346
-	FrameIndex XZWL B 1 347
-	FrameIndex XZWL C 1 348
-	FrameIndex XZWL D 1 349
-	FrameIndex XZWL E 1 350
-	FrameIndex XZWL F 1 351
-	FrameIndex XZWL G 1 352
-	FrameIndex XZWL H 1 353
-	FrameIndex XZWL I 1 354
-	FrameIndex XZWL J 1 355
-	FrameIndex XZWL K 1 356
-	FrameIndex XZWL L 1 357
-	FrameIndex XZWL M 1 358
-	FrameIndex XZWL N 1 359
-	FrameIndex XZWL O 1 360
-	// Reload (Part 2)
-	SurfaceSkin 1 3 "ExplodiumGun.png"
-	FrameIndex XZWL P 1 361
-	FrameIndex XZWL Q 1 362
-	FrameIndex XZWL R 1 363
-	FrameIndex XZWL S 1 364
-	FrameIndex XZWL T 1 365
-	FrameIndex XZWL U 1 366
-	FrameIndex XZWL V 1 367
-	FrameIndex XZWL W 1 368
-	FrameIndex XZWL X 1 369
-	FrameIndex XZWL Y 1 370
-	FrameIndex XZWL Z 1 371
-	FrameIndex XZWM A 1 372
-	FrameIndex XZWM B 1 373
-	FrameIndex XZWM C 1 374
-	FrameIndex XZWM D 1 375
-	FrameIndex XZWM E 1 376
-	FrameIndex XZWM F 1 377
-	FrameIndex XZWM G 1 378
-	FrameIndex XZWM H 1 379
-	// Lower
-	FrameIndex XZWN F 1 297
-	FrameIndex XZWN G 1 298
-	FrameIndex XZWN H 1 299
-	FrameIndex XZWN I 1 300
-	FrameIndex XZWN J 1 301 // Raise
-	FrameIndex XZWN K 1 302
-	FrameIndex XZWN L 1 303
-	FrameIndex XZWN M 1 304
-	FrameIndex XZWN N 1 305
-	FrameIndex XZWN O 1 306
-	FrameIndex XZWN P 1 307
 }
 
 Model "SWWMDualWeaponGiver"
diff --git a/modeldef.funstuff b/modeldef.funstuff
index 2170d109c..462c9e429 100644
--- a/modeldef.funstuff
+++ b/modeldef.funstuff
@@ -18,7 +18,6 @@ Model "SWWMFlag"
 	Scale 0.5 0.5 0.5
 	DONTCULLBACKFACES
 
-	// Default
 	FrameIndex XZW1 A 0 0
 	FrameIndex XZW1 B 0 1
 	FrameIndex XZW1 C 0 2
@@ -79,192 +78,6 @@ Model "SWWMFlag"
 	FrameIndex XZW3 F 0 57
 	FrameIndex XZW3 G 0 58
 	FrameIndex XZW3 H 0 59
-	// Pride
-	Skin 0 "SWWMFlag_Pride.png"
-	FrameIndex XZW3 I 0 0
-	FrameIndex XZW3 J 0 1
-	FrameIndex XZW3 K 0 2
-	FrameIndex XZW3 L 0 3
-	FrameIndex XZW3 M 0 4
-	FrameIndex XZW3 N 0 5
-	FrameIndex XZW3 O 0 6
-	FrameIndex XZW3 P 0 7
-	FrameIndex XZW3 Q 0 8
-	FrameIndex XZW3 R 0 9
-	FrameIndex XZW3 S 0 10
-	FrameIndex XZW3 T 0 11
-	FrameIndex XZW3 U 0 12
-	FrameIndex XZW3 V 0 13
-	FrameIndex XZW3 W 0 14
-	FrameIndex XZW3 X 0 15
-	FrameIndex XZW3 Y 0 16
-	FrameIndex XZW3 Z 0 17
-	FrameIndex XZW4 A 0 18
-	FrameIndex XZW4 B 0 19
-	FrameIndex XZW4 C 0 20
-	FrameIndex XZW4 D 0 21
-	FrameIndex XZW4 E 0 22
-	FrameIndex XZW4 F 0 23
-	FrameIndex XZW4 G 0 24
-	FrameIndex XZW4 H 0 25
-	FrameIndex XZW4 I 0 26
-	FrameIndex XZW4 J 0 27
-	FrameIndex XZW4 K 0 28
-	FrameIndex XZW4 L 0 29
-	FrameIndex XZW4 M 0 30
-	FrameIndex XZW4 N 0 31
-	FrameIndex XZW4 O 0 32
-	FrameIndex XZW4 P 0 33
-	FrameIndex XZW4 Q 0 34
-	FrameIndex XZW4 R 0 35
-	FrameIndex XZW4 S 0 36
-	FrameIndex XZW4 T 0 37
-	FrameIndex XZW4 U 0 38
-	FrameIndex XZW4 V 0 39
-	FrameIndex XZW4 W 0 40
-	FrameIndex XZW4 X 0 41
-	FrameIndex XZW4 Y 0 42
-	FrameIndex XZW4 Z 0 43
-	FrameIndex XZW5 A 0 44
-	FrameIndex XZW5 B 0 45
-	FrameIndex XZW5 C 0 46
-	FrameIndex XZW5 D 0 47
-	FrameIndex XZW5 E 0 48
-	FrameIndex XZW5 F 0 49
-	FrameIndex XZW5 G 0 50
-	FrameIndex XZW5 H 0 51
-	FrameIndex XZW5 I 0 52
-	FrameIndex XZW5 J 0 53
-	FrameIndex XZW5 K 0 54
-	FrameIndex XZW5 L 0 55
-	FrameIndex XZW5 M 0 56
-	FrameIndex XZW5 N 0 57
-	FrameIndex XZW5 O 0 58
-	FrameIndex XZW5 P 0 59
-	// Trans
-	Skin 0 "SWWMFlag_Trans.png"
-	FrameIndex XZW5 Q 0 0
-	FrameIndex XZW5 R 0 1
-	FrameIndex XZW5 S 0 2
-	FrameIndex XZW5 T 0 3
-	FrameIndex XZW5 U 0 4
-	FrameIndex XZW5 V 0 5
-	FrameIndex XZW5 W 0 6
-	FrameIndex XZW5 X 0 7
-	FrameIndex XZW5 Y 0 8
-	FrameIndex XZW5 Z 0 9
-	FrameIndex XZW6 A 0 10
-	FrameIndex XZW6 B 0 11
-	FrameIndex XZW6 C 0 12
-	FrameIndex XZW6 D 0 13
-	FrameIndex XZW6 E 0 14
-	FrameIndex XZW6 F 0 15
-	FrameIndex XZW6 G 0 16
-	FrameIndex XZW6 H 0 17
-	FrameIndex XZW6 I 0 18
-	FrameIndex XZW6 J 0 19
-	FrameIndex XZW6 K 0 20
-	FrameIndex XZW6 L 0 21
-	FrameIndex XZW6 M 0 22
-	FrameIndex XZW6 N 0 23
-	FrameIndex XZW6 O 0 24
-	FrameIndex XZW6 P 0 25
-	FrameIndex XZW6 Q 0 26
-	FrameIndex XZW6 R 0 27
-	FrameIndex XZW6 S 0 28
-	FrameIndex XZW6 T 0 29
-	FrameIndex XZW6 U 0 30
-	FrameIndex XZW6 V 0 31
-	FrameIndex XZW6 W 0 32
-	FrameIndex XZW6 X 0 33
-	FrameIndex XZW6 Y 0 34
-	FrameIndex XZW6 Z 0 35
-	FrameIndex XZW7 A 0 36
-	FrameIndex XZW7 B 0 37
-	FrameIndex XZW7 C 0 38
-	FrameIndex XZW7 D 0 39
-	FrameIndex XZW7 E 0 40
-	FrameIndex XZW7 F 0 41
-	FrameIndex XZW7 G 0 42
-	FrameIndex XZW7 H 0 43
-	FrameIndex XZW7 I 0 44
-	FrameIndex XZW7 J 0 45
-	FrameIndex XZW7 K 0 46
-	FrameIndex XZW7 L 0 47
-	FrameIndex XZW7 M 0 48
-	FrameIndex XZW7 N 0 49
-	FrameIndex XZW7 O 0 50
-	FrameIndex XZW7 P 0 51
-	FrameIndex XZW7 Q 0 52
-	FrameIndex XZW7 R 0 53
-	FrameIndex XZW7 S 0 54
-	FrameIndex XZW7 T 0 55
-	FrameIndex XZW7 U 0 56
-	FrameIndex XZW7 V 0 57
-	FrameIndex XZW7 W 0 58
-	FrameIndex XZW7 X 0 59
-	// Enby
-	Skin 0 "SWWMFlag_Enby.png"
-	FrameIndex XZW7 Y 0 0
-	FrameIndex XZW7 Z 0 1
-	FrameIndex XZW8 A 0 2
-	FrameIndex XZW8 B 0 3
-	FrameIndex XZW8 C 0 4
-	FrameIndex XZW8 D 0 5
-	FrameIndex XZW8 E 0 6
-	FrameIndex XZW8 F 0 7
-	FrameIndex XZW8 G 0 8
-	FrameIndex XZW8 H 0 9
-	FrameIndex XZW8 I 0 10
-	FrameIndex XZW8 J 0 11
-	FrameIndex XZW8 K 0 12
-	FrameIndex XZW8 L 0 13
-	FrameIndex XZW8 M 0 14
-	FrameIndex XZW8 N 0 15
-	FrameIndex XZW8 O 0 16
-	FrameIndex XZW8 P 0 17
-	FrameIndex XZW8 Q 0 18
-	FrameIndex XZW8 R 0 19
-	FrameIndex XZW8 S 0 20
-	FrameIndex XZW8 T 0 21
-	FrameIndex XZW8 U 0 22
-	FrameIndex XZW8 V 0 23
-	FrameIndex XZW8 W 0 24
-	FrameIndex XZW8 X 0 25
-	FrameIndex XZW8 Y 0 26
-	FrameIndex XZW8 Z 0 27
-	FrameIndex XZW9 A 0 28
-	FrameIndex XZW9 B 0 29
-	FrameIndex XZW9 C 0 30
-	FrameIndex XZW9 D 0 31
-	FrameIndex XZW9 E 0 32
-	FrameIndex XZW9 F 0 33
-	FrameIndex XZW9 G 0 34
-	FrameIndex XZW9 H 0 35
-	FrameIndex XZW9 I 0 36
-	FrameIndex XZW9 J 0 37
-	FrameIndex XZW9 K 0 38
-	FrameIndex XZW9 L 0 39
-	FrameIndex XZW9 M 0 40
-	FrameIndex XZW9 N 0 41
-	FrameIndex XZW9 O 0 42
-	FrameIndex XZW9 P 0 43
-	FrameIndex XZW9 Q 0 44
-	FrameIndex XZW9 R 0 45
-	FrameIndex XZW9 S 0 46
-	FrameIndex XZW9 T 0 47
-	FrameIndex XZW9 U 0 48
-	FrameIndex XZW9 V 0 49
-	FrameIndex XZW9 W 0 50
-	FrameIndex XZW9 X 0 51
-	FrameIndex XZW9 Y 0 52
-	FrameIndex XZW9 Z 0 53
-	FrameIndex XZWA A 0 54
-	FrameIndex XZWA B 0 55
-	FrameIndex XZWA C 0 56
-	FrameIndex XZWA D 0 57
-	FrameIndex XZWA E 0 58
-	FrameIndex XZWA F 0 59
 }
 Model "Chancebox"
 {
diff --git a/modeldef.gesture b/modeldef.gesture
index 6a9d8269a..6cfcc4a78 100644
--- a/modeldef.gesture
+++ b/modeldef.gesture
@@ -2,7 +2,7 @@ Model "SWWMGesture"
 {
 	Path "models"
 	Model 0 "GestureArms_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	AngleOffset -90
@@ -113,7 +113,7 @@ Model "SWWMGesture"
 {
 	Path "models"
 	Model 0 "Grenade1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "ExplodiumGun.png"
@@ -165,7 +165,7 @@ Model "SWWMGesture"
 {
 	Path "models"
 	Model 0 "QuickPunch1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 
diff --git a/modeldef.hellblazer b/modeldef.hellblazer
index a3e2535fb..757f55c65 100644
--- a/modeldef.hellblazer
+++ b/modeldef.hellblazer
@@ -390,7 +390,7 @@ Model "Hellblazer"
 	Path "models"
 
 	Model 1 "Hellblazer1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "Hellblazer.png"
diff --git a/modeldef.itemgesture b/modeldef.itemgesture
index bb00fc12d..35a08b340 100644
--- a/modeldef.itemgesture
+++ b/modeldef.itemgesture
@@ -2,7 +2,7 @@ Model "GenericCubeGesture"
 {
 	Path "models"
 	Model 0 "GenericCube1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "PerfectlyGeneric.png"
@@ -37,7 +37,7 @@ Model "AkariProjectGesture"
 {
 	Path "models"
 	Model 0 "AkariProject1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "AkariProject.png"
@@ -72,7 +72,7 @@ Model "LoveSignalsCDGesture"
 {
 	Path "models"
 	Model 0 "LoveSignalsCD1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "LoveSignals.png"
@@ -107,7 +107,7 @@ Model "NutatcoBarGesture"
 {
 	Path "models"
 	Model 0 "NutatcoBar1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "Nutatco.png"
@@ -142,7 +142,7 @@ Model "FrispyCornGesture"
 {
 	Path "models"
 	Model 0 "FrispyCorn1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "FrispyCorn.png"
@@ -177,7 +177,7 @@ Model "SayaBeanGesture"
 {
 	Path "models"
 	Model 0 "SayaBean1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "SayaBean.png"
@@ -216,7 +216,7 @@ Model "MothPlushyGesture"
 {
 	Path "models"
 	Model 0 "MothPlush1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "MothPlush.png"
@@ -261,7 +261,7 @@ Model "DemoPlushGesture"
 {
 	Path "models"
 	Model 0 "DemoPlush1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "DemoPlush.png"
@@ -301,7 +301,7 @@ Model "KirinCummiesGesture"
 {
 	Path "models"
 	Model 0 "TootFroot1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "TootFroot.png"
@@ -337,7 +337,7 @@ Model "MilkBreadsGesture"
 {
 	Path "models"
 	Model 0 "MilkBreads1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "MilkBreads.png"
@@ -372,7 +372,7 @@ Model "KirinMangaGesture"
 {
 	Path "models"
 	Model 0 "AkariProject1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "KirinManga.png"
@@ -407,7 +407,7 @@ Model "KirinPlushGesture"
 {
 	Path "models"
 	Model 0 "KirinPlush1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "KirinPlush.png"
diff --git a/modeldef.keygesture b/modeldef.keygesture
index 2580bf8e9..6db17949b 100644
--- a/modeldef.keygesture
+++ b/modeldef.keygesture
@@ -2,7 +2,7 @@ Model "SWWMRedCardGesture"
 {
 	Path "models"
 	Model 0 "DoomCard1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "DoomRedKey.png"
@@ -97,7 +97,7 @@ Model "SWWMRedCardGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -124,7 +124,7 @@ Model "SWWMYellowCardGesture"
 {
 	Path "models"
 	Model 0 "DoomCard1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "DoomYellowKey.png"
@@ -219,7 +219,7 @@ Model "SWWMYellowCardGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -246,7 +246,7 @@ Model "SWWMBlueCardGesture"
 {
 	Path "models"
 	Model 0 "DoomCard1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "DoomBlueKey.png"
@@ -341,7 +341,7 @@ Model "SWWMBlueCardGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -368,7 +368,7 @@ Model "SWWMSilverCardGesture"
 {
 	Path "models"
 	Model 0 "DoomCard1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "DoomSilverKey.png"
@@ -463,7 +463,7 @@ Model "SWWMSilverCardGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -490,7 +490,7 @@ Model "SWWMGreenCardGesture"
 {
 	Path "models"
 	Model 0 "DoomCard1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "DoomGreenKey.png"
@@ -585,7 +585,7 @@ Model "SWWMGreenCardGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -612,7 +612,7 @@ Model "SWWMOrangeCardGesture"
 {
 	Path "models"
 	Model 0 "DoomCard1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "DoomOrangeKey.png"
@@ -707,7 +707,7 @@ Model "SWWMOrangeCardGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -734,7 +734,7 @@ Model "SWWMRedSkullGesture"
 {
 	Path "models"
 	Model 0 "DoomSkull1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "DoomRedSkull.png"
@@ -828,7 +828,7 @@ Model "SWWMRedSkullGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -855,7 +855,7 @@ Model "SWWMYellowSkullGesture"
 {
 	Path "models"
 	Model 0 "DoomSkull1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "DoomYellowSkull.png"
@@ -949,7 +949,7 @@ Model "SWWMYellowSkullGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -976,7 +976,7 @@ Model "SWWMBlueSkullGesture"
 {
 	Path "models"
 	Model 0 "DoomSkull1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "DoomBlueSkull.png"
@@ -1070,7 +1070,7 @@ Model "SWWMBlueSkullGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -1097,7 +1097,7 @@ Model "SWWMPurpleSkullGesture"
 {
 	Path "models"
 	Model 0 "DoomSkull1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "DoomPurpleSkull.png"
@@ -1191,7 +1191,7 @@ Model "SWWMPurpleSkullGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -1218,7 +1218,7 @@ Model "SWWMGreenKeyGesture"
 {
 	Path "models"
 	Model 0 "HereticGreen1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "envmap/greenenv.png"
@@ -1312,7 +1312,7 @@ Model "SWWMGreenKeyGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -1339,7 +1339,7 @@ Model "SWWMBlueKeyGesture"
 {
 	Path "models"
 	Model 0 "HereticBlue1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "envmap/bluenv.png"
@@ -1433,7 +1433,7 @@ Model "SWWMBlueKeyGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -1460,7 +1460,7 @@ Model "SWWMYellowKeyGesture"
 {
 	Path "models"
 	Model 0 "HereticYellow1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "envmap/goldenv.png"
@@ -1554,7 +1554,7 @@ Model "SWWMYellowKeyGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -1581,7 +1581,7 @@ Model "SWWMRedKeyGesture"
 {
 	Path "models"
 	Model 0 "HereticRed1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 0 "DemoTags1st.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "envmap/redenv.png"
@@ -1675,7 +1675,7 @@ Model "SWWMRedKeyGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
diff --git a/modeldef.sheenhmg b/modeldef.sheenhmg
index 39b205ba8..9bfa1c3fc 100644
--- a/modeldef.sheenhmg
+++ b/modeldef.sheenhmg
@@ -136,7 +136,7 @@ Model "HeavyMahSheenGun"
 	Path "models"
 
 	Model 1 "SheenHMG1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "SheenHMG.png"
diff --git a/modeldef.silverbullet b/modeldef.silverbullet
index f715477d0..3dcd8b9d7 100644
--- a/modeldef.silverbullet
+++ b/modeldef.silverbullet
@@ -181,7 +181,7 @@ Model "SilverBullet"
 	Path "models"
 
 	Model 1 "Silverbullet1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "Silverbullet.png"
diff --git a/modeldef.sparkster b/modeldef.sparkster
index 07afb60e2..62428a302 100644
--- a/modeldef.sparkster
+++ b/modeldef.sparkster
@@ -259,7 +259,7 @@ Model "Sparkster"
 	Path "models"
 
 	Model 1 "Sparkster1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "Sparkster.png"
diff --git a/modeldef.spreadgun b/modeldef.spreadgun
index 3a02eed7e..00c2a1bc3 100644
--- a/modeldef.spreadgun
+++ b/modeldef.spreadgun
@@ -220,7 +220,7 @@ Model "Spreadgun"
 	Path "models"
 
 	Model 1 "Spreadgun1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "Spreadgun.png"
diff --git a/modeldef.wallbuster b/modeldef.wallbuster
index 933805365..1435a26ad 100644
--- a/modeldef.wallbuster
+++ b/modeldef.wallbuster
@@ -474,7 +474,7 @@ Model "Wallbuster"
 	Path "models"
 
 	Model 1 "Wallbuster1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "Wallbuster.png"
diff --git a/modeldef.ynykron b/modeldef.ynykron
index 3e7665704..a06621412 100644
--- a/modeldef.ynykron
+++ b/modeldef.ynykron
@@ -371,7 +371,7 @@ Model "Ynykron"
 	Path "models"
 
 	Model 1 "Ynykron1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags.png"
+	SurfaceSkin 1 0 "DemoTags1st.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "Ynykron.png"
diff --git a/models/DemoTags1st.png b/models/DemoTags1st.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd223d3b3d2d166118fe5c617a11c0872c661d9a
GIT binary patch
literal 7881
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

literal 0
HcmV?d00001

diff --git a/shaders/glsl/DemoTags1st.fp b/shaders/glsl/DemoTags1st.fp
new file mode 100644
index 000000000..28e0020b9
--- /dev/null
+++ b/shaders/glsl/DemoTags1st.fp
@@ -0,0 +1,7 @@
+void SetupMaterial( inout Material mat )
+{
+	mat.Base = texture(scrtex,vec2(vTexCoord.s,1.-vTexCoord.t));	// canvas textures are upside-down when used by models
+	mat.Normal = ApplyNormalMap(vTexCoord.st);
+	if ( (uTextureMode&TEXF_Brightmap) != 0 )
+		mat.Bright = texture(brighttexture,vTexCoord.st);
+}
diff --git a/zscript/items/swwm_funstuff.zsc b/zscript/items/swwm_funstuff.zsc
index 874add639..ce2b874b6 100644
--- a/zscript/items/swwm_funstuff.zsc
+++ b/zscript/items/swwm_funstuff.zsc
@@ -176,16 +176,16 @@ Class SWWMFlag : Actor
 		switch ( seq )
 		{
 		case 0:
-			SetStateLabel("Spawn");
+			A_ChangeModel("",0,"models","SWWMFlag_d.3d",0,"models","SWWMFlag.png");
 			break;
 		case 1:
-			SetStateLabel("FlagPride");
+			A_ChangeModel("",0,"models","SWWMFlag_d.3d",0,"models","SWWMFlag_Pride.png");
 			break;
 		case 2:
-			SetStateLabel("FlagTrans");
+			A_ChangeModel("",0,"models","SWWMFlag_d.3d",0,"models","SWWMFlag_Trans.png");
 			break;
 		case 3:
-			SetStateLabel("FlagEnby");
+			A_ChangeModel("",0,"models","SWWMFlag_d.3d",0,"models","SWWMFlag_Enby.png");
 			break;
 		}
 		A_StartSound("bestsound",CHAN_BODY,CHANF_OVERLAP);
@@ -277,22 +277,6 @@ Class SWWMFlag : Actor
 		XZW2 ABCDEFGHIJKLMNOPQRSTUVWXYZ 2;
 		XZW3 ABCDEFGH 2;
 		Loop;
-	FlagPride:
-		XZW3 IJKLMNOPQRSTUVWXYZ 2;
-		XZW4 ABCDEFGHIJKLMNOPQRSTUVWXYZ 2;
-		XZW5 ABCDEFGHIJKLMNOP 2;
-		Loop;
-	FlagTrans:
-		XZW5 QRSTUVWXYZ 2;
-		XZW6 ABCDEFGHIJKLMNOPQRSTUVWXYZ 2;
-		XZW7 ABCDEFGHIJKLMNOPQRSTUVWX 2;
-		Loop;
-	FlagEnby:
-		XZW7 YZ 2;
-		XZW8 ABCDEFGHIJKLMNOPQRSTUVWXYZ 2;
-		XZW9 ABCDEFGHIJKLMNOPQRSTUVWXYZ 2;
-		XZWA ABCDEF 2;
-		Loop;
 	}
 }
 
diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc
index 5832dce92..0f017f334 100644
--- a/zscript/swwm_player.zsc
+++ b/zscript/swwm_player.zsc
@@ -116,7 +116,7 @@ Class Demolitionist : PlayerPawn
 	transient bool facedamage, facegrin, facesad, facewink, faceblink;
 
 	transient CVar tagcolor;
-	transient int oldtagcolor;
+	int oldtagcolor;
 
 	Default
 	{
@@ -181,7 +181,7 @@ Class Demolitionist : PlayerPawn
 		int idx = tagcolor.GetInt();
 		if ( (idx < 0) || (idx >= colname.Size()) ) idx = 0;
 		if ( idx != oldtagcolor )
-			A_ChangeModel("",0,"models","DemolitionistPlayer_d.3d",0,"models","DemoTags"..colname[idx]..".png",CMDL_USESURFACESKIN,0);
+			A_ChangeModel("",0,"models","DemolitionistPlayer_d.3d",0,"models","DemoTags"..colname[idx]..".png",CMDL_USESURFACESKIN,-1);
 		oldtagcolor = idx;
 	}
 
@@ -276,7 +276,7 @@ Class Demolitionist : PlayerPawn
 		};
 		int faceidx = GetFaceTex();
 		if ( !oldfaceidx || (faceidx != oldfaceidx) )
-			A_ChangeModel("",0,"models","DemolitionistPlayer_d.3d",1,"models","DemoFace_"..facetex[faceidx]..".png",CMDL_USESURFACESKIN,0);
+			A_ChangeModel("",0,"models","DemolitionistPlayer_d.3d",1,"models","DemoFace_"..facetex[faceidx]..".png",CMDL_USESURFACESKIN,-1);
 		oldfaceidx = faceidx;
 	}
 	private int GetFaceTex()
diff --git a/zscript/swwm_statichandler.zsc b/zscript/swwm_statichandler.zsc
index 917c67fc1..61c840488 100644
--- a/zscript/swwm_statichandler.zsc
+++ b/zscript/swwm_statichandler.zsc
@@ -31,6 +31,9 @@ Class SWWMStaticHandler : StaticEventHandler
 	// stupid dumb thing
 	ui int aprcheck;
 	ui Font aprfnt;
+	// hack stuff
+	Canvas tagcv;
+	TextureID tagtex[13];
 
 	override void NewGame()
 	{
@@ -68,6 +71,34 @@ Class SWWMStaticHandler : StaticEventHandler
 			for ( int i=0; i<stinkers.Size(); i++ ) Console.Printf("%s is not STAT_STATIC!",stinkers[i].GetClassName());
 			ThrowAbortException("Panic! %d static thinker%s been tampered with!",stinkers.Size(),(stinkers.Size()==1)?" has":"s have");
 		}
+		// ugly ugly hack
+		static const String colname[] =
+		{
+			"",
+			"Blue",
+			"Cyan",
+			"Dragonfly",
+			"Gold",
+			"Magenta",
+			"Orange",
+			"Peach",
+			"Pink",
+			"Purple",
+			"Red",
+			"Violet",
+			"White",
+			"Yellow"
+		};
+		for ( int i=0; i<13; i++ )
+		{
+			if ( tagtex[i] ) continue;
+			tagtex[i] = TexMan.CheckForTexture("models/DemoTags"..colname[i]..".png",TexMan.Type_Any);
+		}
+		if ( !tagcv ) tagcv = TexMan.GetCanvas("DEMOT1ST");
+		int idx = 0;
+		let demo = Demolitionist(players[consoleplayer].mo);
+		if ( demo ) idx = demo.oldtagcolor;
+		tagcv.DrawTexture(tagtex[idx],false,0,0);
 	}
 
 	override void WorldLoaded( WorldEvent e )
diff --git a/zscript/weapons/swwm_baseweapon.zsc b/zscript/weapons/swwm_baseweapon.zsc
index 0d3ca10ab..873fa7682 100644
--- a/zscript/weapons/swwm_baseweapon.zsc
+++ b/zscript/weapons/swwm_baseweapon.zsc
@@ -21,6 +21,8 @@ Class SWWMWeapon : Weapon abstract
 	FlagDef NoSwapWeapon : SWeaponFlags, 2;	// weapon is not affected by slot swapping
 	FlagDef HasScrTex : SWeaponFlags, 3;	// weapon model has a scripted texture (calls RenderTexture() from Event Handler)
 
+	int oldtagcolor;
+
 	bool IsSwapWeapon( Inventory i ) const
 	{
 		if ( bNoSwapWeapon || (i.GetClass() == GetClass()) ) return false;