diff --git a/gldefs.txt b/gldefs.txt
index 62efcd3..7802517 100644
--- a/gldefs.txt
+++ b/gldefs.txt
@@ -570,27 +570,27 @@ PulseLight "UTGoldKeyLight"
 	Interval 2.0
 	Offset 0 16 0
 }
-Object "UTRedSkull"
+Object "RedSkull"
 {
-	Frame "USKL" { light "UTRedKeyLight" }
+	Frame "RSKU" { light "UTRedKeyLight" }
 }
-Object "UTBlueSkull"
+Object "BlueSkull"
 {
-	Frame "USKL" { light "UTBlueKeyLight" }
+	Frame "BSKU" { light "UTBlueKeyLight" }
 }
-Object "UTGoldSkull"
+Object "YellowSkull"
 {
-	Frame "USKL" { light "UTGoldKeyLight" }
+	Frame "YSKU" { light "UTGoldKeyLight" }
 }
-Object "UTRedKey"
+Object "RedCard"
 {
-	Frame "UKEY" { light "UTRedKeyLight" }
+	Frame "RKEY" { light "UTRedKeyLight" }
 }
-Object "UTBlueKey"
+Object "BlueCard"
 {
-	Frame "UKEY" { light "UTBlueKeyLight" }
+	Frame "BKEY" { light "UTBlueKeyLight" }
 }
-Object "UTGoldKey"
+Object "YellowCard"
 {
-	Frame "UKEY" { light "UTGoldKeyLight" }
+	Frame "YKEY" { light "UTGoldKeyLight" }
 }
diff --git a/modeldef.flak b/modeldef.flak
index d20c41b..32d20ca 100644
--- a/modeldef.flak
+++ b/modeldef.flak
@@ -43,6 +43,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH1 A 0 0
 }
@@ -55,6 +57,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH1 B 0 0
 }
@@ -67,6 +71,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH1 C 0 0
 }
@@ -79,6 +85,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH1 D 0 0
 }
@@ -91,6 +99,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH1 E 0 0
 }
@@ -103,6 +113,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH1 F 0 0
 }
@@ -115,6 +127,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH1 G 0 0
 }
@@ -127,6 +141,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH1 H 0 0
 }
@@ -139,6 +155,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH1 I 0 0
 }
@@ -151,6 +169,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH1 J 0 0
 }
@@ -163,6 +183,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH1 K 0 0
 }
@@ -175,6 +197,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH1 L 0 0
 }
@@ -188,6 +212,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH2 A 1 0
 }
@@ -200,6 +226,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH2 B 1 0
 }
@@ -212,6 +240,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH2 C 1 0
 }
@@ -224,6 +254,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH2 D 1 0
 }
@@ -236,6 +268,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH2 E 1 0
 }
@@ -248,6 +282,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH2 F 1 0
 }
@@ -260,6 +296,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH2 G 1 0
 }
@@ -272,6 +310,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH2 H 1 0
 }
@@ -284,6 +324,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH2 I 1 0
 }
@@ -296,6 +338,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH2 J 1 0
 }
@@ -308,6 +352,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH2 K 1 0
 }
@@ -320,6 +366,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH2 L 1 0
 }
@@ -333,6 +381,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH3 A 2 0
 }
@@ -345,6 +395,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH3 B 2 0
 }
@@ -357,6 +409,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH3 C 2 0
 }
@@ -369,6 +423,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH3 D 2 0
 }
@@ -381,6 +437,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH3 E 2 0
 }
@@ -393,6 +451,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH3 F 2 0
 }
@@ -405,6 +465,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH3 G 2 0
 }
@@ -417,6 +479,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH3 H 2 0
 }
@@ -429,6 +493,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH3 I 2 0
 }
@@ -441,6 +507,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH3 J 2 0
 }
@@ -453,6 +521,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH3 K 2 0
 }
@@ -465,6 +535,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH3 L 2 0
 }
@@ -478,6 +550,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH4 A 3 0
 }
@@ -490,6 +564,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH4 B 3 0
 }
@@ -502,6 +578,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH4 C 3 0
 }
@@ -514,6 +592,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH4 D 3 0
 }
@@ -526,6 +606,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH4 E 3 0
 }
@@ -538,6 +620,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH4 F 3 0
 }
@@ -550,6 +634,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH4 G 3 0
 }
@@ -562,6 +648,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH4 H 3 0
 }
@@ -574,6 +662,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH4 I 3 0
 }
@@ -586,6 +676,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH4 J 3 0
 }
@@ -598,6 +690,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH4 K 3 0
 }
@@ -610,6 +704,8 @@ Model "FlakChunk"
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
 
 	FrameIndex FCH4 L 3 0
 }
diff --git a/modeldef.misc b/modeldef.misc
index f700a7e..e3d2b29 100644
--- a/modeldef.misc
+++ b/modeldef.misc
@@ -176,7 +176,7 @@ Model "UDamage"
 	FrameIndex UDAM B 1 0
 }
 
-Model "UTRedSkull"
+Model "RedSkull"
 {
 	Path "models"
 	Model 0 "RelicSkull_d.3d"
@@ -186,9 +186,10 @@ Model "UTRedSkull"
 	ZOffset 12
 	ROTATING
 
-	FrameIndex USKL A 0 15
+	FrameIndex RSKU A 0 15
+	FrameIndex RSKU B 0 15
 }
-Model "UTGoldSkull"
+Model "YellowSkull"
 {
 	Path "models"
 	Model 0 "RelicSkull_d.3d"
@@ -198,9 +199,10 @@ Model "UTGoldSkull"
 	ZOffset 12
 	ROTATING
 
-	FrameIndex USKL B 0 15
+	FrameIndex YSKU A 0 15
+	FrameIndex YSKU B 0 15
 }
-Model "UTBlueSkull"
+Model "BlueSkull"
 {
 	Path "models"
 	Model 0 "RelicSkull_d.3d"
@@ -210,9 +212,10 @@ Model "UTBlueSkull"
 	ZOffset 12
 	ROTATING
 
-	FrameIndex USKL C 0 15
+	FrameIndex BSKU A 0 15
+	FrameIndex BSKU B 0 15
 }
-Model "UTRedKey"
+Model "RedCard"
 {
 	Path "models"
 	Model 0 "DomR_d.3d"
@@ -222,9 +225,10 @@ Model "UTRedKey"
 	ZOffset 16
 	ROTATING
 
-	FrameIndex UKEY A 0 0
+	FrameIndex RKEY A 0 0
+	FrameIndex RKEY B 0 0
 }
-Model "UTGoldKey"
+Model "YellowCard"
 {
 	Path "models"
 	Model 0 "MercSymbol_d.3d"
@@ -234,9 +238,10 @@ Model "UTGoldKey"
 	ZOffset 16
 	ROTATING
 
-	FrameIndex UKEY B 0 0
+	FrameIndex YKEY A 0 0
+	FrameIndex YKEY B 0 0
 }
-Model "UTBlueKey"
+Model "BlueCard"
 {
 	Path "models"
 	Model 0 "DomB_d.3d"
@@ -246,7 +251,8 @@ Model "UTBlueKey"
 	ZOffset 16
 	ROTATING
 
-	FrameIndex UKEY C 0 0
+	FrameIndex BKEY A 0 0
+	FrameIndex BKEY B 0 0
 }
 
 Model "UTBackpack"
@@ -321,3 +327,21 @@ Model "Searchlight"
 
 	FrameIndex SLIT A 0 0
 }
+
+Model "UTChip"
+{
+	Path "models"
+	Model 0 "ChipM_d.3d"
+	Skin 0 "Chip1.png"
+	Scale -0.134 0.12 0.12
+	USEACTORPITCH
+	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 0.5
+	ZOffset 2
+
+	FrameIndex CHIP A 0 0
+	FrameIndex CHIP B 0 1
+	FrameIndex CHIP C 0 2
+	FrameIndex CHIP D 0 3
+}
\ No newline at end of file
diff --git a/models/Chip1.png b/models/Chip1.png
new file mode 100644
index 0000000..85b248c
Binary files /dev/null and b/models/Chip1.png differ
diff --git a/models/ChipM_a.3d b/models/ChipM_a.3d
new file mode 100644
index 0000000..6ca72dd
Binary files /dev/null and b/models/ChipM_a.3d differ
diff --git a/models/ChipM_d.3d b/models/ChipM_d.3d
new file mode 100644
index 0000000..da70845
Binary files /dev/null and b/models/ChipM_d.3d differ
diff --git a/readme.txt b/readme.txt
index fa3582f..24d55ff 100644
--- a/readme.txt
+++ b/readme.txt
@@ -31,10 +31,10 @@ Currently implemented:
  - Enhanced Shock Rifle (slot 4, limited ammo, invulnerability sphere)
  - UT HUD
  - Impact Hammer (slot 1)
+ - Chainsaw (slot 1)
 
 In progress:
 
- - Chainsaw (slot 1)
  - Translocator (slot 1)
  - Enforcer (slot 2)
    - Dual Enforcers (slot 2)
diff --git a/sndinfo.txt b/sndinfo.txt
index 7639193..12337f1 100644
--- a/sndinfo.txt
+++ b/sndinfo.txt
@@ -119,6 +119,8 @@ misc/gibbed3	gib3
 misc/gibbed4	gib4
 misc/gibbed5	gib5
 $random misc/gibbed { misc/gibbed1 misc/gibbed2 misc/gibbed3 misc/gibbed4 misc/gibbed5 }
+// universal gibs compat
+$alias UniversalGibs/Gib misc/gibbed
 
 impact/select	imppick
 impact/pull	impaltst
