diff --git a/README.md b/README.md index 1024ae83..1ef0082a 100644 --- a/README.md +++ b/README.md @@ -269,8 +269,8 @@ * No longer needs to be powered by a Turbine * Gets destroyed after being deployed for 30 seconds * Kills on any round in 1-4 shots (normally does 1200 damage max) +* No longer damages players * Fire type changed from burst fire to continuous fire -* No longer damages players if they have Juggernog * Fixed a bug where the Turret sounds would continue playing after being picked up ### Subsurface Resonator diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc index df61a880..57dd9dbb 100644 --- a/scripts/zm/_zm_reimagined.gsc +++ b/scripts/zm/_zm_reimagined.gsc @@ -1903,7 +1903,7 @@ melee_weapon_disable_weapon_trading() player_damage_override( einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, psoffsettime ) { - if (smeansofdeath == "MOD_FALLING") + if(smeansofdeath == "MOD_FALLING") { // remove fall damage being based off max health ratio = self.maxhealth / 100; @@ -1911,12 +1911,12 @@ player_damage_override( einflictor, eattacker, idamage, idflags, smeansofdeath, // increase fall damage beyond 110 max_damage = 110; - if (idamage >= max_damage) + if(idamage >= max_damage) { velocity = abs(self.fall_velocity); min_velocity = getDvarInt("bg_fallDamageMinHeight") * 3.25; max_velocity = getDvarInt("bg_fallDamageMaxHeight") * 2.5; - if (self.divetoprone) + if(self.divetoprone) { min_velocity = getDvarInt("dtp_fall_damage_min_height") * 4.5; max_velocity = getDvarInt("dtp_fall_damage_max_height") * 2.75; @@ -1931,6 +1931,12 @@ player_damage_override( einflictor, eattacker, idamage, idflags, smeansofdeath, } } + // fix turrets damaging players + if(sweapon == "zombie_bullet_crouch_zm" && smeansofdeath == "MOD_RIFLE_BULLET") + { + idamage = 0; + } + return idamage; }