1
0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-11 23:57:59 -05:00

Meat powerup: remove spiking the meat

This commit is contained in:
Jbleezy
2023-12-02 03:31:10 -08:00
parent 707ef1eb99
commit 818e3e44b1
2 changed files with 2 additions and 21 deletions

View File

@ -427,7 +427,6 @@
* No longer able to drop when another meat powerup is already dropped * No longer able to drop when another meat powerup is already dropped
* Message shows when the meat is grabbed and landed on a player * Message shows when the meat is grabbed and landed on a player
* Meleeing while the meat is moving no longer grabs the meat * Meleeing while the meat is moving no longer grabs the meat
* Meleeing while the meat is moving throws the meat
* Removed pick up trigger * Removed pick up trigger
## Persistent Upgrades ## Persistent Upgrades

View File

@ -22,16 +22,7 @@ meat_bounce_override( pos, normal, ent, bounce )
{ {
if ( isdefined( ent ) && isplayer( ent ) && is_player_valid(ent) && !ent hasWeapon("item_meat_zm") && !is_true(ent.dont_touch_the_meat) ) if ( isdefined( ent ) && isplayer( ent ) && is_player_valid(ent) && !ent hasWeapon("item_meat_zm") && !is_true(ent.dont_touch_the_meat) )
{ {
if (ent isMeleeing() && level.scr_zm_ui_gametype_obj != "zmeat") level thread meat_stink_player( ent );
{
ent thread maps\mp\gametypes_zm\zmeat::spike_the_meat(self);
return;
}
else
{
level thread meat_stink_player( ent );
}
if ( isdefined( self.owner ) ) if ( isdefined( self.owner ) )
{ {
@ -71,16 +62,7 @@ meat_bounce_override( pos, normal, ent, bounce )
if ( isdefined( closest_player ) ) if ( isdefined( closest_player ) )
{ {
if (closest_player isMeleeing() && level.scr_zm_ui_gametype_obj != "zmeat") level thread meat_stink_player( closest_player );
{
closest_player thread maps\mp\gametypes_zm\zmeat::spike_the_meat(self);
return;
}
else
{
level thread meat_stink_player( closest_player );
}
if ( isdefined( self.owner ) ) if ( isdefined( self.owner ) )
{ {