diff --git a/sprites/ASMKA0.png b/sprites/ASMKA0.png
new file mode 100644
index 0000000..d4cd859
Binary files /dev/null and b/sprites/ASMKA0.png differ
diff --git a/sprites/BUBLA0.png b/sprites/BUBLA0.png
new file mode 100644
index 0000000..4d31f3f
Binary files /dev/null and b/sprites/BUBLA0.png differ
diff --git a/sprites/BUBLB0.png b/sprites/BUBLB0.png
new file mode 100644
index 0000000..dace92c
Binary files /dev/null and b/sprites/BUBLB0.png differ
diff --git a/sprites/BUBLC0.png b/sprites/BUBLC0.png
new file mode 100644
index 0000000..acbf637
Binary files /dev/null and b/sprites/BUBLC0.png differ
diff --git a/sprites/GBLBA0.png b/sprites/GBLBA0.png
new file mode 100644
index 0000000..493f6e3
Binary files /dev/null and b/sprites/GBLBA0.png differ
diff --git a/sprites/GBLBB0.png b/sprites/GBLBB0.png
new file mode 100644
index 0000000..5d48560
Binary files /dev/null and b/sprites/GBLBB0.png differ
diff --git a/sprites/GBLBC0.png b/sprites/GBLBC0.png
new file mode 100644
index 0000000..b65042b
Binary files /dev/null and b/sprites/GBLBC0.png differ
diff --git a/sprites/GBLBD0.png b/sprites/GBLBD0.png
new file mode 100644
index 0000000..a614f12
Binary files /dev/null and b/sprites/GBLBD0.png differ
diff --git a/sprites/GBLBE0.png b/sprites/GBLBE0.png
new file mode 100644
index 0000000..f7f968e
Binary files /dev/null and b/sprites/GBLBE0.png differ
diff --git a/sprites/PSPKA0.png b/sprites/PSPKA0.png
new file mode 100644
index 0000000..96135ae
Binary files /dev/null and b/sprites/PSPKA0.png differ
diff --git a/sprites/RTRLA0.png b/sprites/RTRLA0.png
new file mode 100644
index 0000000..922d183
Binary files /dev/null and b/sprites/RTRLA0.png differ
diff --git a/sprites/SPRKA0.png b/sprites/SPRKA0.png
new file mode 100644
index 0000000..b259e49
Binary files /dev/null and b/sprites/SPRKA0.png differ
diff --git a/sprites/SSMKA0.png b/sprites/SSMKA0.png
new file mode 100644
index 0000000..12daea2
Binary files /dev/null and b/sprites/SSMKA0.png differ
diff --git a/sprites/US10A0.png b/sprites/US10A0.png
new file mode 100644
index 0000000..6e48f39
Binary files /dev/null and b/sprites/US10A0.png differ
diff --git a/sprites/US10B0.png b/sprites/US10B0.png
new file mode 100644
index 0000000..b14cf26
Binary files /dev/null and b/sprites/US10B0.png differ
diff --git a/sprites/US10C0.png b/sprites/US10C0.png
new file mode 100644
index 0000000..934195c
Binary files /dev/null and b/sprites/US10C0.png differ
diff --git a/sprites/US10D0.png b/sprites/US10D0.png
new file mode 100644
index 0000000..1ec7118
Binary files /dev/null and b/sprites/US10D0.png differ
diff --git a/sprites/US10E0.png b/sprites/US10E0.png
new file mode 100644
index 0000000..7bea927
Binary files /dev/null and b/sprites/US10E0.png differ
diff --git a/sprites/US10F0.png b/sprites/US10F0.png
new file mode 100644
index 0000000..4e41aeb
Binary files /dev/null and b/sprites/US10F0.png differ
diff --git a/sprites/US10G0.png b/sprites/US10G0.png
new file mode 100644
index 0000000..2de6c5d
Binary files /dev/null and b/sprites/US10G0.png differ
diff --git a/sprites/US10H0.png b/sprites/US10H0.png
new file mode 100644
index 0000000..48429fd
Binary files /dev/null and b/sprites/US10H0.png differ
diff --git a/sprites/US10I0.png b/sprites/US10I0.png
new file mode 100644
index 0000000..abf55e1
Binary files /dev/null and b/sprites/US10I0.png differ
diff --git a/sprites/US10J0.png b/sprites/US10J0.png
new file mode 100644
index 0000000..762089b
Binary files /dev/null and b/sprites/US10J0.png differ
diff --git a/sprites/US10K0.png b/sprites/US10K0.png
new file mode 100644
index 0000000..0cc56e2
Binary files /dev/null and b/sprites/US10K0.png differ
diff --git a/sprites/US10L0.png b/sprites/US10L0.png
new file mode 100644
index 0000000..8635a1d
Binary files /dev/null and b/sprites/US10L0.png differ
diff --git a/sprites/US10M0.png b/sprites/US10M0.png
new file mode 100644
index 0000000..3afd32b
Binary files /dev/null and b/sprites/US10M0.png differ
diff --git a/sprites/US10N0.png b/sprites/US10N0.png
new file mode 100644
index 0000000..2d63e66
Binary files /dev/null and b/sprites/US10N0.png differ
diff --git a/sprites/US10O0.png b/sprites/US10O0.png
new file mode 100644
index 0000000..09a7ad7
Binary files /dev/null and b/sprites/US10O0.png differ
diff --git a/sprites/US10P0.png b/sprites/US10P0.png
new file mode 100644
index 0000000..878a9b6
Binary files /dev/null and b/sprites/US10P0.png differ
diff --git a/sprites/US1_A0.png b/sprites/US1_A0.png
new file mode 100644
index 0000000..02303a7
Binary files /dev/null and b/sprites/US1_A0.png differ
diff --git a/sprites/US1_B0.png b/sprites/US1_B0.png
new file mode 100644
index 0000000..3ed1eb3
Binary files /dev/null and b/sprites/US1_B0.png differ
diff --git a/sprites/US1_C0.png b/sprites/US1_C0.png
new file mode 100644
index 0000000..30a92a1
Binary files /dev/null and b/sprites/US1_C0.png differ
diff --git a/sprites/US1_D0.png b/sprites/US1_D0.png
new file mode 100644
index 0000000..0416582
Binary files /dev/null and b/sprites/US1_D0.png differ
diff --git a/sprites/US1_E0.png b/sprites/US1_E0.png
new file mode 100644
index 0000000..8b0dbde
Binary files /dev/null and b/sprites/US1_E0.png differ
diff --git a/sprites/US1_F0.png b/sprites/US1_F0.png
new file mode 100644
index 0000000..25f292e
Binary files /dev/null and b/sprites/US1_F0.png differ
diff --git a/sprites/US1_G0.png b/sprites/US1_G0.png
new file mode 100644
index 0000000..f6f847c
Binary files /dev/null and b/sprites/US1_G0.png differ
diff --git a/sprites/US1_H0.png b/sprites/US1_H0.png
new file mode 100644
index 0000000..42cda8b
Binary files /dev/null and b/sprites/US1_H0.png differ
diff --git a/sprites/US1_I0.png b/sprites/US1_I0.png
new file mode 100644
index 0000000..a6a2667
Binary files /dev/null and b/sprites/US1_I0.png differ
diff --git a/sprites/US1_J0.png b/sprites/US1_J0.png
new file mode 100644
index 0000000..db9d483
Binary files /dev/null and b/sprites/US1_J0.png differ
diff --git a/sprites/US1_K0.png b/sprites/US1_K0.png
new file mode 100644
index 0000000..cadb6c6
Binary files /dev/null and b/sprites/US1_K0.png differ
diff --git a/sprites/US1_L0.png b/sprites/US1_L0.png
new file mode 100644
index 0000000..28c237b
Binary files /dev/null and b/sprites/US1_L0.png differ
diff --git a/sprites/US1_M0.png b/sprites/US1_M0.png
new file mode 100644
index 0000000..237f546
Binary files /dev/null and b/sprites/US1_M0.png differ
diff --git a/sprites/US1_N0.png b/sprites/US1_N0.png
new file mode 100644
index 0000000..38f1c9f
Binary files /dev/null and b/sprites/US1_N0.png differ
diff --git a/sprites/US1_O0.png b/sprites/US1_O0.png
new file mode 100644
index 0000000..21ac6a2
Binary files /dev/null and b/sprites/US1_O0.png differ
diff --git a/sprites/US1_P0.png b/sprites/US1_P0.png
new file mode 100644
index 0000000..02303a7
Binary files /dev/null and b/sprites/US1_P0.png differ
diff --git a/sprites/US2_A0.png b/sprites/US2_A0.png
new file mode 100644
index 0000000..1654cf8
Binary files /dev/null and b/sprites/US2_A0.png differ
diff --git a/sprites/US2_B0.png b/sprites/US2_B0.png
new file mode 100644
index 0000000..290e02b
Binary files /dev/null and b/sprites/US2_B0.png differ
diff --git a/sprites/US2_C0.png b/sprites/US2_C0.png
new file mode 100644
index 0000000..e81729f
Binary files /dev/null and b/sprites/US2_C0.png differ
diff --git a/sprites/US2_D0.png b/sprites/US2_D0.png
new file mode 100644
index 0000000..0600c15
Binary files /dev/null and b/sprites/US2_D0.png differ
diff --git a/sprites/US2_E0.png b/sprites/US2_E0.png
new file mode 100644
index 0000000..532f188
Binary files /dev/null and b/sprites/US2_E0.png differ
diff --git a/sprites/US2_F0.png b/sprites/US2_F0.png
new file mode 100644
index 0000000..0f1061c
Binary files /dev/null and b/sprites/US2_F0.png differ
diff --git a/sprites/US2_G0.png b/sprites/US2_G0.png
new file mode 100644
index 0000000..30db462
Binary files /dev/null and b/sprites/US2_G0.png differ
diff --git a/sprites/US2_H0.png b/sprites/US2_H0.png
new file mode 100644
index 0000000..92edf77
Binary files /dev/null and b/sprites/US2_H0.png differ
diff --git a/sprites/US2_I0.png b/sprites/US2_I0.png
new file mode 100644
index 0000000..71742ee
Binary files /dev/null and b/sprites/US2_I0.png differ
diff --git a/sprites/US2_J0.png b/sprites/US2_J0.png
new file mode 100644
index 0000000..678d6f7
Binary files /dev/null and b/sprites/US2_J0.png differ
diff --git a/sprites/US2_K0.png b/sprites/US2_K0.png
new file mode 100644
index 0000000..57ffc23
Binary files /dev/null and b/sprites/US2_K0.png differ
diff --git a/sprites/US2_L0.png b/sprites/US2_L0.png
new file mode 100644
index 0000000..21657cc
Binary files /dev/null and b/sprites/US2_L0.png differ
diff --git a/sprites/US2_M0.png b/sprites/US2_M0.png
new file mode 100644
index 0000000..5642c3a
Binary files /dev/null and b/sprites/US2_M0.png differ
diff --git a/sprites/US2_N0.png b/sprites/US2_N0.png
new file mode 100644
index 0000000..bbe8ea9
Binary files /dev/null and b/sprites/US2_N0.png differ
diff --git a/sprites/US2_O0.png b/sprites/US2_O0.png
new file mode 100644
index 0000000..2fb3f2c
Binary files /dev/null and b/sprites/US2_O0.png differ
diff --git a/sprites/US2_P0.png b/sprites/US2_P0.png
new file mode 100644
index 0000000..ee099c5
Binary files /dev/null and b/sprites/US2_P0.png differ
diff --git a/sprites/US3_A0.png b/sprites/US3_A0.png
new file mode 100644
index 0000000..c983b74
Binary files /dev/null and b/sprites/US3_A0.png differ
diff --git a/sprites/US3_B0.png b/sprites/US3_B0.png
new file mode 100644
index 0000000..f4d7bc1
Binary files /dev/null and b/sprites/US3_B0.png differ
diff --git a/sprites/US3_C0.png b/sprites/US3_C0.png
new file mode 100644
index 0000000..9e6a84d
Binary files /dev/null and b/sprites/US3_C0.png differ
diff --git a/sprites/US3_D0.png b/sprites/US3_D0.png
new file mode 100644
index 0000000..fc2fa42
Binary files /dev/null and b/sprites/US3_D0.png differ
diff --git a/sprites/US3_E0.png b/sprites/US3_E0.png
new file mode 100644
index 0000000..0a073aa
Binary files /dev/null and b/sprites/US3_E0.png differ
diff --git a/sprites/US3_F0.png b/sprites/US3_F0.png
new file mode 100644
index 0000000..ab4d9e3
Binary files /dev/null and b/sprites/US3_F0.png differ
diff --git a/sprites/US3_G0.png b/sprites/US3_G0.png
new file mode 100644
index 0000000..6084c35
Binary files /dev/null and b/sprites/US3_G0.png differ
diff --git a/sprites/US3_H0.png b/sprites/US3_H0.png
new file mode 100644
index 0000000..529dcdc
Binary files /dev/null and b/sprites/US3_H0.png differ
diff --git a/sprites/US3_I0.png b/sprites/US3_I0.png
new file mode 100644
index 0000000..11bbf1b
Binary files /dev/null and b/sprites/US3_I0.png differ
diff --git a/sprites/US3_J0.png b/sprites/US3_J0.png
new file mode 100644
index 0000000..86abf2d
Binary files /dev/null and b/sprites/US3_J0.png differ
diff --git a/sprites/US3_K0.png b/sprites/US3_K0.png
new file mode 100644
index 0000000..578545a
Binary files /dev/null and b/sprites/US3_K0.png differ
diff --git a/sprites/US3_L0.png b/sprites/US3_L0.png
new file mode 100644
index 0000000..752b229
Binary files /dev/null and b/sprites/US3_L0.png differ
diff --git a/sprites/US3_M0.png b/sprites/US3_M0.png
new file mode 100644
index 0000000..ae5506c
Binary files /dev/null and b/sprites/US3_M0.png differ
diff --git a/sprites/US3_N0.png b/sprites/US3_N0.png
new file mode 100644
index 0000000..44c2976
Binary files /dev/null and b/sprites/US3_N0.png differ
diff --git a/sprites/US3_O0.png b/sprites/US3_O0.png
new file mode 100644
index 0000000..daaca02
Binary files /dev/null and b/sprites/US3_O0.png differ
diff --git a/sprites/US3_P0.png b/sprites/US3_P0.png
new file mode 100644
index 0000000..37bff56
Binary files /dev/null and b/sprites/US3_P0.png differ
diff --git a/sprites/US4_A0.png b/sprites/US4_A0.png
new file mode 100644
index 0000000..8d95323
Binary files /dev/null and b/sprites/US4_A0.png differ
diff --git a/sprites/US4_B0.png b/sprites/US4_B0.png
new file mode 100644
index 0000000..6062bcb
Binary files /dev/null and b/sprites/US4_B0.png differ
diff --git a/sprites/US4_C0.png b/sprites/US4_C0.png
new file mode 100644
index 0000000..928639f
Binary files /dev/null and b/sprites/US4_C0.png differ
diff --git a/sprites/US4_D0.png b/sprites/US4_D0.png
new file mode 100644
index 0000000..d094b3c
Binary files /dev/null and b/sprites/US4_D0.png differ
diff --git a/sprites/US4_E0.png b/sprites/US4_E0.png
new file mode 100644
index 0000000..798ba39
Binary files /dev/null and b/sprites/US4_E0.png differ
diff --git a/sprites/US4_F0.png b/sprites/US4_F0.png
new file mode 100644
index 0000000..cc2f2d0
Binary files /dev/null and b/sprites/US4_F0.png differ
diff --git a/sprites/US4_G0.png b/sprites/US4_G0.png
new file mode 100644
index 0000000..b9fd496
Binary files /dev/null and b/sprites/US4_G0.png differ
diff --git a/sprites/US4_H0.png b/sprites/US4_H0.png
new file mode 100644
index 0000000..67966b2
Binary files /dev/null and b/sprites/US4_H0.png differ
diff --git a/sprites/US4_I0.png b/sprites/US4_I0.png
new file mode 100644
index 0000000..e87a4e7
Binary files /dev/null and b/sprites/US4_I0.png differ
diff --git a/sprites/US4_J0.png b/sprites/US4_J0.png
new file mode 100644
index 0000000..6c6ee18
Binary files /dev/null and b/sprites/US4_J0.png differ
diff --git a/sprites/US4_K0.png b/sprites/US4_K0.png
new file mode 100644
index 0000000..d5b25fe
Binary files /dev/null and b/sprites/US4_K0.png differ
diff --git a/sprites/US4_L0.png b/sprites/US4_L0.png
new file mode 100644
index 0000000..98db987
Binary files /dev/null and b/sprites/US4_L0.png differ
diff --git a/sprites/US4_M0.png b/sprites/US4_M0.png
new file mode 100644
index 0000000..5275c54
Binary files /dev/null and b/sprites/US4_M0.png differ
diff --git a/sprites/US4_N0.png b/sprites/US4_N0.png
new file mode 100644
index 0000000..da2972e
Binary files /dev/null and b/sprites/US4_N0.png differ
diff --git a/sprites/US4_O0.png b/sprites/US4_O0.png
new file mode 100644
index 0000000..551a2ed
Binary files /dev/null and b/sprites/US4_O0.png differ
diff --git a/sprites/US5_A0.png b/sprites/US5_A0.png
new file mode 100644
index 0000000..1458bf4
Binary files /dev/null and b/sprites/US5_A0.png differ
diff --git a/sprites/US5_B0.png b/sprites/US5_B0.png
new file mode 100644
index 0000000..4e0415c
Binary files /dev/null and b/sprites/US5_B0.png differ
diff --git a/sprites/US5_C0.png b/sprites/US5_C0.png
new file mode 100644
index 0000000..4740b7c
Binary files /dev/null and b/sprites/US5_C0.png differ
diff --git a/sprites/US5_D0.png b/sprites/US5_D0.png
new file mode 100644
index 0000000..ab37819
Binary files /dev/null and b/sprites/US5_D0.png differ
diff --git a/sprites/US5_E0.png b/sprites/US5_E0.png
new file mode 100644
index 0000000..5716ea7
Binary files /dev/null and b/sprites/US5_E0.png differ
diff --git a/sprites/US5_F0.png b/sprites/US5_F0.png
new file mode 100644
index 0000000..e239769
Binary files /dev/null and b/sprites/US5_F0.png differ
diff --git a/sprites/US5_G0.png b/sprites/US5_G0.png
new file mode 100644
index 0000000..cb6f1c5
Binary files /dev/null and b/sprites/US5_G0.png differ
diff --git a/sprites/US5_H0.png b/sprites/US5_H0.png
new file mode 100644
index 0000000..812f189
Binary files /dev/null and b/sprites/US5_H0.png differ
diff --git a/sprites/US5_I0.png b/sprites/US5_I0.png
new file mode 100644
index 0000000..5d7dd34
Binary files /dev/null and b/sprites/US5_I0.png differ
diff --git a/sprites/US5_J0.png b/sprites/US5_J0.png
new file mode 100644
index 0000000..078b9f2
Binary files /dev/null and b/sprites/US5_J0.png differ
diff --git a/sprites/US5_K0.png b/sprites/US5_K0.png
new file mode 100644
index 0000000..c510b58
Binary files /dev/null and b/sprites/US5_K0.png differ
diff --git a/sprites/US5_L0.png b/sprites/US5_L0.png
new file mode 100644
index 0000000..4f16ed0
Binary files /dev/null and b/sprites/US5_L0.png differ
diff --git a/sprites/US5_M0.png b/sprites/US5_M0.png
new file mode 100644
index 0000000..fa17125
Binary files /dev/null and b/sprites/US5_M0.png differ
diff --git a/sprites/US5_N0.png b/sprites/US5_N0.png
new file mode 100644
index 0000000..15c632b
Binary files /dev/null and b/sprites/US5_N0.png differ
diff --git a/sprites/US5_O0.png b/sprites/US5_O0.png
new file mode 100644
index 0000000..6b8b3f0
Binary files /dev/null and b/sprites/US5_O0.png differ
diff --git a/sprites/US6_A0.png b/sprites/US6_A0.png
new file mode 100644
index 0000000..2728bf2
Binary files /dev/null and b/sprites/US6_A0.png differ
diff --git a/sprites/US6_B0.png b/sprites/US6_B0.png
new file mode 100644
index 0000000..dc6dc17
Binary files /dev/null and b/sprites/US6_B0.png differ
diff --git a/sprites/US6_C0.png b/sprites/US6_C0.png
new file mode 100644
index 0000000..e0415b0
Binary files /dev/null and b/sprites/US6_C0.png differ
diff --git a/sprites/US6_D0.png b/sprites/US6_D0.png
new file mode 100644
index 0000000..2df997f
Binary files /dev/null and b/sprites/US6_D0.png differ
diff --git a/sprites/US6_E0.png b/sprites/US6_E0.png
new file mode 100644
index 0000000..87c1a20
Binary files /dev/null and b/sprites/US6_E0.png differ
diff --git a/sprites/US6_F0.png b/sprites/US6_F0.png
new file mode 100644
index 0000000..d908474
Binary files /dev/null and b/sprites/US6_F0.png differ
diff --git a/sprites/US6_G0.png b/sprites/US6_G0.png
new file mode 100644
index 0000000..d297fd0
Binary files /dev/null and b/sprites/US6_G0.png differ
diff --git a/sprites/US6_H0.png b/sprites/US6_H0.png
new file mode 100644
index 0000000..d57f488
Binary files /dev/null and b/sprites/US6_H0.png differ
diff --git a/sprites/US6_I0.png b/sprites/US6_I0.png
new file mode 100644
index 0000000..538a537
Binary files /dev/null and b/sprites/US6_I0.png differ
diff --git a/sprites/US6_J0.png b/sprites/US6_J0.png
new file mode 100644
index 0000000..58ffea3
Binary files /dev/null and b/sprites/US6_J0.png differ
diff --git a/sprites/US6_K0.png b/sprites/US6_K0.png
new file mode 100644
index 0000000..ee43b89
Binary files /dev/null and b/sprites/US6_K0.png differ
diff --git a/sprites/US6_L0.png b/sprites/US6_L0.png
new file mode 100644
index 0000000..708f0b0
Binary files /dev/null and b/sprites/US6_L0.png differ
diff --git a/sprites/US6_M0.png b/sprites/US6_M0.png
new file mode 100644
index 0000000..e9bcb00
Binary files /dev/null and b/sprites/US6_M0.png differ
diff --git a/sprites/US6_N0.png b/sprites/US6_N0.png
new file mode 100644
index 0000000..b135a9f
Binary files /dev/null and b/sprites/US6_N0.png differ
diff --git a/sprites/US6_O0.png b/sprites/US6_O0.png
new file mode 100644
index 0000000..0bc0216
Binary files /dev/null and b/sprites/US6_O0.png differ
diff --git a/sprites/US6_P0.png b/sprites/US6_P0.png
new file mode 100644
index 0000000..2f08e59
Binary files /dev/null and b/sprites/US6_P0.png differ
diff --git a/sprites/US7_A0.png b/sprites/US7_A0.png
new file mode 100644
index 0000000..837ce88
Binary files /dev/null and b/sprites/US7_A0.png differ
diff --git a/sprites/US7_B0.png b/sprites/US7_B0.png
new file mode 100644
index 0000000..bd5a846
Binary files /dev/null and b/sprites/US7_B0.png differ
diff --git a/sprites/US7_C0.png b/sprites/US7_C0.png
new file mode 100644
index 0000000..c3af2e3
Binary files /dev/null and b/sprites/US7_C0.png differ
diff --git a/sprites/US7_D0.png b/sprites/US7_D0.png
new file mode 100644
index 0000000..cb647e6
Binary files /dev/null and b/sprites/US7_D0.png differ
diff --git a/sprites/US7_E0.png b/sprites/US7_E0.png
new file mode 100644
index 0000000..415f7ba
Binary files /dev/null and b/sprites/US7_E0.png differ
diff --git a/sprites/US7_F0.png b/sprites/US7_F0.png
new file mode 100644
index 0000000..04361cf
Binary files /dev/null and b/sprites/US7_F0.png differ
diff --git a/sprites/US7_G0.png b/sprites/US7_G0.png
new file mode 100644
index 0000000..530d397
Binary files /dev/null and b/sprites/US7_G0.png differ
diff --git a/sprites/US7_H0.png b/sprites/US7_H0.png
new file mode 100644
index 0000000..1bacae3
Binary files /dev/null and b/sprites/US7_H0.png differ
diff --git a/sprites/US7_I0.png b/sprites/US7_I0.png
new file mode 100644
index 0000000..a5c0c58
Binary files /dev/null and b/sprites/US7_I0.png differ
diff --git a/sprites/US7_J0.png b/sprites/US7_J0.png
new file mode 100644
index 0000000..cec7bcd
Binary files /dev/null and b/sprites/US7_J0.png differ
diff --git a/sprites/US7_K0.png b/sprites/US7_K0.png
new file mode 100644
index 0000000..4b3e518
Binary files /dev/null and b/sprites/US7_K0.png differ
diff --git a/sprites/US7_L0.png b/sprites/US7_L0.png
new file mode 100644
index 0000000..5920ef0
Binary files /dev/null and b/sprites/US7_L0.png differ
diff --git a/sprites/US7_M0.png b/sprites/US7_M0.png
new file mode 100644
index 0000000..eb5d6c1
Binary files /dev/null and b/sprites/US7_M0.png differ
diff --git a/sprites/US7_N0.png b/sprites/US7_N0.png
new file mode 100644
index 0000000..3ab0579
Binary files /dev/null and b/sprites/US7_N0.png differ
diff --git a/sprites/US7_O0.png b/sprites/US7_O0.png
new file mode 100644
index 0000000..2913f66
Binary files /dev/null and b/sprites/US7_O0.png differ
diff --git a/sprites/US7_P0.png b/sprites/US7_P0.png
new file mode 100644
index 0000000..4e0430a
Binary files /dev/null and b/sprites/US7_P0.png differ
diff --git a/sprites/US8_A0.png b/sprites/US8_A0.png
new file mode 100644
index 0000000..2fda0bd
Binary files /dev/null and b/sprites/US8_A0.png differ
diff --git a/sprites/US8_B0.png b/sprites/US8_B0.png
new file mode 100644
index 0000000..f1070e8
Binary files /dev/null and b/sprites/US8_B0.png differ
diff --git a/sprites/US8_C0.png b/sprites/US8_C0.png
new file mode 100644
index 0000000..e5ef38d
Binary files /dev/null and b/sprites/US8_C0.png differ
diff --git a/sprites/US8_D0.png b/sprites/US8_D0.png
new file mode 100644
index 0000000..2e8cf62
Binary files /dev/null and b/sprites/US8_D0.png differ
diff --git a/sprites/US8_E0.png b/sprites/US8_E0.png
new file mode 100644
index 0000000..4c62730
Binary files /dev/null and b/sprites/US8_E0.png differ
diff --git a/sprites/US8_F0.png b/sprites/US8_F0.png
new file mode 100644
index 0000000..e3a0d8b
Binary files /dev/null and b/sprites/US8_F0.png differ
diff --git a/sprites/US8_G0.png b/sprites/US8_G0.png
new file mode 100644
index 0000000..df53689
Binary files /dev/null and b/sprites/US8_G0.png differ
diff --git a/sprites/US8_H0.png b/sprites/US8_H0.png
new file mode 100644
index 0000000..ce86aac
Binary files /dev/null and b/sprites/US8_H0.png differ
diff --git a/sprites/US8_I0.png b/sprites/US8_I0.png
new file mode 100644
index 0000000..2d7a256
Binary files /dev/null and b/sprites/US8_I0.png differ
diff --git a/sprites/US8_J0.png b/sprites/US8_J0.png
new file mode 100644
index 0000000..dd81a18
Binary files /dev/null and b/sprites/US8_J0.png differ
diff --git a/sprites/US8_K0.png b/sprites/US8_K0.png
new file mode 100644
index 0000000..595d792
Binary files /dev/null and b/sprites/US8_K0.png differ
diff --git a/sprites/US8_L0.png b/sprites/US8_L0.png
new file mode 100644
index 0000000..668c7ce
Binary files /dev/null and b/sprites/US8_L0.png differ
diff --git a/sprites/US8_M0.png b/sprites/US8_M0.png
new file mode 100644
index 0000000..960c69f
Binary files /dev/null and b/sprites/US8_M0.png differ
diff --git a/sprites/US8_N0.png b/sprites/US8_N0.png
new file mode 100644
index 0000000..af19f54
Binary files /dev/null and b/sprites/US8_N0.png differ
diff --git a/sprites/US8_O0.png b/sprites/US8_O0.png
new file mode 100644
index 0000000..d530ed0
Binary files /dev/null and b/sprites/US8_O0.png differ
diff --git a/sprites/US8_P0.png b/sprites/US8_P0.png
new file mode 100644
index 0000000..82fd31b
Binary files /dev/null and b/sprites/US8_P0.png differ
diff --git a/sprites/US9_A0.png b/sprites/US9_A0.png
new file mode 100644
index 0000000..ef5ef4e
Binary files /dev/null and b/sprites/US9_A0.png differ
diff --git a/sprites/US9_B0.png b/sprites/US9_B0.png
new file mode 100644
index 0000000..267ec9f
Binary files /dev/null and b/sprites/US9_B0.png differ
diff --git a/sprites/US9_C0.png b/sprites/US9_C0.png
new file mode 100644
index 0000000..1f80231
Binary files /dev/null and b/sprites/US9_C0.png differ
diff --git a/sprites/US9_D0.png b/sprites/US9_D0.png
new file mode 100644
index 0000000..4eb917c
Binary files /dev/null and b/sprites/US9_D0.png differ
diff --git a/sprites/US9_E0.png b/sprites/US9_E0.png
new file mode 100644
index 0000000..6a9e809
Binary files /dev/null and b/sprites/US9_E0.png differ
diff --git a/sprites/US9_F0.png b/sprites/US9_F0.png
new file mode 100644
index 0000000..f8b529d
Binary files /dev/null and b/sprites/US9_F0.png differ
diff --git a/sprites/US9_G0.png b/sprites/US9_G0.png
new file mode 100644
index 0000000..9a9f1c7
Binary files /dev/null and b/sprites/US9_G0.png differ
diff --git a/sprites/US9_H0.png b/sprites/US9_H0.png
new file mode 100644
index 0000000..ee1742f
Binary files /dev/null and b/sprites/US9_H0.png differ
diff --git a/sprites/US9_I0.png b/sprites/US9_I0.png
new file mode 100644
index 0000000..a8db5c9
Binary files /dev/null and b/sprites/US9_I0.png differ
diff --git a/sprites/US9_J0.png b/sprites/US9_J0.png
new file mode 100644
index 0000000..fb1a0b7
Binary files /dev/null and b/sprites/US9_J0.png differ
diff --git a/sprites/US9_K0.png b/sprites/US9_K0.png
new file mode 100644
index 0000000..8253275
Binary files /dev/null and b/sprites/US9_K0.png differ
diff --git a/sprites/US9_L0.png b/sprites/US9_L0.png
new file mode 100644
index 0000000..2dbce44
Binary files /dev/null and b/sprites/US9_L0.png differ
diff --git a/sprites/US9_M0.png b/sprites/US9_M0.png
new file mode 100644
index 0000000..e17fd32
Binary files /dev/null and b/sprites/US9_M0.png differ
diff --git a/sprites/US9_N0.png b/sprites/US9_N0.png
new file mode 100644
index 0000000..4dddc21
Binary files /dev/null and b/sprites/US9_N0.png differ
diff --git a/sprites/US9_O0.png b/sprites/US9_O0.png
new file mode 100644
index 0000000..6b3e3e1
Binary files /dev/null and b/sprites/US9_O0.png differ
diff --git a/sprites/US9_P0.png b/sprites/US9_P0.png
new file mode 100644
index 0000000..82fd31b
Binary files /dev/null and b/sprites/US9_P0.png differ
diff --git a/textures.misc b/textures.misc
index 3b0f71f..ea6dad6 100644
--- a/textures.misc
+++ b/textures.misc
@@ -136,14 +136,12 @@ Sprite "UARMA0",1,1{}
 Sprite "BELTA0",1,1{}
 Sprite "UDAMA0",1,1{}
 Sprite "UDAMB0",1,1{}
