diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 38ba43c2e..2c27999b2 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -2643,12 +2643,13 @@ void G_DisplayRest(int32_t smoothratio)
             else
             {
                 P_DisplayWeapon(screenpeek);
-
-                if (g_fakeMultiMode && ud.multimode==2)  // HACK
+                if (pp2)  // HACK
                     P_DisplayWeapon(1);
 
                 if (pp->over_shoulder_on == 0)
                     P_DisplayScuba(screenpeek);
+                if (pp2 && pp2->over_shoulder_on == 0)  // HACK
+                    P_DisplayScuba(1);
             }
             G_MoveClouds();
         }
diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c
index 63a16ca71..44fb27dcd 100644
--- a/polymer/eduke32/source/player.c
+++ b/polymer/eduke32/source/player.c
@@ -2257,8 +2257,9 @@ void P_DisplayScuba(int32_t snum)
     {
         int32_t p = get_hud_pal(g_player[snum].ps);
 
-        rotatesprite_win(43<<16,(200-tilesizy[SCUBAMASK])<<16,65536,0,SCUBAMASK,0,p,2+16);
-        rotatesprite_win((320-43)<<16,(200-tilesizy[SCUBAMASK])<<16,65536,1024,SCUBAMASK,0,p,2+4+16);
+        g_snum = snum;
+        G_DrawTileScaled(43, (200-tilesizy[SCUBAMASK]), SCUBAMASK, 0, 2+16+DRAWEAP_CENTER, p);
+        G_DrawTileScaled(320-43, (200-tilesizy[SCUBAMASK]), SCUBAMASK, 0, 2+4+16+DRAWEAP_CENTER, p);
     }
 }