From 020e32e977683ac9b414aed670e64b976db7f2a4 Mon Sep 17 00:00:00 2001
From: Marco Cawthorne <marco@vera-visions.com>
Date: Sat, 18 Nov 2023 19:48:31 -0800
Subject: [PATCH] SHScientist: the body logic should really only be run if
 we're not using a body already.

---
 src/server/monster_scientist.qc | 46 ++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/server/monster_scientist.qc b/src/server/monster_scientist.qc
index 1e31cdd..58db340 100644
--- a/src/server/monster_scientist.qc
+++ b/src/server/monster_scientist.qc
@@ -420,31 +420,31 @@ SHScientist::Respawn(void)
 
 	if ((cvar("sh_scirand") == 1) || (m_iBody == 0)) {
 		m_iBody = floor(random(1,5));
-	}
 
-	SetSkin(0);
+		SetSkin(0);
 
-	switch (m_iBody) {
-		case 1:
-			m_flPitch = 105;
-			netname = "Walter";
-			SetBodyInGroup(1, 1);
-			break;
-		case 2:
-			m_flPitch = 100;
-			netname = "Einstein";
-			SetBodyInGroup(1, 2);
-			break;
-		case 3:
-			m_flPitch = 95;
-			netname = "Luther";
-			SetBodyInGroup(1, 3);
-			SetSkin(1);
-			break;
-		default:
-			m_flPitch = 100;
-			netname = "Slick";
-			SetBodyInGroup(1, 4);
+		switch (m_iBody) {
+			case 1:
+				m_flPitch = 105;
+				netname = "Walter";
+				SetBodyInGroup(1, 1);
+				break;
+			case 2:
+				m_flPitch = 100;
+				netname = "Einstein";
+				SetBodyInGroup(1, 2);
+				break;
+			case 3:
+				m_flPitch = 95;
+				netname = "Luther";
+				SetBodyInGroup(1, 3);
+				SetSkin(1);
+				break;
+			default:
+				m_flPitch = 100;
+				netname = "Slick";
+				SetBodyInGroup(1, 4);
+		}
 	}
 
 	/* recount to update sciscore and so on */