From 01ff4dde5e7bcc9a95df0ea3300894060de2295f Mon Sep 17 00:00:00 2001 From: connman116 Date: Wed, 19 Nov 2025 00:11:02 -0500 Subject: [PATCH 1/2] Update asw_marine.cpp make hornets and smartbomb nolonger friendlyfire --- src/game/server/swarm/asw_marine.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/game/server/swarm/asw_marine.cpp b/src/game/server/swarm/asw_marine.cpp index 185627b3e..c52e47fce 100644 --- a/src/game/server/swarm/asw_marine.cpp +++ b/src/game/server/swarm/asw_marine.cpp @@ -1419,7 +1419,12 @@ int CASW_Marine::OnTakeDamage_Alive( const CTakeDamageInfo &info ) Msg( " but all ignored, since it's from a team mate\n" ); return 0; } - else + //make hornet and smart bomb no longer friendlyfire + else if (!ASWDeathmatchMode() && pWeapon && (pWeapon->Classify() == CLASS_ASW_HORNET_BARRAGE || pWeapon->Classify() == CLASS_ASW_SMART_BOMB)) + { + return 0; + } +else { if ( newInfo.GetDamageType() & DMG_CLUB ) { From 3117211a71d1440611ac7ecf04a7871c3b378e28 Mon Sep 17 00:00:00 2001 From: connman116 Date: Wed, 19 Nov 2025 00:14:28 -0500 Subject: [PATCH 2/2] Update src/game/server/swarm/asw_marine.cpp Co-authored-by: Ben Lubar --- src/game/server/swarm/asw_marine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/server/swarm/asw_marine.cpp b/src/game/server/swarm/asw_marine.cpp index c52e47fce..06cf7a88c 100644 --- a/src/game/server/swarm/asw_marine.cpp +++ b/src/game/server/swarm/asw_marine.cpp @@ -1424,7 +1424,7 @@ int CASW_Marine::OnTakeDamage_Alive( const CTakeDamageInfo &info ) { return 0; } -else + else { if ( newInfo.GetDamageType() & DMG_CLUB ) {