diff --git a/src/d_player.h b/src/d_player.h
index 84165192b..445c1148d 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -451,13 +451,13 @@ typedef struct player_s
 	UINT8 jawztargetdelay;	// (0 to 5) - Delay for Jawz target switching, to make it less twitchy
 
 	UINT8 trickpanel; 	// Trick panel state
-	tic_t tricktime;	// Increases while you're tricking. You can't input any trick until it's reached a certain threshold
+	UINT8 tricktime;	// Increases while you're tricking. You can't input any trick until it's reached a certain threshold
 	fixed_t trickmomx;
 	fixed_t trickmomy;
 	fixed_t trickmomz;
 	fixed_t trickboostpower;	// Save the rough speed multiplier. Used for upwards tricks.
-	tic_t trickboostdecay;		// used to know how long you've waited
-	tic_t trickboost;			// Trick boost. This one is weird and has variable speed. Dear god.
+	UINT8 trickboostdecay;		// used to know how long you've waited
+	UINT8 trickboost;			// Trick boost. This one is weird and has variable speed. Dear god.
 
 
 	UINT32 roundscore; // battle score this round
diff --git a/src/k_kart.c b/src/k_kart.c
index c714a68c2..915d3cd32 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -8797,8 +8797,10 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 			fixed_t speedmult = max(0, FRACUNIT - abs(momz)/TRICKMOMZRAMP);				// TRICKMOMZRAMP momz is minimum speed (Should be 20)
 			fixed_t basespeed = P_AproxDistance(player->mo->momx, player->mo->momy);	// at WORSE, keep your normal speed when tricking.
 			fixed_t speed = FixedMul(speedmult, P_AproxDistance(player->mo->momx, player->mo->momy));
-
-			player->tricktime++;
+			
+			// We'll never need to go above that.
+			if (player->tricktime <= TRICKDELAY)
+				player->tricktime++;
 
 			// debug shit
 			//CONS_Printf("%d\n", player->mo->momz / mapobjectscale);
diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c
index a76eb1990..a9e193543 100644
--- a/src/lua_playerlib.c
+++ b/src/lua_playerlib.c
@@ -354,12 +354,20 @@ static int player_get(lua_State *L)
 		lua_pushinteger(L, plr->glanceDir);
 	else if (fastcmp(field,"trickpanel"))
 		lua_pushinteger(L, plr->trickpanel);
+	else if (fastcmp(field,"tricktime"))
+		lua_pushinteger(L, plr->tricktime);
 	else if (fastcmp(field,"trickmomx"))
 		lua_pushfixed(L, plr->trickmomx);
 	else if (fastcmp(field,"trickmomy"))
 		lua_pushfixed(L, plr->trickmomy);
 	else if (fastcmp(field,"trickmomz"))
 		lua_pushfixed(L, plr->trickmomz);
+	else if (fastcmp(field,"trickboostpower"))
+		lua_pushfixed(L, plr->trickboostpower);
+	else if (fastcmp(field,"trickboostdecay"))
+		lua_pushinteger(L, plr->trickboostdecay);
+	else if (fastcmp(field,"trickboost"))
+		lua_pushinteger(L, plr->trickboost);
 	else if (fastcmp(field,"roundscore"))
 		plr->roundscore = luaL_checkinteger(L, 3);
 	else if (fastcmp(field,"emeralds"))
@@ -697,12 +705,20 @@ static int player_set(lua_State *L)
 		plr->glanceDir = luaL_checkinteger(L, 3);
 	else if (fastcmp(field,"trickpanel"))
 		plr->trickpanel = luaL_checkinteger(L, 3);
+	else if (fastcmp(field,"tricktime"))
+		plr->tricktime = luaL_checkinteger(L, 3);
 	else if (fastcmp(field,"trickmomx"))
 		plr->trickmomx = luaL_checkfixed(L, 3);
 	else if (fastcmp(field,"trickmomy"))
 		plr->trickmomy = luaL_checkfixed(L, 3);
 	else if (fastcmp(field,"trickmomz"))
 		plr->trickmomz = luaL_checkfixed(L, 3);
+	else if (fastcmp(field,"trickboostpower"))
+		plr->trickboostpower = luaL_checkfixed(L, 3);
+	else if (fastcmp(field,"trickboostdecay"))
+		plr->trickboostdecay = luaL_checkinteger(L, 3);
+	else if (fastcmp(field,"trickboost"))
+		plr->trickboost = luaL_checkinteger(L, 3);
 	else if (fastcmp(field,"roundscore"))
 		lua_pushinteger(L, plr->roundscore);
 	else if (fastcmp(field,"emeralds"))
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 9f2d182fb..e8e992fcc 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -305,13 +305,13 @@ static void P_NetArchivePlayers(void)
 		WRITEUINT8(save_p, players[i].jawztargetdelay);
 
 		WRITEUINT8(save_p, players[i].trickpanel);
-		WRITEUINT32(save_p, players[i].tricktime);
+		WRITEUINT8(save_p, players[i].tricktime);
 		WRITEUINT32(save_p, players[i].trickmomx);
 		WRITEUINT32(save_p, players[i].trickmomy);
 		WRITEUINT32(save_p, players[i].trickmomz);
 		WRITEUINT32(save_p, players[i].trickboostpower);
-		WRITEUINT32(save_p, players[i].trickboostdecay);
-		WRITEUINT32(save_p, players[i].trickboost);
+		WRITEUINT8(save_p, players[i].trickboostdecay);
+		WRITEUINT8(save_p, players[i].trickboost);
 
 		WRITEUINT32(save_p, players[i].roundscore);
 		WRITEUINT8(save_p, players[i].emeralds);
@@ -561,13 +561,13 @@ static void P_NetUnArchivePlayers(void)
 		players[i].jawztargetdelay = READUINT8(save_p);
 
 		players[i].trickpanel = READUINT8(save_p);
-		players[i].tricktime = (tic_t)READUINT32(save_p);
+		players[i].tricktime = READUINT8(save_p);
 		players[i].trickmomx = READUINT32(save_p);
 		players[i].trickmomy = READUINT32(save_p);
 		players[i].trickmomz = READUINT32(save_p);
 		players[i].trickboostpower = READUINT32(save_p);
-		players[i].trickboostdecay = (tic_t)READUINT32(save_p);
-		players[i].trickboost = (tic_t)READUINT32(save_p);
+		players[i].trickboostdecay = READUINT8(save_p);
+		players[i].trickboost = READUINT8(save_p);
 
 		players[i].roundscore = READUINT32(save_p);
 		players[i].emeralds = READUINT8(save_p);