Merged engine_trail and engine_exhaust.

27 files changed, 582 insertions, 608 deletions

diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index bf61dbe..d24279b 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -382,6 +382,24 @@ turn    = 8
 roll    = 15
 
 [ship]
+label=oldlancer
+name=Lancer mkI
+template=ship_small
+model=maps/colonial/oldlancer
+jumpdrive=no
+price=28000
+cargo=12
+
+thrust  = 1.8
+impulse = 9.95
+strafe  = 0.3
+turn    = 7
+roll    = 12
+
+info=
+info=
+
+[ship]
 label=lancer
 name=Lancer mkII
 template=ship_medium
diff --git a/base/maps/colonial/lancer.map b/base/maps/colonial/lancer.map
index e43cf37..d4127d4 100644
--- a/base/maps/colonial/lancer.map
+++ b/base/maps/colonial/lancer.map
@@ -4324,36 +4324,20 @@ glass/plain
 // entity 17
 {
 "classname" "fx_particles"
-"origin" "-188.000000 0.000000 4.000000"
-"angle" "-179.999985"
-"script" "engine_trail"
-"scale" "0.5"
-}
-// entity 18
-{
-"classname" "fx_particles"
 "origin" "-192.000000 0.000000 4.000000"
 "angle" "-179.999985"
 "script" "engine_exhaust"
 "spawnflags" "4"
 "scale" "0.5"
 }