-Sprite "USKLA0",1,1{}
-Sprite "USKLB0",1,1{}
-Sprite "USKLC0",1,1{}
-Sprite "UKEYA0",1,1{}
-Sprite "UKEYB0",1,1{}
-Sprite "UKEYC0",1,1{}
 Sprite "BPAKA0",1,1{}
 Sprite "INVSA0",1,1{}
 Sprite "TRNSA0",1,1{}
 Sprite "SSUTA0",1,1{}
 Sprite "SLITA0",1,1{}
+Sprite "CHIPA0",1,1{}
+Sprite "CHIPB0",1,1{}
+Sprite "CHIPC0",1,1{}
+Sprite "CHIPD0",1,1{}
diff --git a/zscript/biorifle.zsc b/zscript/biorifle.zsc
index 7556e40..93c3716 100644
--- a/zscript/biorifle.zsc
+++ b/zscript/biorifle.zsc
@@ -37,6 +37,47 @@ Class BioAmmo : Ammo
 	}
 }
 
+Class BioSpark : Actor
+{
+	Default
+	{
+		RenderStyle "Add";
+		Radius 2;
+		Height 0;
+		+NOBLOCKMAP;
+		+FORCEXYBILLBOARD;
+		+MISSILE;
+		+MOVEWITHSECTOR;
+		+THRUACTORS;
+		+ROLLSPRITE;
+		+ROLLCENTER;
+		+NOTELEPORT;
+		BounceType "Doom";
+		BounceFactor 0.5;
+		WallBounceFactor 0.5;
+		Gravity 0.2;
+		Scale 0.04;
+	}
+	override void PostBeginPlay()
+	{
+		Super.PostBeginPlay();
+		frame = Random[GES](0,4);
+		roll = FRandom[GES](0,360);
+	}
+	States
+	{
+	Spawn:
+		GBLB # 1 Bright A_FadeOut(FRandom[GES](0.005,0.015));
+		Wait;
+	Death:
+		GBLB # 1 Bright A_FadeOut(FRandom[GES](0.04,0.06));
+		Wait;
+	Dummy:
+		GBLB ABCDE -1;
+		Stop;
+	}
+}
+
 Class BioHitbox : Actor
 {
 	Default
@@ -174,7 +215,8 @@ Class BioGel : Actor
 			for ( int i=0; i<numpt; i++ )
 			{
 				Vector3 pvel = (FRandom[GES](-1,1),FRandom[GES](-1,1),FRandom[GES](-1,1)).unit()*FRandom[GES](1,3);
-				A_SpawnParticle("40FF30",SPF_FULLBRIGHT,Random[GES](30,60),FRandom[GES](1.2,2.4),0,0,0,0,pvel.x,pvel.y,pvel.z,0,0,-0.2,3.0);
+				let s = Spawn("BioSpark",pos);
+				s.vel = pvel;
 			}
 		}
 		if ( deadtimer <= -1 ) return;
