diff --git a/engine/client/r_partset.c b/engine/client/r_partset.c
index 8dde42197..7bc666a61 100644
--- a/engine/client/r_partset.c
+++ b/engine/client/r_partset.c
@@ -9,7 +9,7 @@ char *particle_set_spikeset =
 "r_part rockettrail\n"
 "{\n" 
 "texture \"particles/smoke.tga\"\n"
-"count 0.25\n"
+"step 4\n"
 "scale 30\n"
 "alpha 0.3\n"
 "die 1.4\n"
@@ -25,7 +25,7 @@ char *particle_set_spikeset =
 "r_part t_rocket\n"
 "{\n" 
 "texture \"particles/rfire\"\n"
-"count 0.5\n"
+"step 2\n"
 "scale 10\n"
 "alpha 0.6\n"
 "die 0.25\n"
@@ -198,10 +198,10 @@ char *particle_set_spikeset =
 "r_part te_lightningblood\n"
 "{\n" 
 "texture \"particles/bloodtrail\"\n"
-"count 1\n"
-"scale 15\n"
-"alpha 0.3\n"
-"die 10\n"
+"count 3\n"
+"scale 20\n"
+"alpha 0.4\n"
+"die 2\n"
 "randomvel 32\n"
 "veladd 32\n"
 "rgb 192 0 0\n"
@@ -332,12 +332,27 @@ char *particle_set_spikeset =
 "assoc expgib\n"
 "}\n" 
 
-"r_part gunshotsparks\n"
+"r_part gunshotsmoke\n"
+"{\n" 
+"texture \"particles/smoke\"\n"
+"count 3\n"
+"scale 25\n"
+"scalefactor 1\n"
+"die 0.8\n"
+"alpha 0.12\n"
+"rgb 32 32 32\n"
+"blend add\n"
+"spawnmode ball\n"
+"spawnorg 2\n"
+"spawnvel 20\n"
+"veladd -20\n"
+"}\n" 
+
+"r_part te_gunshot\n"
 "{\n" 
-"scalefactor -3\n"
 "type texturedspark\n"
 "texture \"ball\"\n"
-"count 5\n"
+"count 3\n"
 "scale 2\n"
 "scalefactor 1\n"
 "alpha 0.5\n"
@@ -350,23 +365,37 @@ char *particle_set_spikeset =
 "veladd -80\n"
 "friction 0.3\n"
 "gravity 400\n"
+"assoc gunshotsmoke\n"
 "}\n" 
 
-"r_part te_gunshot\n"
+"r_part spikecore\n"
 "{\n" 
-"texture \"particles/smoke\"\n"
-"count 3\n"
-"scale 25\n"
+"texture \"ball\"\n"
+"count 1\n"
+"scale 1\n"
 "scalefactor 1\n"
-"die 0.8\n"
-"alpha 0.12\n"
-"rgb 64 64 64\n"
-"spawnmode ball\n"
-"spawnorg 2\n"
-"spawnvel 20\n"
-"veladd -20\n"
+"scaledelta 190\n"
+"die 0.1\n"
+"alpha 0.6\n"
+"rgb 255 128 0\n"
 "blend add\n"
-"assoc gunshotsparks\n"
+"assoc gunshotsmoke\n"
+"}\n" 
+
+"r_part te_spike\n"
+"{\n" 
+"type sparkfan\n"
+"count 10\n"
+"scale 1\n"
+"scalefactor 1\n"
+"alpha 0.5\n"
+"die 0.2\n"
+"rgb 255 128 0\n"
+"blend add\n"
+"spawnmode ball\n"
+"spawnorg 12\n"
+"spawnvel 300\n"
+"assoc spikecore\n"
 "}\n" 
 
 "r_part te_lavasplash\n"
@@ -1165,22 +1194,6 @@ char *particle_set_highfps =
 "spawnvel 48 8\n"
 "}\n" 
 
-"r_part te_gunshotsparks\n"
-"{\n" 
-"texture \"particles/spark\"\n"
-"count 1\n"
-"scale 3\n"
-"alpha 0.7\n"
-"die 0.5\n"
-"randomvel 64\n"
-"rgb 255 128 0\n"
-"red 255\n"
-"green 128\n"
-"blend add\n"
-"cliptype te_gunshotsparks\n"
-"clipcount 1\n"
-"}\n" 
-
 "r_part te_gunshot\n"
 "{\n" 
 "texture \"particles/spark\"\n"
