diff --git a/data/json/item_actions.json b/data/json/item_actions.json index 898950c73ecdb..b0c998a51c8aa 100644 --- a/data/json/item_actions.json +++ b/data/json/item_actions.json @@ -663,7 +663,7 @@ { "type": "item_action", "id": "PETFOOD", - "name": { "str": "Feed a wild animal… or a human" } + "name": { "str": "Feed an animal" } }, { "type": "item_action", diff --git a/src/iuse.cpp b/src/iuse.cpp index ad9b6dca4c3d2..6c8a529411fd3 100644 --- a/src/iuse.cpp +++ b/src/iuse.cpp @@ -1541,27 +1541,7 @@ std::optional iuse::petfood( Character *p, item *it, const tripoint & ) } creature_tracker &creatures = get_creature_tracker(); - // First a check to see if we are trying to feed a NPC dog food. - if( npc *const who = creatures.creature_at( *pnt ) ) { - if( query_yn( _( "Are you sure you want to feed a person %1$s?" ), it->tname() ) ) { - p->mod_moves( -to_moves( 1_seconds ) ); - p->add_msg_if_player( _( "You put your %1$s into %2$s's mouth!" ), - it->tname(), who->disp_name( true ) ); - if( x_in_y( 9, 10 ) || who->is_ally( *p ) ) { - who->say( - _( "Okay, but please, don't give me this again. I don't want to eat pet food in the Cataclysm all day." ) ); - } else { - p->add_msg_if_player( _( "%s knocks it from your hand!" ), who->disp_name() ); - who->make_angry(); - } - p->consume_charges( *it, 1 ); - return std::nullopt; - } else { - p->add_msg_if_player( _( "Never mind." ) ); - return std::nullopt; - } - // Then monsters. - } else if( monster *const mon = creatures.creature_at( *pnt, true ) ) { + if( monster *const mon = creatures.creature_at( *pnt, true ) ) { p->mod_moves( -to_moves( 1_seconds ) ); bool can_feed = false;