Merge tag 'tags/2.8.0' into g1.8

It's not 2.8pre anymore! OMG!

src/p_pspr.cpp

@@ -158,8 +158,10 @@ void P_SetPsprite (player_t *player, int position, FState *state, bool nofunctio
 		}
 
 
-		if (sv_fastweapons >= 2 && position == ps_weapon)
-			psp->tics = state->ActionFunc == NULL? 0 : 1;
+		if (sv_fastweapons == 2 && position == ps_weapon)
+			psp->tics = state->ActionFunc == NULL ? 0 : 1;
+		else if (sv_fastweapons == 3)
+			psp->tics = (state->GetTics() != 0);
 		else if (sv_fastweapons)
 			psp->tics = 1;		// great for producing decals :)
 		else