From 42209cb39a6d278e0c3ad9dafd13bba47d3f9adb Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Mon, 18 Jan 2021 05:01:02 -0800 Subject: Revert the npc sleep on tables patch Add patch to prevent non-faction NPCs becoming sleep deprived --- 0005-allow-bio-firestarter-on-smoker.patch | 39 ------------------------------ 1 file changed, 39 deletions(-) delete mode 100644 0005-allow-bio-firestarter-on-smoker.patch (limited to '0005-allow-bio-firestarter-on-smoker.patch') diff --git a/0005-allow-bio-firestarter-on-smoker.patch b/0005-allow-bio-firestarter-on-smoker.patch deleted file mode 100644 index e81a493..0000000 --- a/0005-allow-bio-firestarter-on-smoker.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/src/iexamine.cpp -+++ b/src/iexamine.cpp -@@ -4868,18 +4868,30 @@ - return; - } - -- if( !p.has_charges( "fire", 1 ) ) { -+ const bool has_bionic_firestarter = p.has_bionic( bio_lighter ) && -+ p.enough_power_for( bio_lighter ); -+ -+ if( !has_bionic_firestarter && !p.has_charges( "fire", 1 ) ) { - add_msg( _( "This smoking rack is ready to be fired, but you have no fire source." ) ); - return; - } else if( !query_yn( _( "Fire the smoking rack?" ) ) ) { - return; - } - -- p.use_charges( "fire", 1 ); -- for( auto &it : g->m.i_at( examp ) ) { -- if( it.has_flag( flag_SMOKABLE ) ) { -- it.process_temperature_rot( 1, examp, nullptr ); -- it.set_flag( flag_PROCESSING ); -+ if( has_bionic_firestarter ) { -+ for( auto &it : g->m.i_at( examp ) ) { -+ if( it.has_flag( flag_SMOKABLE ) ) { -+ it.process_temperature_rot( 1, examp, nullptr ); -+ it.set_flag( flag_PROCESSING ); -+ } -+ } -+ } else { -+ p.use_charges( "fire", 1 ); -+ for( auto &it : g->m.i_at( examp ) ) { -+ if( it.has_flag( flag_SMOKABLE ) ) { -+ it.process_temperature_rot( 1, examp, nullptr ); -+ it.set_flag( flag_PROCESSING ); -+ } - } - } - g->m.furn_set( examp, next_smoker_type ); -- cgit v1.2.1