-// entity 19
+// entity 18
 {
 "classname" "light"
 "origin" "-196.000000 40.000000 -2.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 20
-{
-"classname" "fx_particles"
-"origin" "-188.000000 36.000000 0.000000"
-"angle" "-179.999985"
-"script" "engine_trail"
-"scale" "0.5"
-}
-// entity 21
+// entity 19
 {
 "classname" "fx_particles"
 "origin" "-192.000000 36.000000 0.000000"
@@ -4362,14 +4346,14 @@ glass/plain
 "spawnflags" "4"
 "scale" "0.5"
 }
-// entity 22
+// entity 20
 {
 "classname" "light"
 "origin" "-196.000000 -36.000000 0.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 23
+// entity 21
 {
 "classname" "fx_particles"
 "origin" "-192.000000 -36.000000 0.000000"
@@ -4378,43 +4362,35 @@ glass/plain
 "spawnflags" "4"
 "scale" "0.5"
 }
-// entity 24
-{
-"classname" "fx_particles"
-"origin" "-188.000000 -36.000000 0.000000"
-"angle" "-179.999985"
-"script" "engine_trail"
-"scale" "0.5"
-}
-// entity 25
+// entity 22
 {
 "classname" "light"
 "origin" "-196.000000 -32.000000 2.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 26
+// entity 23
 {
 "classname" "light"
 "origin" "-196.000000 36.000000 0.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 27
+// entity 24
 {
 "classname" "light"
 "origin" "-196.000000 -40.000000 -2.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 28
+// entity 25
 {
 "classname" "light"
 "origin" "-196.000000 32.000000 2.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 29
+// entity 26
 {
 "classname" "light"
 "origin" "-196.000000 0.000000 4.000000"
diff --git a/base/maps/colonial/oldlancer.map b/base/maps/colonial/oldlancer.map
index 302bbd5..d64d3a0 100644
--- a/base/maps/colonial/oldlancer.map
+++ b/base/maps/colonial/oldlancer.map
@@ -167,9 +167,9 @@ colors/grey50
 ( -40 80 -64 ) ( -50 80 -64 ) ( -40 80 64 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
 ( -64 96 -48 ) ( -64 62 -34 ) ( 64 96 -48 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
 ( 64 96 -46 ) ( -64 66 -28 ) ( -64 96 -46 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( 8 80 64 ) ( 0 96 -64 ) ( 8 80 -64 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
 ( -48 96 64 ) ( -32 66 -64 ) ( -48 96 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 64 84 -42 ) ( -64 84 -36 ) ( -64 84 -42 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
+( 3 82 -64 ) ( 4 80 -64 ) ( 3 82 64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 }
 // brush 15
 {
@@ -238,12 +238,12 @@ colors/grey50
 }
 // brush 22
 {
-( -80 23 -18 ) ( -134 17 -18 ) ( -134 23 -18 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( -80 104 -18 ) ( -84 104 -26 ) ( -80 -24 -18 ) thorn/panel_01_bright 0 0 0 0.5 0.5 0 0 0
-( -82 18 -22 ) ( -130 22 -22 ) ( -130 18 -22 ) thorn/panel_01_bright 0 0 0 0.5 0.5 0 0 0
-( -80 23 -18 ) ( -134 23 -18 ) ( -130 22 -22 ) thorn/panel_01_bright 0 0 0 0.5 0.5 0 0 0
-( -80 17 -18 ) ( -130 18 -22 ) ( -134 17 -18 ) thorn/panel_01_bright 0 0 0 0.5 0.5 0 0 0
-( -130 18 -22 ) ( -134 23 -18 ) ( -134 17 -18 ) thorn/panel_01_bright 0 0 0 0.5 0.5 0 0 0
+( -80 23 -18 ) ( -134 17 -18 ) ( -134 23 -18 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( -80 104 -18 ) ( -84 104 -26 ) ( -80 -24 -18 ) thorn/panel_01_bright 0 0 0 0.5 0.5 134217728 0 0
+( -82 18 -22 ) ( -130 22 -22 ) ( -130 18 -22 ) thorn/panel_01_bright 0 0 0 0.5 0.5 134217728 0 0
+( -80 23 -18 ) ( -134 23 -18 ) ( -130 22 -22 ) thorn/panel_01_bright 0 0 0 0.5 0.5 134217728 0 0
+( -80 17 -18 ) ( -130 18 -22 ) ( -134 17 -18 ) thorn/panel_01_bright 0 0 0 0.5 0.5 134217728 0 0
+( -130 18 -22 ) ( -134 23 -18 ) ( -134 17 -18 ) thorn/panel_01_bright 0 0 0 0.5 0.5 134217728 0 0
 }
 // brush 23
 {
@@ -591,12 +591,12 @@ colors/grey50
 }
 // brush 59
 {
-( -80 -17 -18 ) ( -134 -23 -18 ) ( -134 -17 -18 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( -80 64 -18 ) ( -84 64 -26 ) ( -80 -64 -18 ) thorn/panel_01_bright 0 0 0 0.5 0.5 0 0 0
-( -82 -22 -22 ) ( -130 -18 -22 ) ( -130 -22 -22 ) thorn/panel_01_bright 0 0 0 0.5 0.5 0 0 0
-( -80 -17 -18 ) ( -134 -17 -18 ) ( -130 -18 -22 ) thorn/panel_01_bright 0 0 0 0.5 0.5 0 0 0
-( -80 -23 -18 ) ( -130 -22 -22 ) ( -134 -23 -18 ) thorn/panel_01_bright 0 0 0 0.5 0.5 0 0 0
-( -130 -22 -22 ) ( -134 -17 -18 ) ( -134 -23 -18 ) thorn/panel_01_bright 0 0 0 0.5 0.5 0 0 0
+( -80 -17 -18 ) ( -134 -23 -18 ) ( -134 -17 -18 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( -80 64 -18 ) ( -84 64 -26 ) ( -80 -64 -18 ) thorn/panel_01_bright 0 0 0 0.5 0.5 134217728 0 0
+( -82 -22 -22 ) ( -130 -18 -22 ) ( -130 -22 -22 ) thorn/panel_01_bright 0 0 0 0.5 0.5 134217728 0 0
+( -80 -17 -18 ) ( -134 -17 -18 ) ( -130 -18 -22 ) thorn/panel_01_bright 0 0 0 0.5 0.5 134217728 0 0
+( -80 -23 -18 ) ( -130 -22 -22 ) ( -134 -23 -18 ) thorn/panel_01_bright 0 0 0 0.5 0.5 134217728 0 0
+( -130 -22 -22 ) ( -134 -17 -18 ) ( -134 -23 -18 ) thorn/panel_01_bright 0 0 0 0.5 0.5 134217728 0 0
 }
 // brush 60
 {
@@ -721,43 +721,43 @@ colors/grey50
 }
 // brush 72
 {
-( -20 18 -42 ) ( -20 -18 -42 ) ( -28 18 -42 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( -28 -18 -46 ) ( -20 -18 -46 ) ( -28 18 -46 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -54 64 -46 ) ( -56 64 -42 ) ( -54 -64 -46 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -20 64 -42 ) ( -22 64 -44 ) ( -20 -64 -42 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -64 12 -42 ) ( -64 10 -44 ) ( 64 12 -42 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -64 -10 -44 ) ( -64 -12 -42 ) ( 64 -10 -44 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
+( -20 18 -42 ) ( -20 -18 -42 ) ( -28 18 -42 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( -28 -18 -46 ) ( -20 -18 -46 ) ( -28 18 -46 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -54 64 -46 ) ( -56 64 -42 ) ( -54 -64 -46 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -20 64 -42 ) ( -22 64 -44 ) ( -20 -64 -42 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -64 12 -42 ) ( -64 10 -44 ) ( 64 12 -42 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -64 -10 -44 ) ( -64 -12 -42 ) ( 64 -10 -44 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
 }
 // brush 73
 {
-( 16 12 -44 ) ( 16 12 -46 ) ( 16 -12 -44 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( 16 64 -42 ) ( -22 64 -44 ) ( 16 -64 -42 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -22 6 -64 ) ( 16 4 -64 ) ( -22 6 64 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( 16 -4 -64 ) ( -22 -6 -64 ) ( 16 -4 64 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -22 64 -44 ) ( -20 64 -42 ) ( -22 -64 -44 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( -20 64 -42 ) ( 16 64 -40 ) ( -20 -64 -42 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 16 12 -44 ) ( 16 12 -46 ) ( 16 -12 -44 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( 16 64 -42 ) ( -22 64 -44 ) ( 16 -64 -42 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -22 6 -64 ) ( 16 4 -64 ) ( -22 6 64 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( 16 -4 -64 ) ( -22 -6 -64 ) ( 16 -4 64 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -22 64 -44 ) ( -20 64 -42 ) ( -22 -64 -44 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( -20 64 -42 ) ( 16 64 -40 ) ( -20 -64 -42 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 // brush 74
 {
-( -67 -18 -38 ) ( -61 18 -38 ) ( -67 18 -38 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -80 18 -34 ) ( -80 -18 -38 ) ( -80 18 -38 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( -62 64 -34 ) ( -61 -64 -38 ) ( -62 -64 -34 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 64 -16 -33 ) ( -64 -16 -36 ) ( -64 -16 -33 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( 64 -12 -38 ) ( -64 -12 -35 ) ( -64 -12 -38 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -80 64 -36 ) ( -62 -64 -34 ) ( -80 -64 -36 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( 64 -16 -37 ) ( -64 -15 -38 ) ( -64 -16 -37 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( 64 -13 -38 ) ( -64 -12 -37 ) ( -64 -13 -38 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
+( -67 -18 -38 ) ( -61 18 -38 ) ( -67 18 -38 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -80 18 -34 ) ( -80 -18 -38 ) ( -80 18 -38 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( -62 64 -34 ) ( -61 -64 -38 ) ( -62 -64 -34 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( 64 -16 -33 ) ( -64 -16 -36 ) ( -64 -16 -33 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( 64 -12 -38 ) ( -64 -12 -35 ) ( -64 -12 -38 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -80 64 -36 ) ( -62 -64 -34 ) ( -80 -64 -36 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( 64 -16 -37 ) ( -64 -15 -38 ) ( -64 -16 -37 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( 64 -13 -38 ) ( -64 -12 -37 ) ( -64 -13 -38 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
 }
 // brush 75
 {
-( -67 -18 -38 ) ( -61 -18 -38 ) ( -67 18 -38 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -80 -18 -38 ) ( -80 18 -38 ) ( -80 -18 -34 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( -62 64 -34 ) ( -61 64 -38 ) ( -62 -64 -34 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( -64 16 -33 ) ( -64 16 -36 ) ( 64 16 -33 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -64 12 -38 ) ( -64 12 -35 ) ( 64 12 -38 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -80 64 -36 ) ( -62 64 -34 ) ( -80 -64 -36 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -64 16 -37 ) ( -64 15 -38 ) ( 64 16 -37 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -64 13 -38 ) ( -64 12 -37 ) ( 64 13 -38 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
+( -67 -18 -38 ) ( -61 -18 -38 ) ( -67 18 -38 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -80 -18 -38 ) ( -80 18 -38 ) ( -80 -18 -34 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( -62 64 -34 ) ( -61 64 -38 ) ( -62 -64 -34 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( -64 16 -33 ) ( -64 16 -36 ) ( 64 16 -33 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -64 12 -38 ) ( -64 12 -35 ) ( 64 12 -38 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -80 64 -36 ) ( -62 64 -34 ) ( -80 -64 -36 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -64 16 -37 ) ( -64 15 -38 ) ( 64 16 -37 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -64 13 -38 ) ( -64 12 -37 ) ( 64 13 -38 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
 }
 // brush 76
 {
@@ -774,41 +774,41 @@ colors/grey50
 }
 // brush 77
 {
-( -72 13 -36 ) ( -80 13 -33 ) ( -72 13 -33 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -72 15 -36 ) ( -80 15 -33 ) ( -80 15 -36 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -80 64 -36 ) ( -63 -64 -30 ) ( -80 -64 -36 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -63 64 -30 ) ( -62 -64 -34 ) ( -63 -64 -30 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( -62 64 -34 ) ( -80 -64 -36 ) ( -62 -64 -34 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -72 13 -36 ) ( -80 13 -33 ) ( -72 13 -33 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -72 15 -36 ) ( -80 15 -33 ) ( -80 15 -36 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -80 64 -36 ) ( -63 -64 -30 ) ( -80 -64 -36 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -63 64 -30 ) ( -62 -64 -34 ) ( -63 -64 -30 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( -62 64 -34 ) ( -80 -64 -36 ) ( -62 -64 -34 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 // brush 78
 {
-( -72 -13 -33 ) ( -80 -13 -33 ) ( -72 -13 -36 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -80 -15 -36 ) ( -80 -15 -33 ) ( -72 -15 -36 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -80 64 -36 ) ( -63 64 -30 ) ( -80 -64 -36 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -63 64 -30 ) ( -62 64 -34 ) ( -63 -64 -30 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( -62 64 -34 ) ( -80 64 -36 ) ( -62 -64 -34 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -72 -13 -33 ) ( -80 -13 -33 ) ( -72 -13 -36 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -80 -15 -36 ) ( -80 -15 -33 ) ( -72 -15 -36 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -80 64 -36 ) ( -63 64 -30 ) ( -80 -64 -36 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -63 64 -30 ) ( -62 64 -34 ) ( -63 -64 -30 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( -62 64 -34 ) ( -80 64 -36 ) ( -62 -64 -34 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 // brush 79
 {
-( -81 -16 -36 ) ( -80 -12 -36 ) ( -80 -16 -36 ) colors/red_bright 0 0 0 0.5 0.5 0 0 0
-( -80 -16 -38 ) ( -81 -16 -36 ) ( -80 -16 -36 ) colors/red_bright 0 0 0 0.5 0.5 0 0 0
-( -80 -12 -36 ) ( -80 -16 -38 ) ( -80 -16 -36 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( -81 -16 -38 ) ( -80 -12 -38 ) ( -81 -12 -38 ) colors/red_bright 0 0 0 0.5 0.5 0 0 0
-( -80 -12 -38 ) ( -81 -12 -36 ) ( -81 -12 -38 ) colors/red_bright 0 0 0 0.5 0.5 0 0 0
-( -81 -12 -36 ) ( -81 -16 -38 ) ( -81 -12 -38 ) colors/red_bright 0 0 0 0.5 0.5 0 0 0
-( 64 -16 -37 ) ( -64 -15 -38 ) ( -64 -16 -37 ) colors/red_bright 0 0 0 0.5 0.5 0 0 0
-( 64 -13 -38 ) ( -64 -12 -37 ) ( -64 -13 -38 ) colors/red_bright 0 0 0 0.5 0.5 0 0 0
+( -81 -16 -36 ) ( -80 -12 -36 ) ( -80 -16 -36 ) colors/red_bright 0 0 0 0.5 0.5 134217728 0 0
+( -80 -16 -38 ) ( -81 -16 -36 ) ( -80 -16 -36 ) colors/red_bright 0 0 0 0.5 0.5 134217728 0 0
+( -80 -12 -36 ) ( -80 -16 -38 ) ( -80 -16 -36 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( -81 -16 -38 ) ( -80 -12 -38 ) ( -81 -12 -38 ) colors/red_bright 0 0 0 0.5 0.5 134217728 0 0
+( -80 -12 -38 ) ( -81 -12 -36 ) ( -81 -12 -38 ) colors/red_bright 0 0 0 0.5 0.5 134217728 0 0
+( -81 -12 -36 ) ( -81 -16 -38 ) ( -81 -12 -38 ) colors/red_bright 0 0 0 0.5 0.5 134217728 0 0
+( 64 -16 -37 ) ( -64 -15 -38 ) ( -64 -16 -37 ) colors/red_bright 0 0 0 0.5 0.5 134217728 0 0
+( 64 -13 -38 ) ( -64 -12 -37 ) ( -64 -13 -38 ) colors/red_bright 0 0 0 0.5 0.5 134217728 0 0
 }
 // brush 80
 {
-( -80 16 -36 ) ( -80 12 -36 ) ( -81 16 -36 ) colors/red_bright 0 0 0 0.5 0.5 0 0 0
-( -80 16 -36 ) ( -81 16 -36 ) ( -80 16 -38 ) colors/red_bright 0 0 0 0.5 0.5 0 0 0
-( -80 16 -36 ) ( -80 16 -38 ) ( -80 12 -36 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( -81 12 -38 ) ( -80 12 -38 ) ( -81 16 -38 ) colors/red_bright 0 0 0 0.5 0.5 0 0 0
-( -81 12 -38 ) ( -81 12 -36 ) ( -80 12 -38 ) colors/red_bright 0 0 0 0.5 0.5 0 0 0
-( -81 12 -38 ) ( -81 16 -38 ) ( -81 12 -36 ) colors/red_bright 0 0 0 0.5 0.5 0 0 0
-( -64 16 -37 ) ( -64 15 -38 ) ( 64 16 -37 ) colors/red_bright 0 0 0 0.5 0.5 0 0 0
-( -64 13 -38 ) ( -64 12 -37 ) ( 64 13 -38 ) colors/red_bright 0 0 0 0.5 0.5 0 0 0
+( -80 16 -36 ) ( -80 12 -36 ) ( -81 16 -36 ) colors/red_bright 0 0 0 0.5 0.5 134217728 0 0
+( -80 16 -36 ) ( -81 16 -36 ) ( -80 16 -38 ) colors/red_bright 0 0 0 0.5 0.5 134217728 0 0
+( -80 16 -36 ) ( -80 16 -38 ) ( -80 12 -36 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( -81 12 -38 ) ( -80 12 -38 ) ( -81 16 -38 ) colors/red_bright 0 0 0 0.5 0.5 134217728 0 0
+( -81 12 -38 ) ( -81 12 -36 ) ( -80 12 -38 ) colors/red_bright 0 0 0 0.5 0.5 134217728 0 0
+( -81 12 -38 ) ( -81 16 -38 ) ( -81 12 -36 ) colors/red_bright 0 0 0 0.5 0.5 134217728 0 0
+( -64 16 -37 ) ( -64 15 -38 ) ( 64 16 -37 ) colors/red_bright 0 0 0 0.5 0.5 134217728 0 0
+( -64 13 -38 ) ( -64 12 -37 ) ( 64 13 -38 ) colors/red_bright 0 0 0 0.5 0.5 134217728 0 0
 }
 // brush 81
 {
@@ -869,9 +869,9 @@ colors/grey50
 ( -40 -80 64 ) ( -50 -80 -64 ) ( -40 -80 -64 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
 ( 64 -96 -48 ) ( -64 -62 -34 ) ( -64 -96 -48 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
 ( -64 -96 -46 ) ( -64 -66 -28 ) ( 64 -96 -46 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( 8 -80 -64 ) ( 0 -96 -64 ) ( 8 -80 64 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
 ( -48 -96 -64 ) ( -32 -66 -64 ) ( -48 -96 64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( -64 -84 -42 ) ( -64 -84 -36 ) ( 64 -84 -42 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
+( 4 -80 -64 ) ( 2 -84 -64 ) ( 4 -80 64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 }
 // brush 88
 {
@@ -884,21 +884,21 @@ colors/grey50
 }
 // brush 89
 {
-( -96 -18 62 ) ( -96 -20 63 ) ( -96 -24 42 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -80 -20 63 ) ( -80 -18 62 ) ( -20 -20 63 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -80 -18 62 ) ( -80 -24 42 ) ( -12 -24 42 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -80 -29.5 44.75 ) ( -80 -20 63 ) ( -12 -29.5 44.75 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -80 64 63 ) ( -80 -64 60 ) ( -80 -64 63 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( -80 -22 60 ) ( -80 -20 59 ) ( -96 -21 62 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
+( -96 -18 62 ) ( -96 -20 63 ) ( -96 -24 42 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -80 -20 63 ) ( -80 -18 62 ) ( -20 -20 63 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -80 -18 62 ) ( -80 -24 42 ) ( -12 -24 42 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -80 -29.5 44.75 ) ( -80 -20 63 ) ( -12 -29.5 44.75 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -80 64 63 ) ( -80 -64 60 ) ( -80 -64 63 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( -80 -22 60 ) ( -80 -20 59 ) ( -96 -21 62 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
 }
 // brush 90
 {
-( -96 24 42 ) ( -96 20 63 ) ( -96 18 62 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -20 20 63 ) ( -80 18 62 ) ( -80 20 63 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -12 24 42 ) ( -80 24 42 ) ( -80 18 62 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -12 29.5 44.75 ) ( -80 20 63 ) ( -80 29.5 44.75 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
-( -80 64 63 ) ( -80 64 60 ) ( -80 -64 63 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( -96 21 62 ) ( -80 20 59 ) ( -80 22 60 ) thorn/panel_01 0 0 0 0.5 0.5 0 0 0
+( -96 24 42 ) ( -96 20 63 ) ( -96 18 62 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -20 20 63 ) ( -80 18 62 ) ( -80 20 63 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -12 24 42 ) ( -80 24 42 ) ( -80 18 62 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -12 29.5 44.75 ) ( -80 20 63 ) ( -80 29.5 44.75 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
+( -80 64 63 ) ( -80 64 60 ) ( -80 -64 63 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( -96 21 62 ) ( -80 20 59 ) ( -80 22 60 ) thorn/panel_01 0 0 0 0.5 0.5 134217728 0 0
 }
 // brush 91
 {
@@ -942,6 +942,96 @@ colors/grey50
 ( -64 26 28 ) ( -64 24 32 ) ( 64 26 28 ) colors/grey50 0 0 0 0.5 0.5 0 0 0
 ( -12 24 -64 ) ( -12 28 -64 ) ( -12 24 64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 }
+// brush 95
+{
+( -120 24 32 ) ( -98 26 32 ) ( -96 24 32 ) thorn/panel_01_primary 0 0 0 0.5 0.5 134217728 0 0
+( -64 32 16 ) ( -64 30 20 ) ( 64 32 16 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( -118 26 32 ) ( -98 33 18 ) ( -98 26 32 ) thorn/panel_01_primary 0 0 0 0.5 0.5 134217728 0 0
+( -120 32 16 ) ( -98 33 18 ) ( -118 33 18 ) thorn/panel_01_primary 0 0 0 0.5 0.5 134217728 0 0
+( -96 24 32 ) ( -98 26 32 ) ( -98 33 18 ) thorn/panel_01_primary 0 0 0 0.5 0.5 134217728 0 0
+( -120 24 32 ) ( -118 33 18 ) ( -118 26 32 ) thorn/panel_01_primary 0 0 0 0.5 0.5 134217728 0 0
+}
+// brush 96
+{
+( -104 -34 16 ) ( -96 -32 16 ) ( -98 -34 16 ) thorn/panel_01_primary 8 6 0 0.5 -0.5 134217728 0 0
+( -102 -32 16 ) ( -96 -36 8 ) ( -96 -32 16 ) common/caulk 8 52 0 0.5 0.5 134217728 0 0
+( -104 -34 16 ) ( -98 -34 16 ) ( -98 -37 10 ) thorn/panel_01_primary 8 500 0 0.5 0.5 134217728 0 0
+( -104 -37 10 ) ( -98 -37 10 ) ( -96 -36 8 ) thorn/panel_01_primary 8 500 0 0.5 0.5 134217728 0 0
+( -98 -37 10 ) ( -96 -32 16 ) ( -96 -36 8 ) thorn/panel_01_primary 506 500 0 -0.5 0.5 134217728 0 0
+( -102 -36 8 ) ( -104 -34 16 ) ( -104 -37 10 ) common/caulk 58 52 0 -0.5 0.5 134217728 0 0
+}
+// brush 97
+{
+( -82 31 22 ) ( -80 29 22 ) ( -96 29 22 ) thorn/panel_01_primary 0 0 0 0.5 0.5 134217728 0 0
+( -80 32 16 ) ( -96 29 22 ) ( -80 29 22 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( -82 33 18 ) ( -82 31 22 ) ( -98 31 22 ) thorn/panel_01_primary 0 0 0 0.5 0.5 134217728 0 0
+( -120 32 16 ) ( -80 32 16 ) ( -82 33 18 ) thorn/panel_01_primary 0 0 0 0.5 0.5 134217728 0 0
+( -80 32 16 ) ( -80 29 22 ) ( -82 31 22 ) thorn/panel_01_primary 0 0 0 0.5 0.5 134217728 0 0
+( -96 32 16 ) ( -98 31 22 ) ( -96 29 22 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+}
+// brush 98
+{
+( -100 -24 32 ) ( -122 -26 32 ) ( -124 -24 32 ) thorn/panel_01_primary 0 0 0 0.5 0.5 134217728 0 0
+( -100 -24 32 ) ( -102 -33 18 ) ( -102 -26 32 ) thorn/panel_01_primary 18 0 0 0.5 0.5 134217728 0 0
+( -124 -24 32 ) ( -122 -26 32 ) ( -122 -33 18 ) thorn/panel_01_primary 2 0 0 0.5 0.5 134217728 0 0
+( -124 -32 16 ) ( -122 -33 18 ) ( -100 -32 16 ) thorn/panel_01_primary 0 0 0 0.5 0.5 134217728 0 0
+( -64 -31 18 ) ( -64 -32 16 ) ( 64 -31 18 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( -102 -26 32 ) ( -122 -33 18 ) ( -122 -26 32 ) thorn/panel_01_primary 0 0 0 0.5 0.5 134217728 0 0
+}
+// brush 99
+{
+( -103 -37 8 ) ( -105 -38 10 ) ( -105 -34 18 ) thorn/panel_01_primary 2 0 0 0.5 0.5 134217728 0 0
+( -110 -36 8 ) ( -108 -33 18 ) ( -108 -37 10 ) thorn/panel_01_primary 0 0 0 0.5 0.5 134217728 0 0
+( -114 -36 8 ) ( -112 -37 10 ) ( -102 -36 8 ) thorn/panel_01_primary 492 0 0 0.5 0.5 134217728 0 0
+( -104 -33 18 ) ( -112 -37 10 ) ( -112 -33 18 ) thorn/panel_01_primary 492 0 0 0.5 0.5 134217728 0 0
+( -102 -32 16 ) ( -112 -33 18 ) ( -114 -32 16 ) common/caulk 44 0 0 0.5 0.5 134217728 0 0
+( -54 -32 16 ) ( -54 -36 8 ) ( 74 -32 16 ) common/caulk 44 0 0 0.5 0.5 134217728 0 0
+}
+// brush 100
+{
+( -115 -37 8 ) ( -117 -38 10 ) ( -117 -34 18 ) thorn/panel_01_primary 2 0 0 0.5 0.5 134217728 0 0
+( -122 -36 8 ) ( -120 -33 18 ) ( -120 -37 10 ) thorn/panel_01_primary 0 0 0 0.5 0.5 134217728 0 0
+( -126 -36 8 ) ( -124 -37 10 ) ( -114 -36 8 ) thorn/panel_01_primary 4 0 0 0.5 0.5 134217728 0 0
+( -116 -33 18 ) ( -124 -37 10 ) ( -124 -33 18 ) thorn/panel_01_primary 4 0 0 0.5 0.5 134217728 0 0
+( -114 -32 16 ) ( -124 -33 18 ) ( -126 -32 16 ) common/caulk 4 0 0 0.5 0.5 134217728 0 0
+( -66 -32 16 ) ( -66 -36 8 ) ( 62 -32 16 ) common/caulk 4 0 0 0.5 0.5 134217728 0 0
+}
+// brush 101
+{
+( -82 26 32 ) ( -80 24 32 ) ( -96 24 32 ) thorn/panel_01_primary 0 502 0 0.5 0.5 134217728 0 0
+( -80 27 26 ) ( -96 24 32 ) ( -80 24 32 ) common/caulk 0 20 0 0.5 0.5 134217728 0 0
+( -82 28 28 ) ( -82 26 32 ) ( -98 26 32 ) thorn/panel_01_primary 0 20 0 0.5 0.5 134217728 0 0
+( -120 27 26 ) ( -80 27 26 ) ( -82 28 28 ) thorn/panel_01_primary 0 20 0 0.5 0.5 134217728 0 0
+( -80 27 26 ) ( -80 24 32 ) ( -82 26 32 ) thorn/panel_01_primary 10 20 0 0.5 0.5 134217728 0 0
+( -96 27 26 ) ( -98 26 32 ) ( -96 24 32 ) common/caulk 10 20 0 0.5 0.5 134217728 0 0
+}
+// brush 102
+{
+( -102 -26 32 ) ( -94 -24 32 ) ( -96 -26 32 ) thorn/panel_01_primary 8 502 0 0.5 -0.5 134217728 0 0
+( -100 -24 32 ) ( -94 -28 24 ) ( -94 -24 32 ) common/caulk 8 20 0 0.5 0.5 134217728 0 0
+( -102 -26 32 ) ( -96 -26 32 ) ( -96 -29 26 ) thorn/panel_01_primary 8 20 0 0.5 0.5 134217728 0 0
+( -102 -29 26 ) ( -96 -29 26 ) ( -94 -28 24 ) thorn/panel_01_primary 8 20 0 0.5 0.5 134217728 0 0
+( -94 -24 32 ) ( -96 -29 26 ) ( -96 -26 32 ) thorn/panel_01_primary 10 20 0 -0.5 0.5 134217728 0 0
+( -100 -24 32 ) ( -102 -29 26 ) ( -100 -28 24 ) common/caulk 10 20 0 -0.5 0.5 134217728 0 0
+}
+// brush 103
+{
+( -40 80 -64 ) ( -50 80 -64 ) ( -40 80 64 ) colors/red_bright 0 0 0 0.5 0.5 0 0 0
+( -64 96 -48 ) ( -64 62 -34 ) ( 64 96 -48 ) colors/red_bright 0 0 0 0.5 0.5 0 0 0
+( 64 96 -46 ) ( -64 66 -28 ) ( -64 96 -46 ) colors/red_bright 0 0 0 0.5 0.5 0 0 0
+( 8 80 64 ) ( 0 96 -64 ) ( 8 80 -64 ) colors/red_bright 0 0 0 0.5 0.5 0 0 0
+( 64 84 -42 ) ( -64 84 -36 ) ( -64 84 -42 ) colors/red_bright 0 0 0 0.5 0.5 0 0 0
+( 3 82 64 ) ( 4 80 -64 ) ( 3 82 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+}
+// brush 104
+{
+( -40 -80 64 ) ( -50 -80 -64 ) ( -40 -80 -64 ) colors/green_bright 0 0 0 0.5 0.5 0 0 0
+( 64 -96 -48 ) ( -64 -62 -34 ) ( -64 -96 -48 ) colors/green_bright 0 0 0 0.5 0.5 0 0 0
+( -64 -96 -46 ) ( -64 -66 -28 ) ( 64 -96 -46 ) colors/green_bright 0 0 0 0.5 0.5 0 0 0
+( 8 -80 -64 ) ( 0 -96 -64 ) ( 8 -80 64 ) colors/green_bright 0 0 0 0.5 0.5 0 0 0
+( -64 -84 -42 ) ( -64 -84 -36 ) ( 64 -84 -42 ) colors/green_bright 0 0 0 0.5 0.5 0 0 0
+( 4 -80 64 ) ( 2 -84 -64 ) ( 4 -80 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+}
 }
 // entity 1
 {
@@ -965,3 +1055,60 @@ colors/grey50
 "origin" "-136.000000 -96.000000 -46.000000"
 "script" "dust_trail"
 }
+// entity 5
+{
+"classname" "light"
+"origin" "5.000000 82.000000 -40.000000"
+"light" "8"
+"_color" "1 0 0"
+"spawnflags" "1"
+"time" "0.2"
+"offset" "0.5"
+}
+// entity 6
+{
+"classname" "light"
+"origin" "5.000000 -82.000000 -40.000000"
+"light" "8"
+"_color" "0 1 0"
+"spawnflags" "1"
+"time" "0.2"
+}
+// entity 7
+{
+"classname" "light"
+"origin" "145.000000 0.000000 -9.000000"
+"light" "4"
+"time" "0.1"
+"spawnflags" "1"
+}
+// entity 8
+{
+"classname" "light"
+"origin" "-140.000000 -20.000000 0.000000"
+"light" "12"
+"spawnflags" "4"
+}
+// entity 9
+{
+"classname" "light"
+"origin" "-140.000000 20.000000 0.000000"
+"light" "12"
+"spawnflags" "4"
+}
+// entity 10
+{
+"classname" "fx_particles"
+"origin" "-132.000000 20.000000 0.000000"
+"script" "engine_exhaust"
+"scale" "0.5"
+"spawnflags" "4"
+}
+// entity 11
+{
+"classname" "fx_particles"
+"origin" "-132.000000 -20.000000 0.000000"
+"script" "engine_exhaust"
+"scale" "0.5"
+"spawnflags" "4"
+}
diff --git a/base/maps/colonial/sharkan.map b/base/maps/colonial/sharkan.map
index 4838657..a58e876 100644
--- a/base/maps/colonial/sharkan.map
+++ b/base/maps/colonial/sharkan.map
@@ -1420,50 +1420,41 @@
 }
 // entity 5
 {
-"classname" "fx_flare"
-"origin" "-68.000000 0.000000 0.000000"
-"angle" "-179.999985"
-"spawnflags" "4"
-"radius" "24"
-"flare" "1"
-}
-// entity 6
-{
 "classname" "fx_particles"
 "origin" "-66.000000 0.000000 0.000000"
 "angle" "-179.999985"
-"script" "engine_trail"
-"spawnflags" "2"
+"script" "engine_exhaust"
+"spawnflags" "4"
 }
-// entity 7
+// entity 6
 {
 "classname" "light"
 "origin" "-72.000000 0.000000 0.000000"
 "light" "24"
 "spawnflags" "4"
 }
-// entity 8
+// entity 7
 {
 "classname" "light"
 "origin" "-76.000000 0.000000 0.000000"
 "light" "16"
 "spawnflags" "4"
 }
-// entity 9
+// entity 8
 {
 "classname" "fx_particles"
 "origin" "-64.000000 0.000000 88.000000"
 "angle" "-179.999985"
 "script" "dust_trail"
 }
-// entity 10
+// entity 9
 {
 "classname" "fx_particles"
 "origin" "-64.000000 -112.000000 14.000000"
 "angle" "180"
 "script" "dust_trail"
 }
-// entity 11
+// entity 10
 {
 "classname" "fx_particles"
 "origin" "-64.000000 112.000000 14.000000"
diff --git a/base/maps/colonial/tiger.map b/base/maps/colonial/tiger.map
index 40a079a..fa2e0f1 100644
--- a/base/maps/colonial/tiger.map
+++ b/base/maps/colonial/tiger.map
@@ -3697,7 +3697,9 @@ glass/dark
 "classname" "fx_particles"
 "origin" "-456.000000 256.000000 -128.000000"
 "angle" "-179.999985"
-"script" "engine_trail"
+"script" "engine_exhaust"
+"scale" "2"
+"spawnflags" "4"
 }
 // entity 2
 {
@@ -3710,7 +3712,9 @@ glass/dark
 "classname" "fx_particles"
 "origin" "-456.000000 256.000000 128.000000"
 "angle" "-179.999985"
-"script" "engine_trail"
+"script" "engine_exhaust"
+"scale" "2"
+"spawnflags" "4"
 }
 // entity 4
 {
@@ -3723,7 +3727,9 @@ glass/dark
 "classname" "fx_particles"
 "origin" "-456.000000 -256.000000 128.000000"
 "angle" "-179.999985"
-"script" "engine_trail"
+"script" "engine_exhaust"
+"scale" "2"
+"spawnflags" "4"
 }
 // entity 6
 {
@@ -3736,7 +3742,9 @@ glass/dark
 "classname" "fx_particles"
 "origin" "-456.000000 -256.000000 -128.000000"
 "angle" "-179.999985"
-"script" "engine_trail"
+"script" "engine_exhaust"
+"scale" "2"
+"spawnflags" "4"
 }
 // entity 8
 {
diff --git a/base/maps/independent/sections/avenger_engine.map b/base/maps/independent/sections/avenger_engine.map
index a4cbd19..b4a5e50 100644
--- a/base/maps/independent/sections/avenger_engine.map
+++ b/base/maps/independent/sections/avenger_engine.map
@@ -680,20 +680,12 @@ colors/chrome
 // entity 1
 {
 "classname" "fx_particles"
-"origin" "-14.000000 0.000000 0.000000"
-"angle" "180.000000"
-"script" "engine_trail"
-"spawnflags" "2"
-}
-// entity 2
-{
-"classname" "fx_particles"
 "origin" "-6.000000 0.000000 0.000000"
 "angle" "180.000000"
 "script" "engine_exhaust"
 "spawnflags" "4"
 }
-// entity 3
+// entity 2
 {
 "classname" "fx_flare"
 "origin" "-26.000000 0.000000 0.000000"
@@ -703,7 +695,7 @@ colors/chrome
 "cull" "none"
 "radius" "64"
 }
-// entity 4
+// entity 3
 {
 "classname" "func_rotate"
 "angle" "180"
@@ -797,21 +789,21 @@ colors/chrome
 ( 100 6 2 ) ( -28 6 0 ) ( -28 6 2 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
 }
 }
-// entity 5
+// entity 4
 {
 "classname" "light"
 "origin" "-16.000000 0.000000 0.000000"
 "light" "32"
 "spawnflags" "4"
 }
-// entity 6
+// entity 5
 {
 "classname" "light"
 "origin" "-23.000000 0.000000 0.000000"
 "light" "24"
 "spawnflags" "4"
 }
-// entity 7
+// entity 6
 {
 "classname" "func_rotate"
 "angle" "180"
diff --git a/base/maps/lindblade/avatar.map b/base/maps/lindblade/avatar.map
index 011f02e..2f41905 100644
--- a/base/maps/lindblade/avatar.map
+++ b/base/maps/lindblade/avatar.map
@@ -2928,8 +2928,8 @@ colors/grey50
 "classname" "fx_particles"
 "origin" "-220.000000 212.000000 -28.000000"
 "angle" "-179.999985"
-"script" "engine_trail"
-"spawnflags" "2"
+"script" "engine_exhaust_lindblade"
+"spawnflags" "4"
 }
 // entity 6
 {
@@ -2986,8 +2986,8 @@ colors/grey50
 "classname" "fx_particles"
 "origin" "-220.000000 -212.000000 -28.000000"
 "angle" "180.000000"
-"script" "engine_trail"
-"spawnflags" "2"
+"script" "engine_exhaust_lindblade"
+"spawnflags" "4"
 }
 // entity 14
 {
diff --git a/base/maps/lindblade/penchant.map b/base/maps/lindblade/penchant.map
index 9ff801f..60bee3e 100644
--- a/base/maps/lindblade/penchant.map
+++ b/base/maps/lindblade/penchant.map
@@ -5813,38 +5813,6 @@ colors/chrome
 }
 // entity 14
 {
-"classname" "fx_particles"
-"origin" "-888.000000 368.000000 48.000000"
-"angle" "180.000000"
-"spawnflags" "4"
-"script" "engine_trail"
-}
-// entity 15
-{
-"classname" "fx_particles"
-"origin" "-888.000000 432.000000 48.000000"
-"angle" "180.000000"
-"spawnflags" "4"
-"script" "engine_trail"
-}
-// entity 16
-{
-"classname" "fx_particles"
-"origin" "-888.000000 400.000000 80.000000"
-"angle" "180.000000"
-"spawnflags" "4"
-"script" "engine_trail"
-}
-// entity 17
-{
-"classname" "fx_particles"
-"origin" "-888.000000 400.000000 16.000000"
-"angle" "180.000000"
-"spawnflags" "4"
-"script" "engine_trail"
-}
-// entity 18
-{
 "classname" "fx_flare"
 "origin" "-888.000000 400.000000 48.000000"
 "angle" "180"
@@ -5853,59 +5821,36 @@ colors/chrome
 "cull" "none"
 "flare" "1"
 }
-// entity 19
+// entity 15
 {
 "classname" "light"
 "origin" "-992.000000 400.000000 48.000000"
 "spawnflags" "4"
 }
-// entity 20
+// entity 16
 {
 "classname" "light"
 "origin" "-904.000000 400.000000 48.000000"
 "spawnflags" "4"
 "radius" "64"
 }
-// entity 21
+// entity 17
 {
 "classname" "light"
 "origin" "-944.000000 400.000000 48.000000"
 "spawnflags" "4"
 "radius" "72"
 }
-// entity 22
-{
-"classname" "fx_particles"
-"origin" "-888.000000 -432.000000 48.000000"
-"angle" "180.000000"
-"spawnflags" "4"
-"script" "engine_trail"
-}
-// entity 23
-{
-"classname" "fx_particles"
-"origin" "-888.000000 -368.000000 48.000000"
-"angle" "180.000000"
-"spawnflags" "4"
-"script" "engine_trail"
-}
-// entity 24
-{
-"classname" "fx_particles"
-"origin" "-888.000000 -400.000000 80.000000"
-"angle" "180.000000"
-"spawnflags" "4"
-"script" "engine_trail"
-}
-// entity 25
+// entity 18
 {
 "classname" "fx_particles"
-"origin" "-888.000000 -400.000000 16.000000"
-"angle" "180.000000"
+"origin" "-888.000000 400.000000 48.000000"
+"angle" "-179.999985"
 "spawnflags" "4"
-"script" "engine_trail"
+"script" "engine_exhaust"
+"scale" "4"
 }
-// entity 26
+// entity 19
 {
 "classname" "fx_flare"
 "origin" "-888.000000 -400.000000 48.000000"
@@ -5915,27 +5860,27 @@ colors/chrome
 "cull" "none"
 "flare" "1"
 }
-// entity 27
+// entity 20
 {
 "classname" "light"
 "origin" "-992.000000 -400.000000 48.000000"
 "spawnflags" "4"
 }
-// entity 28
+// entity 21
 {
 "classname" "light"
 "origin" "-904.000000 -400.000000 48.000000"
 "spawnflags" "4"
 "radius" "64"
 }
-// entity 29
+// entity 22
 {
 "classname" "light"
 "origin" "-944.000000 -400.000000 48.000000"
 "spawnflags" "4"
 "radius" "72"
 }
-// entity 30
+// entity 23
 {
 "classname" "func_group"
 // brush 0
@@ -5986,7 +5931,7 @@ colors/chrome
 ( -128 224 192 ) ( -128 256 128 ) ( -320 352 192 ) common/caulk 0 0 0 1 1 134217728 0 0
 }
 }
-// entity 31
+// entity 24
 {
 "classname" "func_group"
 // brush 0
@@ -6037,19 +5982,19 @@ colors/chrome
 ( -320 -352 192 ) ( -128 -256 128 ) ( -128 -224 192 ) common/caulk 0 0 0 1 1 134217728 0 0
 }
 }
-// entity 32
+// entity 25
 {
 "classname" "fx_flare"
 "origin" "-151.000000 -400.000000 48.000000"
 "radius" "90"
 }
-// entity 33
+// entity 26
 {
 "classname" "fx_flare"
 "origin" "-151.000000 400.000000 48.000000"
 "radius" "90"
 }
-// entity 34
+// entity 27
 {
 "classname" "light"
 "origin" "-512.000000 0.000000 344.000000"
@@ -6059,7 +6004,7 @@ colors/chrome
 "frequency" "0.5"
 "time" "0.5"
 }
-// entity 35
+// entity 28
 {
 "classname" "light"
 "origin" "-1160.000000 0.000000 152.000000"
@@ -6070,7 +6015,7 @@ colors/chrome
 "time" "0.5"
 "offset" "1"
 }
-// entity 36
+// entity 29
 {
 "classname" "light"
 "origin" "-736.000000 -496.000000 64.000000"
@@ -6080,7 +6025,7 @@ colors/chrome
 "frequency" "1"
 "_color" "0 1 0.0334173"
 }
-// entity 37
+// entity 30
 {
 "classname" "light"
 "origin" "-288.000000 -496.000000 63.999992"
@@ -6091,7 +6036,7 @@ colors/chrome
 "_color" "0 1 0.0334173"
 "offset" "0.3"
 }
-// entity 38
+// entity 31
 {
 "classname" "light"
 "origin" "-736.000000 488.000000 64.000000"
@@ -6102,7 +6047,7 @@ colors/chrome
 "_color" "1 0 0.0906691"
 "offset" "1"
 }
-// entity 39
+// entity 32
 {
 "classname" "light"
 "origin" "-288.000000 488.000000 63.999992"
@@ -6113,7 +6058,7 @@ colors/chrome
 "_color" "1 0 0.0906691"
 "offset" "1.3"
 }
-// entity 40
+// entity 33
 {
 "classname" "light"
 "origin" "-1160.000000 0.000000 -24.000000"
@@ -6123,7 +6068,7 @@ colors/chrome
 "frequency" "0.5"
 "time" "0.5"
 }
-// entity 41
+// entity 34
 {
 "classname" "light"
 "origin" "368.000000 0.000000 208.000000"
@@ -6133,7 +6078,7 @@ colors/chrome
 "time" ".5"
 "frequency" "1"
 }
-// entity 42
+// entity 35
 {
 "classname" "light"
 "origin" "416.000000 0.000000 -16.000000"
@@ -6143,7 +6088,7 @@ colors/chrome
 "offset" ".5"
 "time" ".1"
 }
-// entity 43
+// entity 36
 {
 "classname" "light"
 "origin" "-512.000000 0.000000 -120.000000"
@@ -6154,7 +6099,7 @@ colors/chrome
 "time" "0.25"
 "offset" "0.5"
 }
-// entity 44
+// entity 37
 {
 "classname" "light"
 "origin" "128.000000 0.000000 -120.000000"
@@ -6164,7 +6109,7 @@ colors/chrome
 "frequency" "1"
 "time" "0.25"
 }
-// entity 45
+// entity 38
 {
 "classname" "light"
 "origin" "-192.000000 0.000000 -120.000000"
@@ -6175,7 +6120,7 @@ colors/chrome
 "time" "0.25"
 "offset" "0.25"
 }
-// entity 46
+// entity 39
 {
 "classname" "light"
 "origin" "-832.000000 0.000000 -120.000000"
@@ -6186,3 +6131,12 @@ colors/chrome
 "time" "0.25"
 "offset" "0.75"
 }
+// entity 40
+{
+"classname" "fx_particles"
+"origin" "-888.000000 -400.000000 48.000000"
+"angle" "-179.999985"
+"spawnflags" "4"
+"script" "engine_exhaust"
+"scale" "4"
+}
diff --git a/base/maps/lindblade/winsor.map b/base/maps/lindblade/winsor.map
index a65fc65..91b9e52 100644
--- a/base/maps/lindblade/winsor.map
+++ b/base/maps/lindblade/winsor.map
@@ -3107,8 +3107,9 @@ colors/grey25_shiny
 "classname" "fx_particles"
 "origin" "-284.000000 -184.000000 -16.000000"
 "angle" "180.000000"
-"script" "engine_trail"
-"spawnflags" "2"
+"script" "engine_exhaust"
+"scale" "2"
+"spawnflags" "4"
 }
 // entity 3
 {
@@ -3315,8 +3316,9 @@ colors/grey25_shiny
 "classname" "fx_particles"
 "origin" "-284.000000 184.000000 -16.000000"
 "angle" "180.000000"
-"script" "engine_trail"
-"spawnflags" "2"
+"script" "engine_exhaust"
+"scale" "2"
+"spawnflags" "4"
 }
 // entity 32
 {
diff --git a/base/maps/mercenary/enforcer.map b/base/maps/mercenary/enforcer.map
index eb9cfcc..475e1dd 100644
--- a/base/maps/mercenary/enforcer.map
+++ b/base/maps/mercenary/enforcer.map
@@ -4164,38 +4164,6 @@
 }
 // entity 8
 {
-"classname" "fx_particles"
-"origin" "-166.000000 24.000000 0.000000"
-"script" "engine_trail"
-"angle" "-179.999985"
-"spawnflags" "2"
-}
-// entity 9
-{
-"classname" "fx_particles"
-"origin" "-166.000000 40.000000 0.000000"
-"script" "engine_trail"
-"angle" "-179.999985"
-"spawnflags" "2"
-}
-// entity 10
-{
-"classname" "fx_particles"
-"origin" "-166.000000 -24.000000 0.000000"
-"script" "engine_trail"
-"angle" "-179.999985"
-"spawnflags" "2"
-}
-// entity 11
-{
-"classname" "fx_particles"
-"origin" "-166.000000 -40.000000 0.000000"
-"script" "engine_trail"
-"angle" "-179.999985"
-"spawnflags" "2"
-}
-// entity 12
-{
 "classname" "light"
 "origin" "290.000000 24.000000 0.000000"
 "light" "10"
@@ -4205,7 +4173,7 @@
 "_color" "1.0 1.0 1.0"
 "offset" "0.5"
 }
-// entity 13
+// entity 9
 {
 "classname" "light"
 "origin" "45.000000 190.000000 0.000000"
@@ -4215,7 +4183,7 @@
 "frequency" "1"
 "_color" "0 1.0 0"
 }
-// entity 14
+// entity 10
 {
 "classname" "light"
 "origin" "45.000000 190.000000 0.000000"
@@ -4223,7 +4191,7 @@
 "_color" "0 1.0 0"
 "flare" "4"
 }
-// entity 15
+// entity 11
 {
 "classname" "light"
 "origin" "290.000000 -24.000000 0.000000"
@@ -4234,7 +4202,7 @@
 "_color" "1.0 1.0 1.0"
 "offset" "0.5"
 }
-// entity 16
+// entity 12
 {
 "classname" "fx_flare"
 "origin" "-172.000000 32.000000 0.000000"
@@ -4243,7 +4211,7 @@
 "angle" "180"
 "radius" "32"
 }
-// entity 17
+// entity 13
 {
 "classname" "fx_flare"
 "origin" "-172.000000 -32.000000 0.000000"
@@ -4252,14 +4220,14 @@
 "angle" "180"
 "radius" "32"
 }
-// entity 18
+// entity 14
 {
 "classname" "fx_particles"
 "origin" "-88.750000 -201.250000 0.000000"
 "script" "dust_trail"
 "angle" "-179.999985"
 }
-// entity 19
+// entity 15
 {
 "classname" "light"
 "origin" "45.000000 -190.000000 0.000000"
@@ -4270,7 +4238,7 @@
 "_color" "1.0 0 0"
 "offset" "0.5"
 }
-// entity 20
+// entity 16
 {
 "classname" "light"
 "origin" "45.000000 -190.000000 0.000000"
@@ -4278,14 +4246,14 @@
 "_color" "1.0 0 0"
 "flare" "4"
 }
-// entity 21
+// entity 17
 {
 "classname" "fx_particles"
 "origin" "-88.750000 201.250000 0.000000"
 "script" "dust_trail"
 "angle" "-179.999985"
 }
-// entity 22
+// entity 18
 {
 "classname" "fx_particles"
 "origin" "-128.000000 46.000000 -45.500000"
diff --git a/base/maps/mercenary/pod.map b/base/maps/mercenary/pod.map
index 4f1925d..f7d446a 100644
--- a/base/maps/mercenary/pod.map
+++ b/base/maps/mercenary/pod.map
@@ -750,7 +750,7 @@ common/engine
 {
 patchDef2
 {
-colors/black_bright
+common/engine
 ( 3 5 0 0 0 )
 (
 ( ( -240 -48 0 -0.75 -0 ) ( -240 -48 -40 -0.75 0.625 ) ( -240 0.0000019073 -40 0.0000000298 0.625 ) ( -240 48 -40 0.75 0.625 ) ( -240 48 0 0.75 -0 ) )
@@ -1344,16 +1344,18 @@ colors/grey25
 "classname" "fx_flare"
 "origin" "-248 0 0"
 "angle" "180"
-"radius" "80"
+"radius" "40"
 "spawnflags" "4"
 "flare" "1"
 }
 // entity 12
 {
 "classname" "fx_particles"
-"origin" "-288 0 0"
-"angle" "180"
+"origin" "-240.000000 0.000000 0.000000"
+"angle" "-179.999985"
 "script" "engine_exhaust"
+"scale" "1.6"
+"spawnflags" "4"
 }
 // entity 13
 {
@@ -1362,11 +1364,3 @@ colors/grey25
 "angle" "180"
 "script" "dust_trail"
 }
-// entity 14
-{
-"classname" "fx_particles"
-"origin" "-240.000000 0.000000 0.000000"
-"script" "engine_trail"
-"spawnflags" "2"
-"angle" "180"
-}
diff --git a/base/maps/mercenary/sections/archer_engine_large.map b/base/maps/mercenary/sections/archer_engine_large.map
index 7e5d74c..63d677b 100644
--- a/base/maps/mercenary/sections/archer_engine_large.map
+++ b/base/maps/mercenary/sections/archer_engine_large.map
@@ -183,12 +183,3 @@ colors/grey50_shiny
 "light" "16"
 "spawnflags" "4"
 }
-// entity 5
-{
-"classname" "fx_particles"
-"origin" "-2.000000 0.000000 0.000000"
-"angle" "-179.999985"
-"script" "engine_exhaust"
-"spawnflags" "4"
-"scale" "0.5"
-}
diff --git a/base/maps/mercenary/talon.map b/base/maps/mercenary/talon.map
index 6ccbbb5..19c3ef1 100644
--- a/base/maps/mercenary/talon.map
+++ b/base/maps/mercenary/talon.map
@@ -2437,21 +2437,13 @@ colors/grey50
 // entity 1
 {
 "classname" "fx_particles"
-"origin" "-102.000000 -41.000000 0.000000"
-"spawnflags" "2"
-"angle" "-179.999985"
-"script" "engine_trail"
-}
-// entity 2
-{
-"classname" "fx_particles"
 "origin" "-104.000000 -41.000000 0.000000"
 "spawnflags" "4"
 "angle" "-179.999985"
 "script" "engine_exhaust"
 "scale" "0.4"
 }
-// entity 3
+// entity 2
 {
 "classname" "light"
 "origin" "272.000000 0.000000 1.000000"
@@ -2462,7 +2454,7 @@ colors/grey50
 "_color" "1.0 1.0 1.0"
 "spawnflags" "1"
 }
-// entity 4
+// entity 3
 {
 "classname" "light"
 "origin" "-76.000000 -188.000000 0.000000"
@@ -2470,7 +2462,7 @@ colors/grey50
 "_color" "0 1.0 0"
 "flare" "4"
 }
-// entity 5
+// entity 4
 {
 "classname" "light"
 "origin" "-76.000000 188.000000 0.000000"
@@ -2478,45 +2470,45 @@ colors/grey50
 "_color" "1.0 0 0"
 "flare" "4"
 }
-// entity 6
+// entity 5
 {
 "classname" "fx_particles"
 "origin" "-80.000000 192.000000 0.000000"
 "angle" "180.000000"
 "script" "dust_trail"
 }
-// entity 7
+// entity 6
 {
 "classname" "fx_particles"
 "origin" "-80.000000 -192.000000 0.000000"
 "angle" "180.000000"
 "script" "dust_trail"
 }
-// entity 8
+// entity 7
 {
 "classname" "location_cannon"
 "origin" "120.000000 24.000000 0.000000"
 }
-// entity 9
+// entity 8
 {
 "classname" "location_cannon"
 "origin" "120.000000 -24.000000 0.000000"
 }
-// entity 10
+// entity 9
 {
 "classname" "light"
 "origin" "-120.000000 0.000000 0.000000"
 "flare" "4"
 "spawnflags" "4"
 }
-// entity 11
+// entity 10
 {
 "classname" "fx_particles"
 "origin" "-80.000000 0.000000 88.000000"
 "angle" "180.000000"
 "script" "dust_trail"
 }
-// entity 12
+// entity 11
 {
 "classname" "light"
 "origin" "-78.000000 -47.000000 -47.000000"
@@ -2524,7 +2516,7 @@ colors/grey50
 "_color" "0 1 0"
 "flare" "4"
 }
-// entity 13
+// entity 12
 {
 "classname" "light"
 "origin" "-78.000000 47.000000 -47.000000"
@@ -2532,7 +2524,7 @@ colors/grey50
 "_color" "1 0 0"
 "flare" "4"
 }
-// entity 14
+// entity 13
 {
 "classname" "light"
 "origin" "-76.000000 -188.000000 0.000000"
@@ -2543,7 +2535,7 @@ colors/grey50
 "_color" "0 1.0 0"
 "spawnflags" "1"
 }
-// entity 15
+// entity 14
 {
 "classname" "light"
 "origin" "-76.000000 188.000000 0.000000"
@@ -2554,28 +2546,28 @@ colors/grey50
 "_color" "1.0 0 0"
 "spawnflags" "1"
 }
-// entity 16
+// entity 15
 {
 "classname" "fx_particles"
 "origin" "-80.000000 -48.000000 -48.000000"
 "angle" "180.000000"
 "script" "dust_trail"
 }
-// entity 17
+// entity 16
 {
 "classname" "fx_particles"
 "origin" "-80.000000 48.000000 -48.000000"
 "angle" "180.000000"
 "script" "dust_trail"
 }
-// entity 18
+// entity 17
 {
 "classname" "light"
 "origin" "-79.000000 0.000000 87.000000"
 "light" "10"
 "flare" "4"
 }
-// entity 19
+// entity 18
 {
 "classname" "fx_particles"
 "origin" "-92.000000 0.000000 0.000000"
@@ -2584,23 +2576,7 @@ colors/grey50
 "script" "engine_exhaust"
 "scale" "0.6"
 }
-// entity 20
-{
-"classname" "fx_particles"
-"origin" "-88.000000 0.000000 0.000000"
-"spawnflags" "2"
-"angle" "180.000000"
-"script" "engine_trail"
-}
-// entity 21
-{
-"classname" "fx_particles"
-"origin" "-102.000000 41.000000 0.000000"
-"spawnflags" "2"
-"angle" "-179.999985"
-"script" "engine_trail"
-}
-// entity 22
+// entity 19
 {
 "classname" "fx_particles"
 "origin" "-104.000000 41.000000 0.000000"
diff --git a/base/maps/merchant/matrix.map b/base/maps/merchant/matrix.map
index efd671a..6c3735b 100644
--- a/base/maps/merchant/matrix.map
+++ b/base/maps/merchant/matrix.map
@@ -1748,7 +1748,7 @@
 ( -480 -160 -152 ) ( -480 -160 -200 ) ( -480 -208 -152 ) common/caulk 0 0 0 1 1 0 0 0
 ( -552 -208 -200 ) ( -480 -208 -200 ) ( -552 -160 -200 ) common/caulk 0 0 0 1 1 0 0 0
 ( -552 -208 -200 ) ( -552 -208 -152 ) ( -480 -208 -200 ) common/caulk 0 0 0 1 1 0 0 0
-( -488 -224 -200 ) ( -488 -176 -200 ) ( -488 -224 -152 ) colors/black_bright 0 0 0 1 1 0 0 0
+( -488 -224 -200 ) ( -488 -176 -200 ) ( -488 -224 -152 ) common/engine 0 0 0 1 1 0 0 0
 }
 // brush 163
 {
@@ -1757,7 +1757,7 @@
 ( -480 -160 200 ) ( -480 -160 152 ) ( -480 -208 200 ) common/caulk 0 0 0 1 1 0 0 0
 ( -552 -208 152 ) ( -480 -208 152 ) ( -552 -160 152 ) common/caulk 0 0 0 1 1 0 0 0
 ( -552 -208 152 ) ( -552 -208 200 ) ( -480 -208 152 ) common/caulk 0 0 0 1 1 0 0 0
-( -488 -224 152 ) ( -488 -176 152 ) ( -488 -224 200 ) colors/black_bright 0 0 0 1 1 0 0 0
+( -488 -224 152 ) ( -488 -176 152 ) ( -488 -224 200 ) common/engine 0 0 0 1 1 0 0 0
 }
 // brush 164
 {
@@ -1766,7 +1766,7 @@
 ( -480 208 200 ) ( -480 208 152 ) ( -480 160 200 ) common/caulk 0 0 0 1 1 0 0 0
 ( -552 160 152 ) ( -480 160 152 ) ( -552 208 152 ) common/caulk 0 0 0 1 1 0 0 0
 ( -552 160 152 ) ( -552 160 200 ) ( -480 160 152 ) common/caulk 0 0 0 1 1 0 0 0
-( -488 144 152 ) ( -488 192 152 ) ( -488 144 200 ) colors/black_bright 0 0 0 1 1 0 0 0
+( -488 144 152 ) ( -488 192 152 ) ( -488 144 200 ) common/engine 0 0 0 1 1 0 0 0
 }
 // brush 165
 {
@@ -1775,7 +1775,7 @@
 ( -480 208 -152 ) ( -480 208 -200 ) ( -480 160 -152 ) common/caulk 0 0 0 1 1 0 0 0
 ( -552 160 -200 ) ( -480 160 -200 ) ( -552 208 -200 ) common/caulk 0 0 0 1 1 0 0 0
 ( -552 160 -200 ) ( -552 160 -152 ) ( -480 160 -200 ) common/caulk 0 0 0 1 1 0 0 0
-( -488 144 -200 ) ( -488 192 -200 ) ( -488 144 -152 ) colors/black_bright 0 0 0 1 1 0 0 0
+( -488 144 -200 ) ( -488 192 -200 ) ( -488 144 -152 ) common/engine 0 0 0 1 1 0 0 0
 }
 // brush 166
 {
@@ -3292,11 +3292,11 @@
 // brush 329
 {
 ( -448 128 80 ) ( -448 -128 80 ) ( -256 -128 80 ) common/caulk 0 0 0 1 1 0 0 0
-( -432 64 80 ) ( -320 64 120 ) ( -432 -64 80 ) thorn/panel_01 0 0 0 1 1 0 0 0
-( 368 120 80 ) ( 368 -120 80 ) ( 256 64 120 ) thorn/panel_01 0 0 0 1 1 0 0 0
+( -432 64 80 ) ( -320 64 120 ) ( -432 -64 80 ) glass/plain 0 0 0 1 1 0 0 0
+( 368 120 80 ) ( 368 -120 80 ) ( 256 64 120 ) glass/plain 0 0 0 1 1 0 0 0
 ( -192 -64 120 ) ( -192 64 120 ) ( -128 -64 120 ) thorn/panel_01 0 0 0 1 1 0 0 0
-( -452 120 80 ) ( 368 120 80 ) ( -452 64 120 ) thorn/panel_01 0 0 0 1 1 0 0 0
-( -452 -64 120 ) ( 368 -120 80 ) ( -452 -120 80 ) thorn/panel_01 0 0 0 1 1 0 0 0
+( -452 120 80 ) ( 368 120 80 ) ( -452 64 120 ) glass/plain 0 0 0 1 1 0 0 0
+( -452 -64 120 ) ( 368 -120 80 ) ( -452 -120 80 ) glass/plain 0 0 0 1 1 0 0 0
 }
 // brush 330
 {
@@ -4482,22 +4482,13 @@ common/entity_second
 // entity 20
 {
 "classname" "fx_flare"
-"origin" "-496.000000 -184.000000 -176.000000"
-"angle" "-179.999985"
-"spawnflags" "4"
-"flare" "1"
-"radius" "32"
-}
-// entity 21
-{
-"classname" "fx_flare"
 "origin" "-568.000000 80.000000 0.000000"
 "angle" "-179.999985"
 "spawnflags" "4"
 "radius" "56"
 "flare" "1"
 }
-// entity 22
+// entity 21
 {
 "classname" "fx_flare"
 "origin" "-568.000000 -80.000000 0.000000"
@@ -4506,35 +4497,41 @@ common/entity_second
 "radius" "56"
 "flare" "1"
 }
-// entity 23
+// entity 22
 {
 "classname" "fx_particles"
 "origin" "-544.000000 -184.000000 -176.000000"
 "angle" "-179.999985"
-"script" "engine_trail"
+"script" "engine_exhaust"
+"scale" "0.5"
+"spawnflags" "4"
 }
-// entity 24
+// entity 23
 {
 "classname" "fx_particles"
-"origin" "-704.000000 80.000000 0.000000"
+"origin" "-672.000000 80.000000 0.000000"
 "angle" "-179.999985"
 "script" "engine_exhaust"
+"spawnflags" "4"
+"scale" "2"
 }
-// entity 25
+// entity 24
 {
 "classname" "fx_particles"
-"origin" "-704.000000 -80.000000 0.000000"
+"origin" "-672.000000 -80.000000 0.000000"
 "angle" "-179.999985"
 "script" "engine_exhaust"
+"spawnflags" "4"
+"scale" "2"
 }
-// entity 26
+// entity 25
 {
 "classname" "light"
 "origin" "-560.000000 -184.000000 -176.000000"
 "spawnflags" "4"
 "light" "28"
 }
-// entity 27
+// entity 26
 {
 "classname" "func_group"
 // brush 0
@@ -4771,7 +4768,7 @@ common/entity_second
 ( 64 160 -124 ) ( 128 -160 -124 ) ( 128 160 -124 ) common/caulk 0 0 0 1 1 0 0 0
 }
 }
-// entity 28
+// entity 27
 {
 "classname" "func_group"
 // brush 0
@@ -5026,7 +5023,7 @@ common/entity_second
 ( -268 -66 148 ) ( -276 62 148 ) ( -268 62 148 ) common/caulk 0 0 0 1 1 0 0 0
 }
 }
-// entity 29
+// entity 28
 {
 "classname" "func_group"
 // brush 0
@@ -5281,7 +5278,7 @@ common/entity_second
 ( -76 -66 148 ) ( -84 62 148 ) ( -76 62 148 ) common/caulk 0 0 0 1 1 0 0 0
 }
 }
-// entity 30
+// entity 29
 {
 "classname" "func_group"
 // brush 0
@@ -5536,7 +5533,7 @@ common/entity_second
 ( 116 -66 148 ) ( 108 62 148 ) ( 116 62 148 ) common/caulk 0 0 0 1 1 0 0 0
 }
 }
-// entity 31
+// entity 30
 {
 "classname" "func_group"
 // brush 0
@@ -5773,7 +5770,7 @@ common/entity_second
 ( -128 160 -124 ) ( -64 -160 -124 ) ( -64 160 -124 ) common/caulk 0 0 0 1 1 0 0 0
 }
 }
-// entity 32
+// entity 31
 {
 "classname" "func_group"
 // brush 0
@@ -6010,100 +6007,79 @@ common/entity_second
 ( -320 160 -124 ) ( -256 -160 -124 ) ( -256 160 -124 ) common/caulk 0 0 0 1 1 0 0 0
 }
 }
-// entity 33
+// entity 32
 {
 "classname" "light"
 "origin" "-544.000000 -184.000000 -176.000000"
 "light" "32"
 "spawnflags" "4"
 }
-// entity 34
+// entity 33
 {
 "classname" "light"
 "origin" "-544.000000 -184.000000 176.000000"
 "light" "32"
 "spawnflags" "4"
 }
-// entity 35
+// entity 34
 {
 "classname" "light"
 "origin" "-560.000000 -184.000000 176.000000"
 "spawnflags" "4"
 "light" "28"
 }
-// entity 36
-{
-"classname" "fx_flare"
-"origin" "-496.000000 -184.000000 176.000000"
-"angle" "-179.999985"
-"spawnflags" "4"
-"flare" "1"
-"radius" "32"
-}
-// entity 37
+// entity 35
 {
 "classname" "fx_particles"
 "origin" "-544.000000 -184.000000 176.000000"
 "angle" "-179.999985"
-"script" "engine_trail"
+"script" "engine_exhaust"
+"scale" "0.5"
+"spawnflags" "4"
 }
-// entity 38
+// entity 36
 {
 "classname" "light"
 "origin" "-544.000000 184.000000 176.000000"
 "light" "32"
 "spawnflags" "4"
 }
-// entity 39
+// entity 37
 {
 "classname" "light"
 "origin" "-560.000000 184.000000 176.000000"
 "spawnflags" "4"
 "light" "28"
 }
-// entity 40
-{
-"classname" "fx_flare"
-"origin" "-496.000000 184.000000 176.000000"
-"angle" "-179.999985"
-"spawnflags" "4"
-"flare" "1"
-"radius" "32"
-}
-// entity 41
+// entity 38
 {
 "classname" "fx_particles"
 "origin" "-544.000000 184.000000 176.000000"
 "angle" "-179.999985"
-"script" "engine_trail"
+"script" "engine_exhaust"
+"scale" "0.5"
+"spawnflags" "4"
 }
-// entity 42
+// entity 39
 {
 "classname" "light"
 "origin" "-544.000000 184.000000 -176.000000"
 "light" "32"
 "spawnflags" "4"
 }
-// entity 43
+// entity 40
 {
 "classname" "light"
 "origin" "-560.000000 184.000000 -176.000000"
 "spawnflags" "4"
 "light" "28"
 }
-// entity 44
-{
-"classname" "fx_flare"
-"origin" "-496.000000 184.000000 -176.000000"
-"angle" "-179.999985"
-"spawnflags" "4"
-"flare" "1"
-"radius" "32"
-}
-// entity 45
+// entity 41
 {
 "classname" "fx_particles"
 "origin" "-544.000000 184.000000 -176.000000"
 "angle" "-179.999985"
-"script" "engine_trail"
+"script" "engine_exhaust"
+"scale" "0.5"
+"spawnflags" "4"
 }
diff --git a/base/maps/merchant/scalar.map b/base/maps/merchant/scalar.map
index 476c30e..e9c9f64 100644
--- a/base/maps/merchant/scalar.map
+++ b/base/maps/merchant/scalar.map
@@ -1962,49 +1962,31 @@ colors/grey75
 // entity 4
 {
 "classname" "fx_particles"
-"origin" "-224.000000 -72.000000 -24.000000"
-"angle" "180.000000"
-"script" "engine_trail"
-}
-// entity 5
-{
-"classname" "fx_particles"
-"origin" "-224.000000 72.000000 -24.000000"
-"angle" "180.000000"
-"script" "engine_trail"
-}
-// entity 6
-{
-"classname" "fx_particles"
-"origin" "-272.000000 0.000000 16.000000"
-"angle" "180.000000"
-"script" "engine_trail"
-"spawnflags" "2"
-}
-// entity 7
-{
-"classname" "fx_particles"
 "origin" "-216.000000 -72.000000 -24.000000"
 "angle" "180.000000"
 "script" "engine_exhaust"
 "scale" "0.5"
+"spawnflags" "4"
 }
-// entity 8
+// entity 5
 {
 "classname" "fx_particles"
 "origin" "-272.000000 0.000000 16.000000"
 "angle" "180.000000"
 "script" "engine_exhaust"
+"scale" "1.5"
+"spawnflags" "4"
 }
-// entity 9
+// entity 6
 {
 "classname" "fx_particles"
 "origin" "-216.000000 72.000000 -24.000000"
 "angle" "180.000000"
 "script" "engine_exhaust"
 "scale" "0.5"
+"spawnflags" "4"
 }
-// entity 10
+// entity 7
 {
 "classname" "light"
 "origin" "104.000000 0.000000 -24.000000"
@@ -2013,7 +1995,7 @@ colors/grey75
 "spawnflags" "1"
 "offset" "0.3"
 }
-// entity 11
+// entity 8
 {
 "classname" "light"
 "origin" "0.000000 -66.000000 16.000000"
@@ -2022,7 +2004,7 @@ colors/grey75
 "spawnflags" "1"
 "time" "0.2"
 }
-// entity 12
+// entity 9
 {
 "classname" "light"
 "origin" "0.000000 66.000000 16.000000"
@@ -2032,7 +2014,7 @@ colors/grey75
 "offset" "0.5"
 "time" "0.2"
 }
-// entity 13
+// entity 10
 {
 "classname" "light"
 "origin" "-176.000000 0.000000 -32.000000"
@@ -2040,7 +2022,7 @@ colors/grey75
 "time" "0.1"
 "spawnflags" "1"
 }
-// entity 14
+// entity 11
 {
 "classname" "light"
 "origin" "0.000000 0.000000 56.000000"
@@ -2049,7 +2031,7 @@ colors/grey75
 "spawnflags" "1"
 "offset" "0.5"
 }
-// entity 15
+// entity 12
 {
 "classname" "light"
 "origin" "-128.000000 0.000000 56.000000"
@@ -2058,7 +2040,7 @@ colors/grey75
 "spawnflags" "1"
 "offset" "0.8"
 }
-// entity 16
+// entity 13
 {
 "classname" "light"
 "origin" "-128.000000 -66.000000 16.000000"
@@ -2067,7 +2049,7 @@ colors/grey75
 "spawnflags" "1"
 "time" "0.2"
 }
-// entity 17
+// entity 14
 {
 "classname" "light"
 "origin" "-128.000000 66.000000 16.000000"
@@ -2077,77 +2059,77 @@ colors/grey75
 "offset" "0.5"
 "time" "0.2"
 }
-// entity 18
+// entity 15
 {
 "classname" "light"
 "origin" "-300.000000 -8.000000 16.000000"
 "light" "20"
 "spawnflags" "4"
 }
-// entity 19
+// entity 16
 {
 "classname" "light"
 "origin" "-292.000000 0.000000 16.000000"
 "light" "28"
 "spawnflags" "4"
 }
-// entity 20
+// entity 17
 {
 "classname" "light"
 "origin" "-272.000000 -16.000000 16.000000"
 "light" "36"
 "spawnflags" "4"
 }
-// entity 21
+// entity 18
 {
 "classname" "light"
 "origin" "-272.000000 16.000000 16.000000"
 "light" "36"
 "spawnflags" "4"
 }
-// entity 22
+// entity 19
 {
 "classname" "light"
 "origin" "-288.000000 -12.000000 16.000000"
 "light" "28"
 "spawnflags" "4"
 }
-// entity 23
+// entity 20
 {
 "classname" "light"
 "origin" "-288.000000 12.000000 16.000000"
 "light" "28"
 "spawnflags" "4"
 }
-// entity 24
+// entity 21
 {
 "classname" "light"
 "origin" "-300.000000 8.000000 16.000000"
 "light" "20"
 "spawnflags" "4"
 }
-// entity 25
+// entity 22
 {
 "classname" "light"
 "origin" "-308.000000 0.000000 16.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 26
+// entity 23
 {
 "classname" "light"
 "origin" "-224.000000 -72.000000 -24.000000"
 "light" "16"
 "spawnflags" "4"
 }
-// entity 27
+// entity 24
 {
 "classname" "light"
 "origin" "-224.000000 72.000000 -24.000000"
 "light" "16"
 "spawnflags" "4"
 }
-// entity 28
+// entity 25
 {
 "classname" "light"
 "origin" "-64.000000 72.000000 -24.000000"
diff --git a/base/maps/merchant/vector.map b/base/maps/merchant/vector.map
index 2c807ec..c94f3f2 100644
--- a/base/maps/merchant/vector.map
+++ b/base/maps/merchant/vector.map
@@ -1891,7 +1891,7 @@
 }
 // brush 193
 {
-( -144 67.5 -24 ) ( -144 76.5 -24 ) ( -144 67.5 8 ) colors/black_bright 0 0 0 0.5 0.5 0 0 0
+( -144 67.5 -24 ) ( -144 76.5 -24 ) ( -144 67.5 8 ) common/engine 0 0 0 0.5 0.5 0 0 0
 ( -64 72 4 ) ( -64 74 4 ) ( 64 72 4 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( -64 84 4 ) ( -64 84 2 ) ( 64 84 4 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( -64 84 -20 ) ( -64 82 -20 ) ( 64 84 -20 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -3512,7 +3512,7 @@ colors/grey50
 }
 // brush 344
 {
-( -144 -76.5 -24 ) ( -144 -67.5 -24 ) ( -144 -76.5 8 ) colors/black_bright 0 0 0 0.5 0.5 0 0 0
+( -144 -76.5 -24 ) ( -144 -67.5 -24 ) ( -144 -76.5 8 ) common/engine 0 0 0 0.5 0.5 0 0 0
 ( -64 -72 4 ) ( -64 -70 4 ) ( 64 -72 4 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( -64 -60 4 ) ( -64 -60 2 ) ( 64 -60 4 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( -64 -60 -20 ) ( -64 -62 -20 ) ( 64 -60 -20 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -4028,14 +4028,18 @@ colors/grey75
 "classname" "fx_particles"
 "origin" "-172 72 -8"
 "angle" "180"
-"script" "engine_trail"
+"script" "engine_exhaust"
+"spawnflags" "4"
+"scale" "0.8"
 }
 // entity 12
 {
 "classname" "fx_particles"
 "origin" "-172 -72 -8"
 "angle" "180"
-"script" "engine_trail"
+"script" "engine_exhaust"
+"spawnflags" "4"
+"scale" "0.8"
 }
 // entity 13
 {
diff --git a/base/maps/pirate/sections/engine_large.map b/base/maps/pirate/sections/engine_large.map
index bdc10cd..0d12e18 100644
--- a/base/maps/pirate/sections/engine_large.map
+++ b/base/maps/pirate/sections/engine_large.map
@@ -109,9 +109,3 @@ colors/grey25_shiny
 "script" "engine_smoke"
 "scale" "0.4"
 }
-// entity 4
-{
-"classname" "fx_particles"
-"origin" "-8.000000 0.000000 0.000000"
-"script" "engine_trail"
-}
diff --git a/base/maps/pirate/sections/engine_medium.map b/base/maps/pirate/sections/engine_medium.map
index 59edc60..3a60f4f 100644
--- a/base/maps/pirate/sections/engine_medium.map
+++ b/base/maps/pirate/sections/engine_medium.map
@@ -101,17 +101,11 @@ colors/grey25_shiny
 {
 "classname" "fx_particles"
 "origin" "-8.000000 0.000000 0.000000"
-"script" "engine_trail"
-}
-// entity 3
-{
-"classname" "fx_particles"
-"origin" "-8.000000 0.000000 0.000000"
 "script" "engine_exhaust"
 "scale" "0.8"
 "spawnflags" "4"
 }
-// entity 4
+// entity 3
 {
 "classname" "fx_particles"
 "origin" "-8.000000 0.000000 0.000000"
diff --git a/base/maps/pirate/sections/engine_small.map b/base/maps/pirate/sections/engine_small.map
index 4c2dde0..5a24ba2 100644
--- a/base/maps/pirate/sections/engine_small.map
+++ b/base/maps/pirate/sections/engine_small.map
@@ -103,9 +103,3 @@ colors/grey25_shiny
 "scale" "0.4"
 "spawnflags" "4"
 }
-// entity 3
-{
-"classname" "fx_particles"
-"origin" "-8.000000 0.000000 0.000000"
-"script" "engine_trail"
-}
diff --git a/base/maps/pirate/sections/engine_tiny.map b/base/maps/pirate/sections/engine_tiny.map
index eb86546..2ddbef1 100644
--- a/base/maps/pirate/sections/engine_tiny.map
+++ b/base/maps/pirate/sections/engine_tiny.map
@@ -103,9 +103,3 @@ colors/grey25_shiny
 "spawnflags" "4"
 "scale" "0.4"
 }
-// entity 3
-{
-"classname" "fx_particles"
-"origin" "-8.000000 0.000000 0.000000"
-"script" "engine_trail"
-}
diff --git a/base/maps/tsukhan/imp.map b/base/maps/tsukhan/imp.map
index 8b4a236..325aa56 100644
--- a/base/maps/tsukhan/imp.map
+++ b/base/maps/tsukhan/imp.map
@@ -3392,64 +3392,36 @@ tsukhan/tsukhan_grey50
 // entity 4
 {
 "classname" "fx_particles"
-"origin" "-192.000000 -61.000000 -29.000000"
-"angle" "-179.999985"
-"script" "engine_trail_tsukhan"
-}
-// entity 5
-{
-"classname" "fx_particles"
-"origin" "-192.000000 -61.000000 -3.000000"
-"angle" "-179.999985"
-"script" "engine_smoke_tsukhan"
-"scale" "0.4"
-}
-// entity 6
-{
-"classname" "fx_particles"
 "origin" "-192.000000 61.000000 -3.000000"
 "angle" "-179.999985"
-"script" "engine_trail_tsukhan"
-}
-// entity 7
-{
-"classname" "fx_particles"
-"origin" "-192.000000 61.000000 -29.000000"
-"angle" "-179.999985"
-"script" "engine_smoke_tsukhan"
+"script" "engine_exhaust_tsukhan"
 "scale" "0.4"
 }
-// entity 8
-{
-"classname" "fx_particles"
-"origin" "-192.000000 61.000000 -3.000000"
-"angle" "-179.999985"
-"script" "engine_smoke_tsukhan"
-"scale" "0.4"
-}
-// entity 9
+// entity 5
 {
 "classname" "fx_particles"
 "origin" "-192.000000 61.000000 -29.000000"
 "angle" "-179.999985"
-"script" "engine_trail_tsukhan"
+"script" "engine_exhaust_tsukhan"
+"scale" "0.4"
 }
-// entity 10
+// entity 6
 {
 "classname" "fx_particles"
 "origin" "-192.000000 -61.000000 -29.000000"
 "angle" "-179.999985"
-"script" "engine_smoke_tsukhan"
+"script" "engine_exhaust_tsukhan"
 "scale" "0.4"
 }
-// entity 11
+// entity 7
 {
 "classname" "fx_particles"
 "origin" "-192.000000 -61.000000 -3.000000"
 "angle" "-179.999985"
-"script" "engine_trail_tsukhan"
+"script" "engine_exhaust_tsukhan"
+"scale" "0.4"
 }
-// entity 12
+// entity 8
 {
 "classname" "light"
 "origin" "322.000000 0.000000 6.000000"
@@ -3457,7 +3429,7 @@ tsukhan/tsukhan_grey50
 "_color" "0.5 0 0.5"
 "flare" "4"
 }
-// entity 13
+// entity 9
 {
 "classname" "light"
 "origin" "100.000000 -174.000000 -8.000000"
@@ -3466,7 +3438,7 @@ tsukhan/tsukhan_grey50
 "spawnflags" "1"
 "time" "0.2"
 }
-// entity 14
+// entity 10
 {
 "classname" "light"
 "origin" "100.000000 174.000000 -8.000000"
@@ -3476,35 +3448,35 @@ tsukhan/tsukhan_grey50
 "spawnflags" "1"
 "offset" "0.5"
 }
-// entity 15
+// entity 11
 {
 "classname" "light"
 "origin" "-216.000000 -61.000000 -29.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 16
+// entity 12
 {
 "classname" "light"
 "origin" "-216.000000 -61.000000 -3.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 17
+// entity 13
 {
 "classname" "light"
 "origin" "-216.000000 61.000000 -3.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 18
+// entity 14
 {
 "classname" "light"
 "origin" "-216.000000 61.000000 -29.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 19
+// entity 15
 {
 "classname" "fx_flare"
 "origin" "-197.000000 -61.000000 -29.000000"
@@ -3513,7 +3485,7 @@ tsukhan/tsukhan_grey50
 "radius" "12"
 "angle" "-179.999985"
 }
-// entity 20
+// entity 16
 {
 "classname" "fx_flare"
 "origin" "-197.000000 -61.000000 -3.000000"
@@ -3522,7 +3494,7 @@ tsukhan/tsukhan_grey50
 "radius" "12"
 "angle" "-179.999985"
 }
-// entity 21
+// entity 17
 {
 "classname" "fx_flare"
 "origin" "-197.000000 61.000000 -29.000000"
@@ -3531,7 +3503,7 @@ tsukhan/tsukhan_grey50
 "radius" "12"
 "angle" "-179.999985"
 }
-// entity 22
+// entity 18
 {
 "classname" "fx_flare"
 "origin" "-197.000000 61.000000 -3.000000"
@@ -3540,75 +3512,75 @@ tsukhan/tsukhan_grey50
 "radius" "12"
 "angle" "180"
 }
-// entity 23
+// entity 19
 {
 "classname" "fx_particles"
 "origin" "-170.375000 0.000000 -88.000000"
 "angle" "-179.999985"
 "script" "dust_trail"
 }
-// entity 24
+// entity 20
 {
 "classname" "fx_particles"
 "origin" "-24.000000 -176.000000 -8.000000"
 "angle" "-179.999985"
 "script" "dust_trail"
 }
-// entity 25
+// entity 21
 {
 "classname" "fx_particles"
 "origin" "-8.000000 -100.000000 -48.000000"
 "angle" "-179.999985"
 "script" "dust_trail"
 }
-// entity 26
+// entity 22
 {
 "classname" "fx_particles"
 "origin" "-170.375000 -7.000000 48.000000"
 "angle" "-179.999985"
 "script" "dust_trail"
 }
-// entity 27
+// entity 23
 {
 "classname" "fx_particles"
 "origin" "-170.375000 7.000000 48.000000"
 "angle" "-179.999985"
 "script" "dust_trail"
 }
-// entity 28
+// entity 24
 {
 "classname" "fx_particles"
 "origin" "-24.000000 176.000000 -8.000000"
 "angle" "-179.999985"
 "script" "dust_trail"
 }
-// entity 29
+// entity 25
 {
 "classname" "fx_particles"
 "origin" "-8.000000 100.000000 -48.000000"
 "angle" "-179.999985"
 "script" "dust_trail"
 }
-// entity 30
+// entity 26
 {
 "classname" "fx_particles"
 "origin" "-8.000000 -100.000000 48.000000"
 "angle" "-179.999985"
 "script" "dust_trail"
 }
-// entity 31
+// entity 27
 {
 "classname" "fx_particles"
 "origin" "-8.000000 100.000000 48.000000"
 "angle" "-179.999985"
 "script" "dust_trail"
 }
-// entity 32
+// entity 28
 {
 "classname" "location_cannon"
 "origin" "296.000000 -26.000000 6.000000"
 }
-// entity 33
+// entity 29
 {
 "classname" "location_cannon"
 "origin" "296.000000 26.000000 6.000000"
diff --git a/base/maps/tsukhan/inquisitor.map b/base/maps/tsukhan/inquisitor.map
index af8a8c7..fdcd413 100644
--- a/base/maps/tsukhan/inquisitor.map
+++ b/base/maps/tsukhan/inquisitor.map
@@ -3224,99 +3224,62 @@ tsukhan/tsukhan_grey50
 // entity 8
 {
 "classname" "fx_particles"
-"origin" "-332.000000 -216.000000 -36.000000"
+"origin" "-324.000000 -216.000000 4.000000"
 "angle" "-179.999985"
-"script" "engine_smoke_tsukhan"
-"scale" "0.6"
+"script" "engine_exhaust_tsukhan"
+"scale" "0.5"
 }
 // entity 9
 {
 "classname" "fx_particles"
-"origin" "-332.000000 -216.000000 4.000000"
+"origin" "-316.000000 -216.000000 -36.000000"
 "angle" "-179.999985"
-"script" "engine_smoke_tsukhan"
-"scale" "0.6"
+"script" "engine_exhaust_tsukhan"
+"scale" "0.5"
 }
 // entity 10
 {
 "classname" "fx_particles"
-"origin" "-332.000000 216.000000 4.000000"
-"angle" "-179.999985"
-"script" "engine_smoke_tsukhan"
-"scale" "0.6"
-}
-// entity 11
-{
-"classname" "fx_particles"
-"origin" "-332.000000 216.000000 -36.000000"
-"angle" "-179.999985"
-"script" "engine_smoke_tsukhan"
-"scale" "0.6"
-}
-// entity 12
-{
-"classname" "fx_particles"
-"origin" "-324.000000 -216.000000 4.000000"
-"angle" "-179.999985"
-"script" "engine_trail_tsukhan"
-}
-// entity 13
-{
-"classname" "fx_particles"
-"origin" "-324.000000 216.000000 4.000000"
-"angle" "-179.999985"
-"script" "engine_trail_tsukhan"
-}
-// entity 14
-{
-"classname" "fx_particles"
-"origin" "-316.000000 216.000000 -36.000000"
-"angle" "-179.999985"
-"script" "engine_trail_tsukhan"
-}
-// entity 15
-{
-"classname" "fx_particles"
 "origin" "-312.000000 352.000000 -16.000000"
 "script" "dust_trail"
 "angle" "-179.999985"
 }
-// entity 16
+// entity 11
 {
 "classname" "fx_particles"
 "origin" "-312.000000 -352.000000 -16.000000"
 "script" "dust_trail"
 "angle" "-179.999985"
 }
-// entity 17
+// entity 12
 {
 "classname" "fx_particles"
 "origin" "-344.000000 -216.000000 -128.000000"
 "script" "dust_trail"
 "angle" "-179.999985"
 }
-// entity 18
+// entity 13
 {
 "classname" "fx_particles"
 "origin" "-344.000000 216.000000 -128.000000"
 "script" "dust_trail"
 "angle" "-179.999985"
 }
-// entity 19
+// entity 14
 {
 "classname" "fx_particles"
 "origin" "-344.000000 -216.000000 96.000000"
 "script" "dust_trail"
 "angle" "-179.999985"
 }
-// entity 20
+// entity 15
 {
 "classname" "fx_particles"
 "origin" "-344.000000 216.000000 96.000000"
 "script" "dust_trail"
 "angle" "-179.999985"
 }
-// entity 21
+// entity 16
 {
 "classname" "light"
 "origin" "-306.000000 348.000000 -16.000000"
@@ -3326,7 +3289,7 @@ tsukhan/tsukhan_grey50
 "time" "0.2"
 "offset" "0"
 }
-// entity 22
+// entity 17
 {
 "classname" "light"
 "origin" "-306.000000 -348.000000 -16.000000"
@@ -3336,59 +3299,75 @@ tsukhan/tsukhan_grey50
 "time" "0.2"
 "offset" "0.5"
 }
-// entity 23
+// entity 18
 {
 "classname" "light"
 "origin" "-227.000000 -140.000000 -2.000000"
 "light" "16"
 "_color" "0.5 0 0.5"
 }
-// entity 24
+// entity 19
 {
 "classname" "light"
 "origin" "-227.000000 140.000000 -2.000000"
 "light" "16"
 "_color" "0.5 0 0.5"
 }
-// entity 25
+// entity 20
 {
 "classname" "location_cannon"
 "origin" "72.000000 108.000000 0.000000"
 }
-// entity 26
+// entity 21
 {
 "classname" "location_cannon"
 "origin" "104.000000 -76.000000 0.000000"
 }
-// entity 27
+// entity 22
 {
 "classname" "location_cannon"
 "origin" "88.000000 -92.000000 0.000000"
 }
-// entity 28
+// entity 23
 {
 "classname" "location_cannon"
 "origin" "72.000000 -108.000000 0.000000"
 }
-// entity 29
+// entity 24
 {
 "classname" "location_cannon"
 "origin" "104.000000 76.000000 0.000000"
 }
-// entity 30
+// entity 25
 {
 "classname" "location_cannon"
 "origin" "88.000000 92.000000 0.000000"
 }
-// entity 31
+// entity 26
 {
 "classname" "location_turret"
 "origin" "-104.000000 0.000000 -44.000000"
 "angles" "90.000000 0.000000 -0.000000"
 }
-// entity 32
+// entity 27
 {
 "classname" "location_turret"
 "origin" "-104.000000 0.000000 44.000000"
 "angles" "-90.000000 0.000000 0.000005"
 }
+// entity 28
+{
+"classname" "fx_particles"
+"origin" "-324.000000 216.000000 4.000000"
+"angle" "-179.999985"
+"script" "engine_exhaust_tsukhan"
+"scale" "0.5"
+}
+// entity 29
+{
+"classname" "fx_particles"
+"origin" "-316.000000 216.000000 -36.000000"
+"angle" "-179.999985"
+"script" "engine_exhaust_tsukhan"
+"scale" "0.5"
+}
diff --git a/base/maps/tsukhan/sections/drake_engine1.map b/base/maps/tsukhan/sections/drake_engine1.map
index 344ccf1..c3b9769 100644
--- a/base/maps/tsukhan/sections/drake_engine1.map
+++ b/base/maps/tsukhan/sections/drake_engine1.map
@@ -493,5 +493,5 @@ tsukhan/tsukhan_entity_dark
 "classname" "fx_particles"
 "origin" "-24.000000 0.000000 -1.000000"
 "angle" "-179.999985"
-"script" "engine_trail_tsukhan"
+"script" "engine_exhaust_tsukhan"
 }
diff --git a/base/maps/tsukhan/sections/drake_engine2.map b/base/maps/tsukhan/sections/drake_engine2.map
index d4d268d..76ec080 100644
--- a/base/maps/tsukhan/sections/drake_engine2.map
+++ b/base/maps/tsukhan/sections/drake_engine2.map
@@ -172,5 +172,5 @@
 "classname" "fx_particles"
 "origin" "-14.000000 0.000000 0.000000"
 "angle" "-180.000000"
-"script" "engine_trail_tsukhan"
+"script" "engine_exhaust_tsukhan"
 }
diff --git a/base/particles/engine_exhaust.ini b/base/particles/engine_exhaust.ini
index 0c71d3d..4a065ce 100644
--- a/base/particles/engine_exhaust.ini
+++ b/base/particles/engine_exhaust.ini
@@ -5,10 +5,44 @@
 
 [particles]
 type=flame
-texture=fx/flame00
+texture=fx/flame_plain
 timeout=0.12
 eject=0.02
 radius=18
 alpha=0.5
 offset=0.25 
 
+[particles]
+type=trail
+texture=fx/engine_trail
+timeout=4.0
+eject=0.15
+radius=12
+alpha=0.5
+
+[particles]
+type=trail
+texture=fx/engine_trail
+timeout=4.0
+eject=0.15
+radius=12
+alpha=0.5
+roll=45
+
+[particles]
+type=trail
+texture=fx/engine_trail
+timeout=4.0
+eject=0.15
+radius=12
+alpha=0.5
+roll=90
+
+[particles]
+type=trail
+texture=fx/engine_trail
+timeout=4.0
+eject=0.15
+radius=12
+alpha=0.5
+roll=135
diff --git a/base/particles/engine_exhaust_tsukhan.ini b/base/particles/engine_exhaust_tsukhan.ini
index 86d375d..3745d2c 100644
--- a/base/particles/engine_exhaust_tsukhan.ini
+++ b/base/particles/engine_exhaust_tsukhan.ini
@@ -11,3 +11,37 @@ eject=0.01
 radius=32
 alpha=0.5
 
+[particles]
+type=trail
+texture=fx/engine_trail_tsukhan
+timeout=4.0
+eject=0.15
+radius=12
+alpha=1.0
+
+[particles]
+type=trail
+texture=fx/engine_trail_tsukhan
+timeout=4.0
+eject=0.15
+radius=12
+alpha=1.0
+roll=45
+
+[particles]
+type=trail
+texture=fx/engine_trail_tsukhan
+timeout=4.0
+eject=0.15
+radius=12
+alpha=1.0
+roll=90
+
+[particles]
+type=trail
+texture=fx/engine_trail_tsukhan
+timeout=4.0
+eject=0.15
+radius=12
+alpha=1.0
+roll=135
diff --git a/base/textures/fx/flame_plain.png b/base/textures/fx/flame_plain.png
new file mode 100644
index 0000000..0437434
--- /dev/null
+++ b/base/textures/fx/flame_plain.png