@@ -253,7 +295,8 @@ Class BioGel : Actor
 		for ( int i=0; i<numpt; i++ )
 		{
 			Vector3 pvel = (normal+(FRandom[GES](-.8,.8),FRandom[GES](-.8,.8),FRandom[GES](-.8,.8))).unit()*FRandom[GES](3,6);
-			A_SpawnParticle("40FF30",SPF_FULLBRIGHT,Random[GES](30,60),FRandom[GES](1.2,3.6),0,0,0,0,pvel.x,pvel.y,pvel.z,0,0,-0.2,3.0);
+			let s = Spawn("BioSpark",pos);
+			s.vel = pvel;
 		}
 	}
 	action void A_DropDrip()
@@ -283,7 +326,8 @@ Class BioGel : Actor
 		for ( int i=0; i<numpt; i++ )
 		{
 			Vector3 pvel = (FRandom[GES](-1,1),FRandom[GES](-1,1),FRandom[GES](-1,1)).unit()*FRandom[GES](3,12);
-			A_SpawnParticle("40FF30",SPF_FULLBRIGHT,Random[GES](30,60),FRandom[GES](2.4,6.4),0,0,0,0,pvel.x,pvel.y,pvel.z,0,0,-0.2,3.0);
+			let s = Spawn("BioSpark",pos);
+			s.vel = pvel;
 		}
 		Scale *= 0.5;
 	}
diff --git a/zscript/chainsaw.zsc b/zscript/chainsaw.zsc
index abc78cc..04404c7 100644
--- a/zscript/chainsaw.zsc
+++ b/zscript/chainsaw.zsc
@@ -1,28 +1,133 @@
+Class SawImpact : Actor
+{
+	Default
+	{
+		Radius 0.1;
+		Height 0;
+		+NOGRAVITY;
+		+NOCLIP;
+		+DONTSPLASH;
+	}
+	override void PostBeginPlay()
+	{
+		Super.PostBeginPlay();
+		A_SprayDecal("WallCrack",20);
+		int numpt = Random[Chainsaw](5,10);
+		Vector3 x = (cos(angle)*cos(pitch),sin(angle)*cos(pitch),-sin(pitch));
+		for ( int i=0; i<numpt; i++ )
+		{
+			Vector3 pvel = (-x+(FRandom[Chainsaw](-.8,.8),FRandom[Chainsaw](-.8,.8),FRandom[Chainsaw](-.8,.8))).unit()*FRandom[Chainsaw](0.1,1.2);
+			let s = Spawn("UTSmoke",pos);
+			s.vel = pvel;
+			s.SetShade(Color(1,1,1)*Random[Chainsaw](128,192));
+		}
+		numpt = Random[Chainsaw](4,12);
+		for ( int i=0; i<numpt; i++ )
+		{
+			Vector3 pvel = (FRandom[Chainsaw](-1,1),FRandom[Chainsaw](-1,1),FRandom[Chainsaw](-1,1)).unit()*FRandom[Chainsaw](2,8);
+			let s = Spawn("UTSpark",pos);
+			s.vel = pvel;
+		}
+		numpt = Random[Chainsaw](4,8);
+		for ( int i=0; i<numpt; i++ )
+		{
+			Vector3 pvel = (FRandom[Chainsaw](-1,1),FRandom[Chainsaw](-1,1),FRandom[Chainsaw](-1,1)).unit()*FRandom[Chainsaw](2,8);
+			let s = Spawn("UTChip",pos);
+			s.vel = pvel;
+		}
+		Destroy();
+	}
+}
+
 Class UTChainsaw : UTWeapon replaces Chainsaw
 {
 	double sawcnt;
 
 	action void A_SawHit()
 	{
-		A_QuakeEx(3,3,3,2,0,1,"",QF_RELATIVE,rollIntensity:0.15);
+		A_QuakeEx(2,2,2,2,0,1,"",QF_RELATIVE,rollIntensity:0.15);
 		invoker.sawcnt += 1./TICRATE;
 		if ( invoker.sawcnt < 0.15 ) return;
 		invoker.sawcnt = 0;
 		invoker.FireEffect();
+		A_AlertMonsters();
+		Vector3 x, y, z;
+		[x, y, z] = Matrix4.GetAxes(pitch,angle,roll);
+		Vector3 origin = (pos.x,pos.y,player.viewz)+10.0*x-4.0*z;
+		FLineTraceData d;
+		LineTrace(angle,90,BulletSlope(),TRF_ABSPOSITION,origin.z,origin.x,origin.y,d);
+		if ( d.HitType == TRACE_HitActor )
+		{
+			d.HitActor.DamageMobj(invoker,self,20,'slashed');
+			d.HitActor.vel -= x*(500/d.HitActor.mass);
+			vel += x*(100/mass);
+			if ( d.HitActor.player ) d.HitActor.A_QuakeEx(5,5,5,6,0,1,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:0.25);
+			if ( d.HitActor.bNOBLOOD )
+			{
+				let p = Spawn("SawImpact",d.HitLocation-d.HitDir*4);
+				p.angle = atan2(d.HitDir.y,d.HitDir.x);
+				p.pitch = asin(-d.HitDir.z);
+			}
+			else
+			{
+				d.HitActor.TraceBleed(20,invoker);
+				d.HitActor.SpawnBlood(d.HitLocation,atan2(-d.HitDir.y,-d.HitDir.x),20);
+			}
+		}
+		else if ( d.HitType != TRACE_HitNone )
+		{
+			let p = Spawn("SawImpact",d.HitLocation-d.HitDir*4);
+			p.angle = atan2(d.HitDir.y,d.HitDir.x);
+			p.pitch = asin(-d.HitDir.z);
+			if ( d.HitType == TRACE_HitWall ) d.HitLine.RemoteActivate(self,d.LineSide,SPAC_Impact,d.HitLocation-d.HitDir*4);
+		}
 	}
 	action void A_SawSwipe()
 	{
-		A_QuakeEx(3,3,3,3,0,1,"",QF_RELATIVE,rollIntensity:0.15);
+		A_QuakeEx(2,2,2,3,0,1,"",QF_RELATIVE,rollIntensity:0.15);
 		invoker.FireEffect();
+		A_AlertMonsters();
+		Vector3 x, y, z;
+		[x, y, z] = Matrix4.GetAxes(pitch,angle,roll);
+		Vector3 origin = (pos.x,pos.y,player.viewz)+10.0*x-2.0*z;
+		FLineTraceData d;
+		LineTrace(angle,90,BulletSlope(),TRF_ABSPOSITION,origin.z,origin.x,origin.y,d);
+		if ( d.HitType == TRACE_HitActor )
+		{
+			d.HitActor.DamageMobj(invoker,self,110,'Decapitated');
+			d.HitActor.vel = -y*(1200/d.HitActor.mass);
+			vel += x*(100/mass);
+			if ( d.HitActor.player ) d.HitActor.A_QuakeEx(5,5,5,6,0,1,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:0.25);
+			if ( d.HitActor.bNOBLOOD )
+			{
+				let p = Spawn("SawImpact",d.HitLocation-d.HitDir*4);
+				p.angle = atan2(d.HitDir.y,d.HitDir.x);
+				p.pitch = asin(-d.HitDir.z);
+			}
+			else
+			{
+				d.HitActor.TraceBleed(110,invoker);
+				d.HitActor.SpawnBlood(d.HitLocation,atan2(-d.HitDir.y,-d.HitDir.x),110);
+			}
+		}
+		else if ( d.HitType != TRACE_HitNone )
+		{
+			let p = Spawn("SawImpact",d.HitLocation-d.HitDir*4);
+			p.angle = atan2(d.HitDir.y,d.HitDir.x);
+			p.pitch = asin(-d.HitDir.z);
+			if ( d.HitType == TRACE_HitWall ) d.HitLine.RemoteActivate(self,d.LineSide,SPAC_Impact,d.HitLocation-d.HitDir*4);
+		}
 	}
 	Default
 	{
 		Tag "Chainsaw";
+		Obituary "%k ripped into %o with a blood soaked Chainsaw.";
 		Inventory.PickupMessage "It's been twenty five years since I've seen one of these.";	// was five years in UT99
 		Weapon.UpSound "chainsaw/select";
 		Weapon.SlotNumber 1;
 		Weapon.SelectionOrder 9;
 		+WEAPON.MELEEWEAPON;
+		+FORCEPAIN;
 	}
 	States
 	{
@@ -35,18 +140,27 @@ Class UTChainsaw : UTWeapon replaces Chainsaw
 		CSWS A 1 A_Raise(int.max);
 		Wait;
 	Ready:
-		CSWS ABCDEFGHIJLMNO 1 A_QuakeEx(1,1,1,2,0,1,"",QF_RELATIVE,rollIntensity:0.1);
+		CSWS ABCDEFGHIJLMNO 1
+		{
+			A_AlertMonsters();
+			A_QuakeEx(1,1,1,2,0,1,"",QF_RELATIVE,rollIntensity:0.1);
+		}
 	Idle:
 		CSWI A 0 A_PlaySound("chainsaw/idle",CHAN_6,looping:true);
 		CSWI ABCDEFGHIJ 1
 		{
+			A_AlertMonsters();
 			A_WeaponReady();
 			A_QuakeEx(1,1,1,2,0,1,"",QF_RELATIVE,rollIntensity:0.1);
 		}
 		Goto Idle+1;
 	Fire:
 		CSWJ A 1 A_PlaySound("chainsaw/fire",CHAN_6,looping:true);
-		CSWJ BCDEF 1 A_QuakeEx(1,1,1,2,0,1,"",QF_RELATIVE,rollIntensity:0.1);
+		CSWJ BCDEF 1
+		{
+			A_AlertMonsters();
+			A_QuakeEx(1,1,1,2,0,1,"",QF_RELATIVE,rollIntensity:0.1);
+		}
 	Hold:
 		CSWJ G 1 A_SawHit();
 		CSWJ H 0 A_Refire(1);
@@ -87,13 +201,25 @@ Class UTChainsaw : UTWeapon replaces Chainsaw
 		CSWJ S 1 A_SawHit();
 		CSWJ G 0 A_Refire("Hold");
 	Release:
-		CSWJ FEDCBA 1 A_QuakeEx(1,1,1,2,0,1,"",QF_RELATIVE,rollIntensity:0.1);
+		CSWJ FEDCBA 1
+		{
+			A_AlertMonsters();
+			A_QuakeEx(1,1,1,2,0,1,"",QF_RELATIVE,rollIntensity:0.1);
+		}
 		Goto Idle;
 	AltFire:
 		CSWA A 0 A_PlaySound("chainsaw/fire",CHAN_6);
-		CSWA ABCDEFG 2 A_QuakeEx(3,3,3,3,0,1,"",QF_RELATIVE,rollIntensity:0.15);
+		CSWA ABCDEFG 2
+		{
+			A_AlertMonsters();
+			A_QuakeEx(2,2,2,3,0,1,"",QF_RELATIVE,rollIntensity:0.15);
+		}
 		CSWA H 2 A_SawSwipe();
-		CSWA IJK 2 A_QuakeEx(3,3,3,3,0,1,"",QF_RELATIVE,rollIntensity:0.15);
+		CSWA IJK 2
+		{
+			A_AlertMonsters();
+			A_QuakeEx(2,2,2,3,0,1,"",QF_RELATIVE,rollIntensity:0.15);
+		}
 		CSWA K 0 A_PlaySound("chainsaw/idle",CHAN_6,looping:true);
 		Goto Ready;
 	Deselect:
diff --git a/zscript/flakcannon.zsc b/zscript/flakcannon.zsc
index c46cd2c..be80c62 100644
--- a/zscript/flakcannon.zsc
+++ b/zscript/flakcannon.zsc
@@ -194,7 +194,19 @@ Class FlakChunk : Actor
 			if ( frame < 11 ) frame++;
 		}
 		lifetime += lifespeed;
-		if ( (waterlevel <= 0) && (frame < 10) ) A_SpawnParticle("AAAAAA",0,35,2.0,velx:FRandom[Flak](-0.1,0.1),vely:FRandom[Flak](-0.1,0.1),velz:FRandom[Flak](-0.1,0.1),accelz:0.02,startalphaf:scale.x/0.5,sizestep:0.2);
+		if ( (waterlevel <= 0) && (frame < 10) )
+		{
+			let s = Spawn("UTSmoke",pos);
+			s.vel = (FRandom[Flak](-0.1,0.1),FRandom[Flak](-0.1,0.1),FRandom[Flak](-0.1,0.1));
+			s.alpha = scale.x/0.5;
+			s.SetShade("AAAAAA");
+		}
+		else if ( waterlevel > 0 )
+		{
+			let s = Spawn("UTBubble",pos);
+			s.vel = (FRandom[Flak](-0.1,0.1),FRandom[Flak](-0.1,0.1),FRandom[Flak](-0.1,0.1));
+			s.scale *= scale.x*0.5;
+		}
 		if ( trail ) trail.alpha = max(0,11-frame)/11.;
 		if ( InStateSequence(CurState,FindState("Death")) ) return;
 		A_SetRoll(roll+rollvel,SPF_INTERPOLATE);
@@ -205,11 +217,15 @@ Class FlakChunk : Actor
 	{
 		invoker.hasbounced = true;
 		A_SprayDecal("WallCrack",-8);
-		int numpt = Random[Flak](8,12);
-		for ( int i=0; i<numpt; i++ )
+		int numpt = Random[Flak](3,6);
+		if ( frame < 10 )
 		{
-			Vector3 pvel = (FRandom[Flak](-1,1),FRandom[Flak](-1,1),FRandom[Flak](-1,1)).unit()*FRandom[Flak](2,4);
-			A_SpawnParticle("FFA000",SPF_FULLBRIGHT,Random[Flak](10,20),FRandom[Flak](1.2,3.6),0,0,0,0,pvel.x,pvel.y,pvel.z,0,0,0,3.0,-1,-0.25);
+			for ( int i=0; i<numpt; i++ )
+			{
+				Vector3 pvel = (FRandom[Flak](-1,1),FRandom[Flak](-1,1),FRandom[Flak](-1,1)).unit()*FRandom[Flak](2,4);
+				let s = Spawn("UTSpark",pos);
+				s.vel = pvel;
+			}
 		}
 		A_Gravity();
 		invoker.rollvel = FRandom[Flak](50,100)*RandomPick[Flak](-1,1)*(vel.length()/speed);
@@ -301,7 +317,11 @@ Class SlugSmoke : Actor
 		Super.Tick();
 		if ( globalfreeze || level.frozen ) return;
 		lifetime += lifespeed;
-		if ( waterlevel <= 0 ) A_SpawnParticle("AAAAAA",0,50,16.0,velx:FRandom[Flak](-0.5,0.5),vely:FRandom[Flak](-0.5,0.5),velz:FRandom[Flak](-0.5,0.5),accelz:0.05,startalphaf:scale.x,sizestep:1.0);
+		let s = Spawn("UTSmoke",pos);
+		s.vel = (FRandom[Flak](-0.5,0.5),FRandom[Flak](-0.5,0.5),FRandom[Flak](-0.5,0.5));
+		s.vel.z += 2.;
+		s.alpha = scale.x;
+		s.SetShade("AAAAAA");
 		scale.x = max(0,1-lifetime);
 		if ( scale.x <= 0 ) Destroy();
 	}
@@ -399,11 +419,19 @@ Class FlakSlug : Actor
 			p.vel = (cos(p.angle)*cos(p.pitch),sin(p.angle)*cos(p.pitch),-sin(p.pitch))*p.speed*FRandom[Flak](0.5,1.5);
 			p.target = target;
 		}
