1 files changed, 8 insertions, 0 deletions
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index 7e38f119..6d8e5c1c 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -1022,6 +1022,14 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
         return;
     }
 
+		// If target is buildable on the same team as the attacking client
+		if( targ->s.eType == ET_BUILDABLE && attacker->client &&
+				targ->biteam == attacker->client->pers.teamSelection )
+		{
+			if( !g_friendlyBuildableFire.integer )
+				return;
+		}
+
     // check for godmode
     if ( targ->flags & FL_GODMODE )
       return;