Merge branch 'dev' into alpha

Toby222 · Nov 6, 2024 · de02d23 · de02d23
2 parents 259a0cd + b3bbe98
commit de02d23
Show file tree

Hide file tree

Showing 9 changed files with 89 additions and 61 deletions.
diff --git a/contributors.html b/contributors.html
@@ -100,6 +100,10 @@ <h2>SHARK GAME: NEW FRONTIERS</h2>
                         <td><a href="https://github.com/glowkate">Glowkate</a></td>
                         <td>Art</td>
                     </tr>
+                    <tr>
+                        <td><a href="https://www.youtube.com/@WorkerDroneMainBattleTrain">Main Battle Train</a></td>
+                        <td>Art</td>
+                    </tr>
                     <tr>
                         <td><a href="https://http.cat/404">UnstoppableGiant</a></td>
                         <td>Playtesting, Art</td>

diff --git a/img/small/actions/getCrimsonCombine.png b/img/small/actions/getCrimsonCombine.png
diff --git a/img/sprites.png b/img/sprites.png
diff --git a/js/data/events.js b/js/data/events.js
@@ -341,9 +341,9 @@ SharkGame.Events = {
         },
         trigger() {
             if (SharkGame.Lab.findAllAffordableUpgrades().length) {
-                $("#tab-lab").html("(<strong>!</strong>) Laboratory");
+                $("#tab-lab").html(`(<strong>!</strong>) ${SharkGame.Lab.tabName}`);
             } else {
-                $("#tab-lab").html("Laboratory");
+                $("#tab-lab").html(`${SharkGame.Lab.tabName}`);
             }
             return true;
         },