-		int numpt = Random[Flak](40,80);
+		int numpt = Random[Flak](10,20);
 		for ( int i=0; i<numpt; i++ )
 		{
-			Vector3 pvel = (FRandom[Flak](-1,1),FRandom[Flak](-1,1),FRandom[Flak](-1,1)).unit()*FRandom[Flak](2,4);
-			A_SpawnParticle("FFA000",SPF_FULLBRIGHT,Random[Flak](20,40),FRandom[Flak](4.8,7.2),0,0,0,0,pvel.x,pvel.y,pvel.z,0,0,0,3.0,-1,-0.25);
+			Vector3 pvel = (FRandom[Flak](-1,1),FRandom[Flak](-1,1),FRandom[Flak](-1,1)).unit()*FRandom[Flak](2,8);
+			let s = Spawn("UTSpark",pos);
+			s.vel = pvel;
+		}
+		numpt = Random[Flak](20,40);
+		for ( int i=0; i<numpt; i++ )
+		{
+			Vector3 pvel = (FRandom[Flak](-1,1),FRandom[Flak](-1,1),FRandom[Flak](-1,1)).unit()*FRandom[Flak](2,8);
+			let s = Spawn("UTChip",pos);
+			s.vel = pvel;
 		}
 	}
 	States
@@ -411,9 +439,13 @@ Class FlakSlug : Actor
 	Spawn:
 		FSLG A 1
 		{
-			if ( waterlevel > 0 ) return;
 			for ( int i=0; i<6; i++ )
-				A_SpawnParticle("AAAAAA",0,50,12.0,velx:FRandom[Flak](-0.5,0.5),vely:FRandom[Flak](-0.5,0.5),velz:FRandom[Flak](-0.5,0.5),accelz:0.02,startalphaf:0.5,sizestep:1.0);
+			{
+				let s = Spawn("UTSmoke",pos);
+				s.vel = (FRandom[Flak](-0.5,0.5),FRandom[Flak](-0.5,0.5),FRandom[Flak](-0.5,0.5));
+				s.alpha = 0.5;
+				s.SetShade("AAAAAA");
+			}
 		}
 		Wait;
 	Death:
@@ -493,8 +525,10 @@ Class FlakCannon : UTWeapon
 		int numpt = Random[Flak](20,30);
 		for ( int i=0; i<numpt; i++ )
 		{
-			Vector3 pvel = (x+(FRandom[Flak](-.8,.8),FRandom[Flak](-.8,.8),FRandom[Flak](-.8,.8))).unit()*FRandom[Flak](2,4);
-			A_SpawnParticle("FFA000",SPF_FULLBRIGHT,Random[Flak](10,20),FRandom[Flak](2.4,3.6),0,origin.x-pos.x,origin.y-pos.y,origin.z-pos.z,pvel.x,pvel.y,pvel.z,0,0,-0.1,3.0,-1,-0.25);
+			Vector3 pvel = (x+(FRandom[Flak](-.8,.8),FRandom[Flak](-.8,.8),FRandom[Flak](-.8,.8))).unit()*FRandom[Flak](8,32);
+			let s = Spawn("UTSpark",origin);
+			s.vel = pvel;
+			s.alpha *= 0.2;
 		}
 	}
 	action void A_FireSlug()
@@ -523,8 +557,10 @@ Class FlakCannon : UTWeapon
 		int numpt = Random[Flak](10,15);
 		for ( int i=0; i<numpt; i++ )
 		{
-			Vector3 pvel = (x+(FRandom[Flak](-.8,.8),FRandom[Flak](-.8,.8),FRandom[Flak](-.8,.8))).unit()*FRandom[Flak](2,4);
-			A_SpawnParticle("FFA000",SPF_FULLBRIGHT,Random[Flak](10,20),FRandom[Flak](2.4,3.6),0,origin.x-pos.x,origin.y-pos.y,origin.z-pos.z,pvel.x,pvel.y,pvel.z,0,0,-0.1,3.0,-1,-0.25);
+			Vector3 pvel = (x+(FRandom[Flak](-.8,.8),FRandom[Flak](-.8,.8),FRandom[Flak](-.8,.8))).unit()*FRandom[Flak](8,32);
+			let s = Spawn("UTSpark",origin);
+			s.vel = pvel;
+			s.alpha *= 0.2;
 		}
 	}
 
diff --git a/zscript/impacthammer.zsc b/zscript/impacthammer.zsc
index f7975fa..bb5e072 100644
--- a/zscript/impacthammer.zsc
+++ b/zscript/impacthammer.zsc
@@ -16,14 +16,24 @@ Class HammerImpact : Actor
 		Vector3 x = (cos(angle)*cos(pitch),sin(angle)*cos(pitch),-sin(pitch));
 		for ( int i=0; i<numpt; i++ )
 		{
-			Vector3 pvel = (x+(FRandom[Impact](-.8,.8),FRandom[Impact](-.8,.8),FRandom[Impact](-.8,.8))).unit()*FRandom[Impact](1,3);
-			A_SpawnParticle(Color(1,1,1)*Random[Impact](128,192),0,Random[Impact](30,60),FRandom[Impact](2,8),0,0,0,0,pvel.x,pvel.y,pvel.z,0,0,0.03,0.5,-1,0.5);
+			Vector3 pvel = (-x+(FRandom[Impact](-.8,.8),FRandom[Impact](-.8,.8),FRandom[Impact](-.8,.8))).unit()*FRandom[Impact](0.1,1.2);
+			let s = Spawn("UTSmoke",pos);
+			s.vel = pvel;
+			s.SetShade(Color(1,1,1)*Random[Impact](128,192));
 		}
-		numpt = Random[Impact](8,12);
+		numpt = Random[Impact](4,12);
 		for ( int i=0; i<numpt; i++ )
 		{
-			Vector3 pvel = (FRandom[Impact](-1,1),FRandom[Impact](-1,1),FRandom[Impact](-1,1)).unit()*FRandom[Impact](2,4);
-			A_SpawnParticle("FFA000",SPF_FULLBRIGHT,Random[Impact](10,20),FRandom[Impact](1.2,3.6),0,0,0,0,pvel.x,pvel.y,pvel.z,0,0,0,3.0,-1,-0.25);
+			Vector3 pvel = (FRandom[Impact](-1,1),FRandom[Impact](-1,1),FRandom[Impact](-1,1)).unit()*FRandom[Impact](2,8);
+			let s = Spawn("UTSpark",pos);
+			s.vel = pvel;
+		}
+		numpt = Random[Impact](4,16);
+		for ( int i=0; i<numpt; i++ )
+		{
+			Vector3 pvel = (FRandom[Impact](-1,1),FRandom[Impact](-1,1),FRandom[Impact](-1,1)).unit()*FRandom[Impact](2,8);
+			let s = Spawn("UTChip",pos);
+			s.vel = pvel;
 		}
 		Destroy();
 	}
@@ -92,17 +102,21 @@ Class ImpactHammer : UTWeapon replaces Fist
 		}
 		A_QuakeEx(realcharge*6,realcharge*6,realcharge*6,16,0,1,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:realcharge*0.2);
 		realcharge = max(1.0,realcharge);
-		int numpt = Random[Impact](20,40);
+		int numpt = Random[Impact](5,10);
 		for ( int i=0; i<numpt; i++ )
 		{
 			Vector3 pvel = (x+(FRandom[Impact](-.4,.4),FRandom[Impact](-.4,.4),FRandom[Impact](-.4,.4))).unit()*FRandom[Impact](1,3)*realcharge;
-			A_SpawnParticle(Color(1,1,1)*Random[Impact](128,192),0,Random[Impact](30,60),FRandom[Impact](2,8),0,origin.x-pos.x,origin.y-pos.y,origin.z-pos.z,pvel.x,pvel.y,pvel.z,0,0,0.03,0.5,-1,0.5);
+			let s = Spawn("UTSmoke",origin);
+			s.vel = pvel;
+			s.SetShade(Color(1,1,1)*Random[Impact](128,192));
 		}
