From 6b8d5abd7fc1d2f1d6f794640117c649eae3e01a Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Wed, 3 May 2023 15:58:03 -0700 Subject: Updated to 2023-04-30-2223 Revert more ammo patches. Revert more books patches. Clean up old book patch. Fix removed traits patch. Fix bathroom fluff patch. Remove obsolete vacutainer patch. Rename source patches. --- jc_allow-hacker-laptop.patch | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 jc_allow-hacker-laptop.patch (limited to 'jc_allow-hacker-laptop.patch') diff --git a/jc_allow-hacker-laptop.patch b/jc_allow-hacker-laptop.patch deleted file mode 100644 index 07f44ba..0000000 --- a/jc_allow-hacker-laptop.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/src/game.cpp -+++ b/src/game.cpp -@@ -224,6 +224,7 @@ - - static const itype_id itype_battery( "battery" ); - static const itype_id itype_grapnel( "grapnel" ); -+static const itype_id itype_hackerlaptop( "hacker_laptop" ); - static const itype_id itype_holybook_bible1( "holybook_bible1" ); - static const itype_id itype_holybook_bible2( "holybook_bible2" ); - static const itype_id itype_holybook_bible3( "holybook_bible3" ); -@@ -2501,7 +2502,8 @@ - remoteveh_cache_time = calendar::turn; - std::stringstream remote_veh_string( u.get_value( "remote_controlling_vehicle" ) ); - if( remote_veh_string.str().empty() || -- ( !u.has_active_bionic( bio_remote ) && !u.has_active_item( itype_remotevehcontrol ) ) ) { -+ ( !u.has_active_bionic( bio_remote ) && !u.has_active_item( itype_remotevehcontrol ) -+ && !u.has_active_item( itype_hackerlaptop ) ) ) { - remoteveh_cache = nullptr; - } else { - tripoint vp; -@@ -2521,7 +2523,7 @@ - remoteveh_cache_time = calendar::turn; - remoteveh_cache = veh; - if( veh != nullptr && !u.has_active_bionic( bio_remote ) && -- !u.has_active_item( itype_remotevehcontrol ) ) { -+ !u.has_active_item( itype_remotevehcontrol ) && !u.has_active_item( itype_hackerlaptop ) ) { - debugmsg( "Tried to set remote vehicle without bio_remote or remotevehcontrol" ); - veh = nullptr; - } -- cgit v1.2.1