@@ -1190,10 +1203,7 @@ char *particle_set_highfps =
 "die 0.5\n"
 "randomvel 64\n"
 "rgb 255 128 0\n"
-"cliptype te_gunshotsparks\n"
-"clipcount 1\n"
 "blend add\n"
-"assoc te_gunshotsparks\n"
 "}\n" 
 
 "r_part te_lavasplash\n"
diff --git a/engine/partcfgs/highfps.cfg b/engine/partcfgs/highfps.cfg
index f5d1114c3..289943e01 100644
--- a/engine/partcfgs/highfps.cfg
+++ b/engine/partcfgs/highfps.cfg
@@ -130,22 +130,6 @@ r_part te_blob
 	spawnvel 48 8
 }
 
-r_part te_gunshotsparks
-{
-	texture "particles/spark"
-	count	1
-	scale 3
-	alpha 0.7
-	die 0.5
-	randomvel 64
-	rgb 255 128 0
-	red 255
-	green 128
-	blend add
-	cliptype te_gunshotsparks
-	clipcount 1
-}
-
 r_part te_gunshot
 {
 	texture "particles/spark"
@@ -155,10 +139,7 @@ r_part te_gunshot
 	die 0.5
 	randomvel 64
 	rgb 255 128 0
-	cliptype te_gunshotsparks
-	clipcount 1
 	blend add
-	assoc te_gunshotsparks
 }
 
 r_part te_lavasplash
diff --git a/engine/partcfgs/spikeset.cfg b/engine/partcfgs/spikeset.cfg
index 02d5498e7..b1ec9b8ef 100644
--- a/engine/partcfgs/spikeset.cfg
+++ b/engine/partcfgs/spikeset.cfg
@@ -6,7 +6,7 @@
 r_part rockettrail
 {
 	texture "particles/smoke.tga"
-	count 0.25
+	step 4
 	scale 30
 	alpha 0.3
 	die 1.4
@@ -22,7 +22,7 @@ r_part rockettrail
 r_part t_rocket
 {
 	texture "particles/rfire"
-	count 0.5
+	step 2
 	scale 10
 	alpha 0.6
 	die 0.25
@@ -195,10 +195,10 @@ r_part t_tracer3
 r_part te_lightningblood
 {
 	texture "particles/bloodtrail"
-	count 1
-	scale 15
-	alpha 0.3
-	die 10
+	count 3
+	scale 20
+	alpha 0.4
+	die 2
 	randomvel 32
 	veladd 32
 	rgb 192 0 0
@@ -329,12 +329,27 @@ r_part te_explosion
 	assoc expgib
 }
 
-r_part gunshotsparks
+r_part gunshotsmoke
+{
+	texture "particles/smoke"
+	count 3
+	scale 25
+	scalefactor 1
+	die 0.8
+	alpha 0.12
+	rgb 32 32 32
+	blend add
+	spawnmode ball
+	spawnorg	2
+	spawnvel	20
+	veladd -20
+}
+
+r_part te_gunshot
 {
-	scalefactor -3
 	type texturedspark
 	texture "ball"
-	count 5
+	count 3
 	scale 2
 	scalefactor 1
 	alpha 0.5
@@ -347,23 +362,37 @@ r_part gunshotsparks
 	veladd -80
 	friction 0.3
 	gravity 400
+	assoc gunshotsmoke
 }
 
-r_part te_gunshot
+r_part spikecore
 {
-	texture "particles/smoke"
-	count 3
-	scale 25
+	texture "ball"
+	count 1
+	scale 1
 	scalefactor 1
-	die 0.8
-	alpha 0.12
-	rgb 64 64 64
-	spawnmode ball
-	spawnorg	2
-	spawnvel	20
-	veladd -20
+	scaledelta 190
+	die 0.1
+	alpha 0.6
+	rgb 255 128 0
 	blend add
-	assoc gunshotsparks
+	assoc gunshotsmoke
+}
+
+r_part te_spike
+{
+	type sparkfan
+	count 10
+	scale 1
+	scalefactor 1
+	alpha 0.5
+	die 0.2
+	rgb 255 128 0
+	blend add
+	spawnmode ball
+	spawnorg 12
+	spawnvel 300
+	assoc spikecore
 }
 
 r_part te_lavasplash