-		numpt = Random[Impact](10,20);
+		numpt = Random[Impact](4,8);
 		for ( int i=0; i<numpt; i++ )
 		{
-			Vector3 pvel = (x+(FRandom[Impact](-.5,.5),FRandom[Impact](-.5,.5),FRandom[Impact](-.5,.5))).unit()*FRandom[Impact](2,4)*realcharge;
-			A_SpawnParticle(Color(1,1,1)*Random[Impact](16,64),0,Random[Impact](5,10),FRandom[Impact](0.3,0.8),0,origin.x-pos.x,origin.y-pos.y,origin.z-pos.z,pvel.x,pvel.y,pvel.z,0,0,-0.2,2.,-0.1);
+			Vector3 pvel = (x+(FRandom[Impact](-.5,.5),FRandom[Impact](-.5,.5),FRandom[Impact](-.5,.5))).unit()*FRandom[Impact](2,16)*realcharge;
+			let s = Spawn("UTChip",origin);
+			s.vel = pvel;
+			s.scale *= 0.4;
 		}
 	}
 	action void A_FireAltBlast()
@@ -146,17 +160,21 @@ Class ImpactHammer : UTWeapon replaces Fist
 			if ( m.bSEEKERMISSILE ) m.tracer = m.target;
 			m.target = self;
 		}
-		int numpt = Random[Impact](20,40);
+		int numpt = Random[Impact](5,10);
 		for ( int i=0; i<numpt; i++ )
 		{
 			Vector3 pvel = (x+(FRandom[Impact](-.4,.4),FRandom[Impact](-.4,.4),FRandom[Impact](-.4,.4))).unit()*FRandom[Impact](1,3);
-			A_SpawnParticle(Color(1,1,1)*Random[Impact](128,192),0,Random[Impact](30,60),FRandom[Impact](2,8),0,origin.x-pos.x,origin.y-pos.y,origin.z-pos.z,pvel.x,pvel.y,pvel.z,0,0,0.03,0.5,-1,0.5);
+			let s = Spawn("UTSmoke",origin);
+			s.vel = pvel;
+			s.SetShade(Color(1,1,1)*Random[Impact](128,192));
 		}
-		numpt = Random[Impact](10,20);
+		numpt = Random[Impact](4,8);
 		for ( int i=0; i<numpt; i++ )
 		{
-			Vector3 pvel = (x+(FRandom[Impact](-.5,.5),FRandom[Impact](-.5,.5),FRandom[Impact](-.5,.5))).unit()*FRandom[Impact](2,4);
-			A_SpawnParticle(Color(1,1,1)*Random[Impact](16,64),0,Random[Impact](5,10),FRandom[Impact](0.3,0.8),0,origin.x-pos.x,origin.y-pos.y,origin.z-pos.z,pvel.x,pvel.y,pvel.z,0,0,-0.2,2.,-0.1);
+			Vector3 pvel = (x+(FRandom[Impact](-.5,.5),FRandom[Impact](-.5,.5),FRandom[Impact](-.5,.5))).unit()*FRandom[Impact](2,16);
+			let s = Spawn("UTChip",origin);
+			s.vel = pvel;
+			s.scale *= 0.4;
 		}
 	}
 	action void A_ImpactRefire( statelabel flash = null )
@@ -261,6 +279,7 @@ Class ImpactHammer : UTWeapon replaces Fist
 		IMPF ABCDEFGHIJKLMNOP 1;
 		Goto Idle;
 	Deselect:
+		IMPD A 0 A_StopSound(CHAN_WEAPON);
 		IMPD ABCDE 3;
 		IMPD E 1 A_Lower(int.max);
 		Wait;
diff --git a/zscript/powerups.zsc b/zscript/powerups.zsc
index 489a268..7d81cb4 100644
--- a/zscript/powerups.zsc
+++ b/zscript/powerups.zsc
@@ -44,7 +44,7 @@ Class DamageAmpLight : DynamicLight
 			Destroy();
 			return;
 		}
-		SetOrigin(target.pos+(0,0,target.height*0.5),true);
+		SetOrigin(target.pos,true);
 		args[LIGHT_INTENSITY] = Random[ASMD](10,12)*8;
 		bDORMANT = Powerup(master).isBlinking();
 	}
diff --git a/zscript/pulsegun.zsc b/zscript/pulsegun.zsc
index 3594827..8336f6f 100644
--- a/zscript/pulsegun.zsc
+++ b/zscript/pulsegun.zsc
@@ -537,6 +537,7 @@ Class PulseGun : UTWeapon
 		PGR2 ABCDEFGHIJKLMNOPQRSTUVWX 1;
 		Goto Idle;
 	Deselect:
+		PGNS W 0 A_StopSound(CHAN_WEAPON);
 		PGNS WVUTSRQPONMLKJIHGFEDCBA 1;
 		PGNS A 1 A_Lower(int.max);
 		Wait;
diff --git a/zscript/shockrifle.zsc b/zscript/shockrifle.zsc
index e47bdca..6beaf6e 100644
--- a/zscript/shockrifle.zsc
+++ b/zscript/shockrifle.zsc
@@ -178,6 +178,70 @@ Class SuperShockBlastRing : ShockBeamRing
 	}
 }
 
+Class ShockSpark : Actor
+{
+	Default
+	{
+		RenderStyle "Add";
+		Radius 2;
+		Height 0;
+		+NOBLOCKMAP;
+		+NOGRAVITY;
+		+MISSILE;
+		+FORCEXYBILLBOARD;
+		+THRUACTORS;
+		+ROLLSPRITE;
+		+ROLLCENTER;
+		+NOTELEPORT;
+		BounceType "Doom";
+		BounceFactor 1.0;
+		WallBounceFactor 1.0;
+		Scale 0.1;
+	}
+	override void PostBeginPlay()
+	{
+		Super.PostBeginPlay();
+		if ( !bAMBUSH )
+		{
+			roll = FRandom[ASMD](0,360);
+			let s = Spawn(GetClass(),pos);
+			s.bAMBUSH = true;
+			s.vel = vel;
+			s.scale = scale;
+			s.roll = roll;
+		}
+	}
+	States
+	{
+	Spawn:
+		ASMK A 1 Bright
+		{
+			A_FadeOut(FRandom[ASMD](0.0,0.1));
+			vel *= 0.98;
+		}
+		Wait;
+	}
+}
+
+Class ShockSparkTrail : ShockSpark
+{
+	Default
+	{
+		+AMBUSH;
+	}
+	override void PostBeginPlay()
+	{
+		Super.PostBeginPlay();
+		roll = FRandom[ASMD](0,360);
+	}
+	States
+	{
+	Spawn:
+		ASMK A 1 Bright A_FadeOut(FRandom[ASMD](0.0,0.2));
+		Wait;
+	}
+}
+
 Class ShockBeam : Actor
 {
 	ShockBeamTracer t;
@@ -220,10 +284,9 @@ Class ShockBeam : Actor
 			Spawn("ShockBeamLight",Vec3Offset(tracedir.x*i,tracedir.y*i,tracedir.z*i));
 		for ( int i=0; i<t.Results.Distance; i+=2 )
 		{
-			Vector3 pofs = Level.Vec3Diff(pos,pos+tracedir*FRandom[ASMD](0,2)+(FRandom[ASMD](-.5,.5),FRandom[ASMD](-.5,.5),FRandom[ASMD](-.5,.5)));
-			A_SpawnParticle("FFFFFF",SPF_FULLBRIGHT,30,2,0,tracedir.x*i+pofs.x,tracedir.y*i+pofs.y,tracedir.z*i+pofs.z,FRandom[ASMD](-.03,.03),FRandom[ASMD](-.03,.03),FRandom[ASMD](-.03,.03),startalphaf:1,sizestep:-.1);
-			A_SpawnParticle("5020FF",SPF_FULLBRIGHT,45,4,0,tracedir.x*i+pofs.x,tracedir.y*i+pofs.y,tracedir.z*i+pofs.z,FRandom[ASMD](-.03,.03),FRandom[ASMD](-.03,.03),FRandom[ASMD](-.03,.03),startalphaf:.5,sizestep:-.1);
-			A_SpawnParticle("402080",SPF_FULLBRIGHT,60,8,0,tracedir.x*i+pofs.x,tracedir.y*i+pofs.y,tracedir.z*i+pofs.z,FRandom[ASMD](-.03,.03),FRandom[ASMD](-.03,.03),FRandom[ASMD](-.03,.03),startalphaf:.25,sizestep:-.1);
+			Vector3 pofs = tracedir*FRandom[ASMD](0,2)+(FRandom[ASMD](-.5,.5),FRandom[ASMD](-.5,.5),FRandom[ASMD](-.5,.5));
+			let s = Spawn("ShockSparkTrail",Vec3Offset(tracedir.x*i+pofs.x,tracedir.y*i+pofs.y,tracedir.z*i+pofs.z));
+			s.vel = (FRandom[ASMD](-.03,.03),FRandom[ASMD](-.03,.03),FRandom[ASMD](-.03,.03));
 		}
 		if ( totaldist >= 10000.0 )
 		{
@@ -265,10 +328,9 @@ Class ShockBeam : Actor
 				int numpt = Random[ASMD](200,300);
 				for ( int i=0; i<numpt; i++ )
 				{
-					Vector3 pvel = (FRandom[ASMD](-1,1),FRandom[ASMD](-1,1),FRandom[ASMD](-1,1)).unit()*FRandom[ASMD](2,8);
-					A_SpawnParticle("FFFFFF",SPF_FULLBRIGHT,Random[ASMD](20,80),FRandom[ASMD](1.6,4.8),0,0,0,0,pvel.x,pvel.y,pvel.z,0,0,0,1,-1,-.05);
-					A_SpawnParticle("5020FF",SPF_FULLBRIGHT,Random[ASMD](40,120),FRandom[ASMD](4.8,11.2),0,0,0,0,pvel.x,pvel.y,pvel.z,0,0,0,.5,-1,-.05);
-					A_SpawnParticle("402080",SPF_FULLBRIGHT,Random[ASMD](50,140),FRandom[ASMD](5.6,12.8),0,0,0,0,pvel.x,pvel.y,pvel.z,0,0,0,.25,-1,-.05);
+					Vector3 pvel = (FRandom[ASMD](-1,1),FRandom[ASMD](-1,1),FRandom[ASMD](-1,1)).unit()*FRandom[ASMD](1,32);
+					let s = Spawn("ShockSpark",b.pos);
+					s.vel = pvel;
 				}
 			}
 			else
@@ -314,9 +376,8 @@ Class ShockBeam : Actor
 		for ( int i=0; i<numpt; i++ )
 		{
 			Vector3 pvel = (FRandom[ASMD](-1,1),FRandom[ASMD](-1,1),FRandom[ASMD](-1,1)).unit()*FRandom[ASMD](3,12);
-			A_SpawnParticle("FFFFFF",SPF_FULLBRIGHT,Random[ASMD](20,40),FRandom[ASMD](1.6,2.4),0,0,0,0,pvel.x,pvel.y,pvel.z,0,0,0,1,-1,-.1);
-			A_SpawnParticle("5020FF",SPF_FULLBRIGHT,Random[ASMD](40,60),FRandom[ASMD](4.8,5.6),0,0,0,0,pvel.x,pvel.y,pvel.z,0,0,0,.5,-1,-.1);
-			A_SpawnParticle("402080",SPF_FULLBRIGHT,Random[ASMD](50,70),FRandom[ASMD](5.6,6.4),0,0,0,0,pvel.x,pvel.y,pvel.z,0,0,0,.25,-1,-.1);
+			let s = Spawn("ShockSpark",pos);
+			s.vel = pvel;
 		}
 	}
 	States
@@ -332,6 +393,70 @@ Class ShockBeam : Actor
 	}
 }
 
