diff --git a/README.md b/README.md index a1fda57d..4d133055 100644 --- a/README.md +++ b/README.md @@ -821,6 +821,7 @@ * Gets destroyed after being deployed for 30 seconds * Kills on any round (normally stops killing after round 50) * Kills zombies instantly +* Zombies that are on fire no longer explode on death * No longer kills players without Jugger-Nog instantly * Decreased player damage from 75 to 25 * Decreased player shellshock time from 2.5 seconds to 1.25 seconds diff --git a/scripts/zm/replaced/_zm_equip_electrictrap.gsc b/scripts/zm/replaced/_zm_equip_electrictrap.gsc index a07716be..826d13c8 100644 --- a/scripts/zm/replaced/_zm_equip_electrictrap.gsc +++ b/scripts/zm/replaced/_zm_equip_electrictrap.gsc @@ -102,6 +102,15 @@ cleanupoldtrap() } } +electrictrapkill(weapon) +{ + self endon("death"); + + self.is_on_fire = 0; + self notify("stop_flame_damage"); + self dodamage(self.health + 666, self.origin); +} + etrap_choke() { // no choke diff --git a/scripts/zm/zm_transit/zm_transit_reimagined.gsc b/scripts/zm/zm_transit/zm_transit_reimagined.gsc index a740c5ec..82556b5c 100644 --- a/scripts/zm/zm_transit/zm_transit_reimagined.gsc +++ b/scripts/zm/zm_transit/zm_transit_reimagined.gsc @@ -50,6 +50,7 @@ main() replaceFunc(maps\mp\zombies\_zm_weap_emp_bomb::emp_detonate, scripts\zm\replaced\_zm_weap_emp_bomb::emp_detonate); replaceFunc(maps\mp\zombies\_zm_equip_electrictrap::startelectrictrapdeploy, scripts\zm\replaced\_zm_equip_electrictrap::startelectrictrapdeploy); replaceFunc(maps\mp\zombies\_zm_equip_electrictrap::cleanupoldtrap, scripts\zm\replaced\_zm_equip_electrictrap::cleanupoldtrap); + replaceFunc(maps\mp\zombies\_zm_equip_electrictrap::electrictrapkill, scripts\zm\replaced\_zm_equip_electrictrap::electrictrapkill); replaceFunc(maps\mp\zombies\_zm_equip_electrictrap::etrap_choke, scripts\zm\replaced\_zm_equip_electrictrap::etrap_choke); replaceFunc(maps\mp\zombies\_zm_equip_turret::startturretdeploy, scripts\zm\replaced\_zm_equip_turret::startturretdeploy); replaceFunc(maps\mp\zombies\_zm_banking::init, scripts\zm\replaced\_zm_banking::init);