+Class SuperShockSpark : Actor
+{
+	Default
+	{
+		RenderStyle "Add";
+		Radius 2;
+		Height 0;
+		+NOBLOCKMAP;
+		+NOGRAVITY;
+		+MISSILE;
+		+FORCEXYBILLBOARD;
+		+THRUACTORS;
+		+ROLLSPRITE;
+		+ROLLCENTER;
+		+NOTELEPORT;
+		BounceType "Doom";
+		BounceFactor 1.0;
+		WallBounceFactor 1.0;
+		Scale 0.1;
+	}
+	override void PostBeginPlay()
+	{
+		Super.PostBeginPlay();
+		if ( !bAMBUSH )
+		{
+			roll = FRandom[ASMD](0,360);
+			let s = Spawn(GetClass(),pos);
+			s.bAMBUSH = true;
+			s.vel = vel;
+			s.scale = scale;
+			s.roll = roll;
+		}
+	}
+	States
+	{
+	Spawn:
+		SSMK A 1 Bright
+		{
+			A_FadeOut(FRandom[ASMD](0.0,0.1));
+			vel *= 0.98;
+		}
+		Wait;
+	}
+}
+
+Class SuperShockSparkTrail : ShockSpark
+{
+	Default
+	{
+		+AMBUSH;
+	}
+	override void PostBeginPlay()
+	{
+		Super.PostBeginPlay();
+		roll = FRandom[ASMD](0,360);
+	}
+	States
+	{
+	Spawn:
+		SSMK A 1 Bright A_FadeOut(FRandom[ASMD](0.0,0.2));
+		Wait;
+	}
+}
+
 Class SuperShockBeam : Actor
 {
 	ShockBeamTracer t;
@@ -375,10 +500,9 @@ Class SuperShockBeam : Actor
 			Spawn("SuperShockBeamLight",Vec3Offset(tracedir.x*i,tracedir.y*i,tracedir.z*i));
 		for ( int i=0; i<t.Results.Distance; i++ )
 		{
-			Vector3 pofs = Level.Vec3Diff(pos,pos+tracedir*FRandom[ASMD](0,1)+(FRandom[ASMD](-.5,.5),FRandom[ASMD](-.5,.5),FRandom[ASMD](-.5,.5)));
-			A_SpawnParticle("FFF080",SPF_FULLBRIGHT,30,2,0,tracedir.x*i+pofs.x,tracedir.y*i+pofs.y,tracedir.z*i+pofs.z,FRandom[ASMD](-.03,.03),FRandom[ASMD](-.03,.03),FRandom[ASMD](-.03,.03),startalphaf:1,sizestep:-.1);
-			A_SpawnParticle("FF5020",SPF_FULLBRIGHT,45,4,0,tracedir.x*i+pofs.x,tracedir.y*i+pofs.y,tracedir.z*i+pofs.z,FRandom[ASMD](-.03,.03),FRandom[ASMD](-.03,.03),FRandom[ASMD](-.03,.03),startalphaf:.5,sizestep:-.1);
-			A_SpawnParticle("804020",SPF_FULLBRIGHT,60,8,0,tracedir.x*i+pofs.x,tracedir.y*i+pofs.y,tracedir.z*i+pofs.z,FRandom[ASMD](-.03,.03),FRandom[ASMD](-.03,.03),FRandom[ASMD](-.03,.03),startalphaf:.25,sizestep:-.1);
+			Vector3 pofs = tracedir*FRandom[ASMD](0,2)+(FRandom[ASMD](-.5,.5),FRandom[ASMD](-.5,.5),FRandom[ASMD](-.5,.5));
+			let s = Spawn("SuperShockSparkTrail",Vec3Offset(tracedir.x*i+pofs.x,tracedir.y*i+pofs.y,tracedir.z*i+pofs.z));
+			s.vel = (FRandom[ASMD](-.03,.03),FRandom[ASMD](-.03,.03),FRandom[ASMD](-.03,.03));
 		}
 		if ( totaldist >= 10000.0 )
 		{
@@ -418,13 +542,12 @@ Class SuperShockBeam : Actor
 				r.pitch = asin(-t.Results.HitVector.z);
 				A_PlaySound("shock/blast",CHAN_WEAPON,attenuation:0.5);
 				A_PlaySound("sshock/blast",CHAN_6,attenuation:0.5);
-				int numpt = Random[ASMD](400,600);
+				int numpt = Random[ASMD](200,300);
 				for ( int i=0; i<numpt; i++ )
 				{
-					Vector3 pvel = (FRandom[ASMD](-1,1),FRandom[ASMD](-1,1),FRandom[ASMD](-1,1)).unit()*FRandom[ASMD](2,8);
-					A_SpawnParticle("FFF080",SPF_FULLBRIGHT,Random[ASMD](20,80),FRandom[ASMD](1.6,9.6),0,0,0,0,pvel.x,pvel.y,pvel.z,0,0,0,1,-1,-.05);
-					A_SpawnParticle("FF5020",SPF_FULLBRIGHT,Random[ASMD](40,120),FRandom[ASMD](4.8,22.4),0,0,0,0,pvel.x,pvel.y,pvel.z,0,0,0,.5,-1,-.05);
-					A_SpawnParticle("804020",SPF_FULLBRIGHT,Random[ASMD](50,140),FRandom[ASMD](5.6,25.6),0,0,0,0,pvel.x,pvel.y,pvel.z,0,0,0,.25,-1,-.05);
+					Vector3 pvel = (FRandom[ASMD](-1,1),FRandom[ASMD](-1,1),FRandom[ASMD](-1,1)).unit()*FRandom[ASMD](2,64);
+					let s = Spawn("SuperShockSpark",b.pos);
+					s.vel = pvel;
 				}
 			}
 			else
@@ -468,13 +591,12 @@ Class SuperShockBeam : Actor
 		A_PlaySound("shock/hit",CHAN_VOICE,attenuation:0.5);
 		A_PlaySound("sshock/blast",CHAN_6,attenuation:0.5);
 		A_AlertMonsters();
-		int numpt = Random[ASMD](40,100);
+		int numpt = Random[ASMD](20,50);
 		for ( int i=0; i<numpt; i++ )
 		{
-			Vector3 pvel = (FRandom[ASMD](-1,1),FRandom[ASMD](-1,1),FRandom[ASMD](-1,1)).unit()*FRandom[ASMD](3,12);
-			A_SpawnParticle("FFF080",SPF_FULLBRIGHT,Random[ASMD](20,40),FRandom[ASMD](1.6,4.8),0,0,0,0,pvel.x,pvel.y,pvel.z,0,0,0,1,-1,-.1);
-			A_SpawnParticle("FF5020",SPF_FULLBRIGHT,Random[ASMD](40,60),FRandom[ASMD](4.8,11.2),0,0,0,0,pvel.x,pvel.y,pvel.z,0,0,0,.5,-1,-.1);
-			A_SpawnParticle("804020",SPF_FULLBRIGHT,Random[ASMD](50,70),FRandom[ASMD](5.6,12.8),0,0,0,0,pvel.x,pvel.y,pvel.z,0,0,0,.25,-1,-.1);
+			Vector3 pvel = (FRandom[ASMD](-1,1),FRandom[ASMD](-1,1),FRandom[ASMD](-1,1)).unit()*FRandom[ASMD](3,24);
+			let s = Spawn("SuperShockSpark",pos);
+			s.vel = pvel;
 		}
 	}
 	States
@@ -683,9 +805,8 @@ Class ShockBall : Actor
 		for ( int i=0; i<numpt; i++ )
 		{
 			Vector3 pvel = (FRandom[ASMD](-1,1),FRandom[ASMD](-1,1),FRandom[ASMD](-1,1)).unit()*FRandom[ASMD](3,12);
-			A_SpawnParticle("FFFFFF",SPF_FULLBRIGHT,Random[ASMD](20,40),FRandom[ASMD](1.6,2.4),0,0,0,0,pvel.x,pvel.y,pvel.z,0,0,0,1,-1,-.1);
-			A_SpawnParticle("5020FF",SPF_FULLBRIGHT,Random[ASMD](40,60),FRandom[ASMD](4.8,5.6),0,0,0,0,pvel.x,pvel.y,pvel.z,0,0,0,.5,-1,-.1);
-			A_SpawnParticle("402080",SPF_FULLBRIGHT,Random[ASMD](50,70),FRandom[ASMD](5.6,6.4),0,0,0,0,pvel.x,pvel.y,pvel.z,0,0,0,.25,-1,-.1);
+			let s = Spawn("ShockSpark",pos);
+			s.vel = pvel;
 		}
 	}
 	Default
@@ -742,13 +863,12 @@ Class SuperShockBall : Actor
 		A_PlaySound("sshock/blast",CHAN_6,attenuation:0.5);
 		A_QuakeEx(8,8,8,30,0,300,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:0.25);
 		A_AlertMonsters();
-		int numpt = Random[ASMD](100,200);
+		int numpt = Random[ASMD](50,100);
 		for ( int i=0; i<numpt; i++ )
 		{
-			Vector3 pvel = (FRandom[ASMD](-1,1),FRandom[ASMD](-1,1),FRandom[ASMD](-1,1)).unit()*FRandom[ASMD](3,12);
-			A_SpawnParticle("FFF080",SPF_FULLBRIGHT,Random[ASMD](20,40),FRandom[ASMD](1.6,4.8),0,0,0,0,pvel.x,pvel.y,pvel.z,0,0,0,1,-1,-.1);
-			A_SpawnParticle("FF5020",SPF_FULLBRIGHT,Random[ASMD](40,60),FRandom[ASMD](4.8,11.2),0,0,0,0,pvel.x,pvel.y,pvel.z,0,0,0,.5,-1,-.1);
-			A_SpawnParticle("804020",SPF_FULLBRIGHT,Random[ASMD](50,70),FRandom[ASMD](5.6,12.8),0,0,0,0,pvel.x,pvel.y,pvel.z,0,0,0,.25,-1,-.1);
+			Vector3 pvel = (FRandom[ASMD](-1,1),FRandom[ASMD](-1,1),FRandom[ASMD](-1,1)).unit()*FRandom[ASMD](3,24);
+			let s = Spawn("SuperShockSpark",pos);
+			s.vel = pvel;
 		}
 	}
 	Default
diff --git a/zscript/utcommon.zsc b/zscript/utcommon.zsc
index 2b8842a..a57fc29 100644
--- a/zscript/utcommon.zsc
+++ b/zscript/utcommon.zsc
@@ -312,87 +312,233 @@ Class UTItemFog : Actor replaces ItemFog
 	}
 }
 
-Class UTRedSkull : RedSkull replaces RedSkull
+Class UTSpark : Actor
 {
 	Default
 	{
-		Tag "Red Skull";
-		Inventory.PickupMessage "You got the Red Skull.";
+		RenderStyle "Add";
+		Radius 2;
+		Height 0;
+		+NOBLOCKMAP;
+		+FORCEXYBILLBOARD;
+		+MISSILE;
+		+MOVEWITHSECTOR;
+		+THRUACTORS;
+		+NOTELEPORT;
+		BounceType "Doom";
+		BounceFactor 0.4;
+		Gravity 0.5;
+		Scale 0.05;
+	}
+	override void Tick()
+	{
+		Super.Tick();
+		if ( waterlevel > 0 )
+		{
+			let b = Spawn("UTBubble",pos);
+			b.vel = vel;
+			b.scale *= 0.3;
+			Destroy();
+		}
 	}
 	States
 	{
 	Spawn:
-		USKL A -1;
+		SPRK A 1 Bright A_FadeOut(0.01);
+		Wait;
+	Death:
+		SPRK A 1 Bright A_FadeOut(0.05);
+		Wait;
+	}
+}
+
+Class UTChip : Actor
+{
+	int deadtimer;
+	double rollvel, anglevel, pitchvel;
+
+	Default
+	{
+		Radius 2;
+		Height 0;
+		+NOBLOCKMAP;
+		+MISSILE;
+		+MOVEWITHSECTOR;
+		+THRUACTORS;
+		+NOTELEPORT;
+		BounceType "Doom";
+		BounceFactor 0.3;
+		Gravity 0.7;
+		Scale 0.2;
+	}
+	override void PostBeginPlay()
+	{
+		Super.PostBeginPlay();
+		deadtimer = 0;
+		anglevel = FRandom[Junk](10,30)*RandomPick[Junk](-1,1);
+		pitchvel = FRandom[Junk](10,30)*RandomPick[Junk](-1,1);
+		rollvel = FRandom[Junk](10,30)*RandomPick[Junk](-1,1);
+		frame = Random[Junk](0,3);
+		scale *= Frandom[Junk](0.8,1.2);
+	}
+	override void Tick()
+	{
+		Super.Tick();
+		if ( level.frozen || globalfreeze ) return;
+		if ( InStateSequence(CurState,ResolveState("Death")) )
+		{
+			deadtimer++;
+			if ( deadtimer > 300 ) A_FadeOut(0.05);
+			return;
+		}
+	}
+	States
+	{
+	Spawn:
+		CHIP # 1
+		{
+			A_SetAngle(angle+anglevel,SPF_INTERPOLATE);
+			A_SetPitch(pitch+pitchvel,SPF_INTERPOLATE);
+			A_SetRoll(roll+rollvel,SPF_INTERPOLATE);
+		}
+		Loop;
+	Bounce:
+		CHIP # 0
+		{
+			anglevel = FRandom[Junk](10,30)*RandomPick[Junk](-1,1);
+			pitchvel = FRandom[Junk](10,30)*RandomPick[Junk](-1,1);
+			rollvel = FRandom[Junk](10,30)*RandomPick[Junk](-1,1);
+		}
+		Goto Spawn;
+	Death:
+		CHIP # -1;
+		Stop;
+	Dummy:
+		CHIP ABCD -1;
 		Stop;
 	}
 }
-Class UTGoldSkull : YellowSkull replaces YellowSkull
+
+Class UTBubble : Actor
 {
 	Default
 	{
-		Tag "Gold Skull";
-		Inventory.PickupMessage "You got the Gold Skull.";
+		RenderStyle "Add";
+		Radius 2;
+		Height 0;
+		+NOBLOCKMAP;
+		+NOGRAVITY;
+		+DONTSPLASH;
+		+FORCEXYBILLBOARD;
+		+NOTELEPORT;
+		Scale 0.05;
+	}
+	override void PostBeginPlay()
+	{
+		Super.PostBeginPlay();
+		double ang, pt;
+		scale *= FRandom[Puff](0.5,1.5);
+		ang = FRandom[Puff](0,360);
+		pt = FRandom[Puff](-90,90);
+		vel += (cos(pt)*cos(ang),cos(pt)*sin(ang),-sin(pt))*FRandom[Puff](0.2,0.8);
+		if ( waterlevel <= 0 ) Destroy();
+		SetState(ResolveState("Spawn")+Random[Puff](0,2));
+	}
+	override void Tick()
+	{
+		Super.Tick();
+		if ( level.frozen || globalfreeze ) return;
+		vel *= 0.96;
+		vel.z += 0.05;
+		if ( (waterlevel <= 0) || !Random[Puff](0,100) ) Destroy();
 	}
 	States
 	{
 	Spawn:
-		USKL B -1;
+		BUBL ABC -1;
 		Stop;
 	}
 }
-Class UTBlueSkull : BlueSkull replaces BlueSkull
+
+Class UTSmoke : Actor
 {
 	Default
 	{
-		Tag "Blue Skull";
-		Inventory.PickupMessage "You got the Blue Skull.";
+		RenderStyle "Shaded";
+		StencilColor "FFFFFF";
+		Radius 2;
+		Height 0;
+		+NOBLOCKMAP;
+		+NOGRAVITY;
+		+DONTSPLASH;
+		+FORCEXYBILLBOARD;
+		+THRUACTORS;
+		+NOTELEPORT;
+		BounceType "Hexen";
+		BounceFactor 1.0;
+		WallBounceFactor 1.0;
+		Scale 0.5;
 	}
+
+	override void PostBeginPlay()
+	{
+		Super.PostBeginPlay();
+		double ang, pt;
+		scale *= FRandom[Puff](0.5,1.5);
+		alpha *= FRandom[Puff](0.5,1.5);
+		ang = FRandom[Puff](0,360);
+		pt = FRandom[Puff](-90,90);
+		vel += (cos(pt)*cos(ang),cos(pt)*sin(ang),-sin(pt))*FRandom[Puff](0.2,0.8);
+	}
+	override void Tick()
+	{
+		Super.Tick();
+		if ( level.frozen || globalfreeze ) return;
+		vel *= 0.96;
+		vel.z += 0.01;
+		A_FadeOut(1/32.);
+		if ( waterlevel > 0 )
+		{
+			let b = Spawn("UTBubble",pos);
+			b.vel = vel;
+			Destroy();
+		}
+	}
+
 	States
 	{
 	Spawn:
-		USKL C -1;
+		TNT1 A 0 NoDelay A_Jump(255,"US1","US2","US3","US4","US5","US6","US7","US8","US9","US10");
 		Stop;
-	}
-}
-Class UTRedKey : RedCard replaces RedCard
-{
-	Default
-	{
-		Tag "Red Key";
-		Inventory.PickupMessage "You got the Red Key.";
-	}
-	States
-	{
-	Spawn:
-		UKEY A -1;
+	US1:
+		US1_ ABCDEFGHIJKLMNOP 2;
 		Stop;
-	}
-}
-Class UTGoldKey : YellowCard replaces YellowCard
-{
-	Default
-	{
-		Tag "Gold Key";
-		Inventory.PickupMessage "You got the Gold Key.";
-	}
-	States
-	{
-	Spawn:
-		UKEY B -1;
+	US2:
+		US2_ ABCDEFGHIJKLMNOP 2;
 		Stop;
-	}
-}
-Class UTBlueKey : BlueCard replaces BlueCard
-{
-	Default
-	{
-		Tag "Blue Key";
-		Inventory.PickupMessage "You got the Blue Key.";
-	}
-	States
-	{
-	Spawn:
-		UKEY C -1;
+	US3:
+		US3_ ABCDEFGHIJKLMNOP 2;
+		Stop;
+	US4:
+		US4_ ABCDEFGHIJKLMNO 2;
+		Stop;
+	US5:
+		US5_ ABCDEFGHIJKLMNO 2;
+		Stop;
+	US6:
+		US6_ ABCDEFGHIJKLMNOP 2;
+		Stop;
+	US7:
+		US7_ ABCDEFGHIJKLMNOP 2;
+		Stop;
+	US8:
+		US8_ ABCDEFGHIJKLMNOP 2;
+		Stop;
+	US9:
+		US9_ ABCDEFGHIJKLMNOP 2;
+		Stop;
+	US10:
+		US10 ABCDEFGHIJKLMNOP 2;
 		Stop;
 	}
 }
@@ -435,12 +581,10 @@ Class QueuedFlash
 Class UTMainHandler : StaticEventHandler
 {
 	ui TextureID tex;
-	transient int lastfrag;
 	Array<QueuedFlash> flashes;
 
 	override void WorldLoaded( WorldEvent e )
 	{
-		lastfrag = int.min;
 		if ( gamestate != GS_LEVEL || e.IsSaveGame ) return;
 		if ( level.levelname ~== "Modder Test Map" )
 		{
@@ -489,8 +633,6 @@ Class UTMainHandler : StaticEventHandler
 			StatusBar.AttachMessage(gf,0,BaseStatusBar.HUDMSGLayer_UnderHUD);
 		}
 		if ( gametic <= 0 ) StartMenu();
-		if ( !(StatusBar is 'UTHUD') ) return;
-		UTHUD(StatusBar).lastfrag = lastfrag;
 	}
 
 	override void RenderOverlay( RenderEvent e )
@@ -501,12 +643,6 @@ Class UTMainHandler : StaticEventHandler
 		Screen.DrawTexture(tex,true,0,0,DTA_VirtualWidth,1024,DTA_VirtualHeight,768);
 	}
 
-	override void WorldThingDamaged( WorldEvent e )
-	{
-		if ( (e.Thing.Health <= 0) && e.DamageSource && (e.DamageSource != e.Thing) && e.DamageSource.player && (e.DamageSource.player == players[consoleplayer]) )
-			lastfrag = gametic;
-	}
-
 	static void DoFlash( Actor camera, Color c, int duration )
 	{
 		QueuedFlash qf = new("QueuedFlash");
diff --git a/zscript/uthud.zsc b/zscript/uthud.zsc
index 817ae9f..cd635d2 100644
--- a/zscript/uthud.zsc
+++ b/zscript/uthud.zsc
@@ -28,7 +28,7 @@ Class UTHud : BaseStatusBar
 	double HScale;
 	Color tintcolor, bgcolor;
 	double opacity;
-	int lastfrag, lastpickup, lastslot;
+	int lastfrag, lastfragcnt, lastpickup, lastslot;
 	ViewTracer vtracer;
 	Actor lastseen;
 	int lastseentic;
@@ -42,6 +42,8 @@ Class UTHud : BaseStatusBar
 	{
 		Super.Init();
 		SetSize(0,320,200);
+		lastfrag = int.min;
+		lastfragcnt = 0;
 		vtracer = new("ViewTracer");
 		// Set defaults
 		DrawColor = WhiteColor = "White";
@@ -310,7 +312,7 @@ Class UTHud : BaseStatusBar
 		double WeaponOffset = 128*WeapScale;
 		let cw = CPlayer.ReadyWeapon;
 		let pw = CPlayer.PendingWeapon;
-		if ( cw )
+		if ( cw && (cw.SlotNumber != -1) )
 		{
 			int slot = cw.SlotNumber?(cw.SlotNumber-1):9;
 			CurX = BaseX+slot*WeaponOffset;
@@ -320,7 +322,7 @@ Class UTHud : BaseStatusBar
 			CurY = BaseY;
 			UTDrawPlainTex(WeaponBox,0.8);
 		}
-		if ( pw && (pw != WP_NOCHANGE) )
+		if ( pw && (pw.SlotNumber != -1) && (pw != WP_NOCHANGE) )
 		{
 			int slot = pw.SlotNumber?(pw.SlotNumber-1):9;
 			CurX = BaseX+slot*WeaponOffset-64*WeapScale;
@@ -333,6 +335,7 @@ Class UTHud : BaseStatusBar
 		{
 			if ( !(i is 'Weapon') ) continue;
 			let w = Weapon(i);
+			if ( w.SlotNumber == -1 ) continue;
 			int slot = w.SlotNumber?(w.SlotNumber-1):9;
 			if ( !wslots[slot] ) wslots[slot] = w;
 			else if ( (wslots[slot] != cw) && ((wslots[slot] != pw)
@@ -344,14 +347,10 @@ Class UTHud : BaseStatusBar
 			CurX = BaseX+i*WeaponOffset;
 			CurY = BaseY;
 			if ( !wslots[i] )
-			{
 				UTDrawTintedTex(Slots[i],1.6,tintcolor/2);
-			}
 			else if ( wslots[i] != cw )
-			{
 				if ( !UTDrawWeaponIcon(wslots[i],false,wslots[i]==pw,0.8) )
 					UTDrawTintedTex(Slots[i],1.6,tintcolor/2);
-			}
 		}
 		for ( int i=0; i<10; i++ )
 		{
@@ -471,6 +470,16 @@ Class UTHud : BaseStatusBar
 	override void Tick()
 	{
 		Super.Tick();
+		if ( deathmatch||teamplay )
+		{
+			if ( CPlayer.fragcount != lastfragcnt ) lastfrag = gametic;
+			lastfragcnt = CPlayer.fragcount;
+		}
+		else
+		{
+			if ( CPlayer.killcount != lastfragcnt ) lastfrag = gametic;
+			lastfragcnt = CPlayer.killcount;
+		}
 		vtracer.ignore = CPlayer.mo;
 		vtracer.trace(CPlayer.mo.Vec2OffsetZ(0,0,CPlayer.viewz),CPlayer.mo.CurSector,(cos(CPlayer.mo.angle)*cos(CPlayer.mo.pitch),sin(CPlayer.mo.angle)*cos(CPlayer.mo.pitch),-sin(CPlayer.mo.pitch)),1000,0);
 		if ( vtracer.Results.HitType != TRACE_HitActor ) return;
diff --git a/zscript/warheadlauncher.zsc b/zscript/warheadlauncher.zsc
index a1d61ce..8985e32 100644
--- a/zscript/warheadlauncher.zsc
+++ b/zscript/warheadlauncher.zsc
@@ -192,6 +192,48 @@ Class WarheadLight : DynamicLight
 	}
 }
 
+Class WarheadTrail : Actor
+{
+	Default
+	{
+		RenderStyle "Add";
+		Radius 0.1;
+		Height 0;
+		+NOGRAVITY;
+		+NOCLIP;
+		+DONTSPLASH;
+		+FORCEXYBILLBOARD;
+		+ROLLSPRITE;
+		+ROLLCENTER;
+		Scale 0.2;
+	}
+
+	override void PostBeginPlay()
+	{
+		Super.PostBeginPlay();
+		double ang, pt;
+		scale *= FRandom[Puff](0.5,1.5);
+		alpha *= FRandom[Puff](0.5,1.5);
+		ang = FRandom[Puff](0,360);
+		pt = FRandom[Puff](-90,90);
+		vel += (cos(pt)*cos(ang),cos(pt)*sin(ang),-sin(pt))*FRandom[Puff](0.2,0.8);
+		roll = FRandom[Puff](0,360);
+	}
+	override void Tick()
+	{
+		Super.Tick();
+		if ( level.frozen || globalfreeze ) return;
+		vel *= 0.99;
+		A_FadeOut(0.1);
+	}
+	States
+	{
+	Spawn:
+		RTRL A -1 Bright;
+		Stop;
+	}
+}
+
 Class WarShell : Actor
 {
 	double destangle, destpitch;
@@ -245,14 +287,24 @@ Class WarShell : Actor
 		Vector3 taildir = -(cos(angle)*cos(pitch),sin(angle)*cos(pitch),-sin(pitch));
 		if ( waterlevel > 0 )
 		{
-			for ( int i=0; i<8; i++ )
-				A_SpawnParticle("6060FF",0,Random[Warhead](10,30),FRandom[Warhead](2,4),0,taildir.x*32,taildir.y*32,taildir.z*32,taildir.x*2+FRandom[Warhead](-.5,.5),taildir.y*2+FRandom[Warhead](-.5,.5),taildir.z*2+FRandom[Warhead](-.5,.5),accelz:0.2,fadestepf:0);
+			for ( int i=0; i<4; i++ )
+			{
+				let s = Spawn("UTBubble",pos+taildir*32+(FRandom[Warhead](-.5,.5),FRandom[Warhead](-.5,.5),FRandom[Warhead](-.5,.5)));
+				s.vel = taildir*2;
+			}
 			return;
 		}
-		for ( int i=0; i<8; i++ )
-			A_SpawnParticle("404040",0,20,2,0,taildir.x*32,taildir.y*32,taildir.z*32,taildir.x*2+FRandom[Warhead](-.5,.5),taildir.y*2+FRandom[Warhead](-.5,.5),taildir.z*2+FRandom[Warhead](-.5,.5),accelz:0.1,sizestep:1);
-		for ( int i=0; i<8; i++ )
-			A_SpawnParticle("FFA020",SPF_FULLBRIGHT,10,6,0,taildir.x*35+FRandom[Warhead](-1,1),taildir.y*35+FRandom[Warhead](-1,1),taildir.z*35+FRandom[Warhead](-1,1),taildir.x*4+FRandom[Warhead](-.25,.25),taildir.y*4+FRandom[Warhead](-.25,.25),taildir.z*4+FRandom[Warhead](-.25,.25));
+		for ( int i=0; i<4; i++ )
+		{
+			let s = Spawn("UTSmoke",pos+taildir*32+(FRandom[Warhead](-.5,.5),FRandom[Warhead](-.5,.5),FRandom[Warhead](-.5,.5)));
+			s.vel = taildir*2;
+			s.SetShade("404040");
+		}
+		for ( int i=0; i<4; i++ )
+		{
+			let s = Spawn("WarheadTrail",pos+taildir*35+(FRandom[Warhead](-1,1),FRandom[Warhead](-1,1),FRandom[Warhead](-1,1)));
+			s.vel = taildir*4;
+		}
 	}
 	action void A_Vaporize()
 	{
@@ -545,7 +597,9 @@ Class WarheadLauncher : UTWeapon replaces BFG9000
 		for ( int i=0; i<numpt; i++ )
 		{
 			Vector3 pvel = (x+(FRandom[Warhead](-.8,.8),FRandom[Warhead](-.8,.8),FRandom[Warhead](-.8,.8))).unit()*FRandom[Warhead](1,2);
-			A_SpawnParticle(Color(1,1,1)*Random[Warhead](32,128),0,Random[Warhead](40,50),FRandom[Warhead](4,12),0,origin.x-pos.x,origin.y-pos.y,origin.z-pos.z,pvel.x,pvel.y,pvel.z,0,0,0.03,0.5,-1,0.5);
+			let s = Spawn("UTSmoke",origin);
+			s.vel = pvel;
+			s.SetShade(Color(1,1,1)*Random[Warhead](32,128));
 		}
 	}
 	action void A_WarheadAlt()