From a22c1d8dc3f9be98adf085010546e446cb97a5bf Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Wed, 10 Aug 2022 22:51:50 -0700 Subject: Updated to 2022-08-06-2156 Remove obsolete gcc patch Remove revert-05 Fix bunker shop backport for BN's overmap connection change. --- ...lth-and-fault-on-uninstalled-bionics-1389.patch | 58 ---------------------- 1 file changed, 58 deletions(-) delete mode 100644 revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch (limited to 'revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch') diff --git a/revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch b/revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch deleted file mode 100644 index 8840161..0000000 --- a/revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 95488dda031d1bee2d33c5331f75e22e3f865e45 Mon Sep 17 00:00:00 2001 -From: Chaosvolt -Date: Sat, 19 Mar 2022 09:58:44 -0500 -Subject: [PATCH] No filth and fault on uninstalled bionics (#1389) - -* No filth and fault on uninstalled bionics - -* Removed unused declarations ---- - src/bionics.cpp | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/src/bionics.cpp b/src/bionics.cpp -index 9bdbf04379..52ffef4532 100644 ---- a/src/bionics.cpp -+++ b/src/bionics.cpp -@@ -134,8 +134,6 @@ static const itype_id itype_UPS( "UPS" ); - static const itype_id itype_UPS_off( "UPS_off" ); - static const itype_id itype_water_clean( "water_clean" ); - --static const fault_id fault_bionic_salvaged( "fault_bionic_salvaged" ); -- - static const skill_id skill_computer( "computer" ); - static const skill_id skill_electronics( "electronics" ); - static const skill_id skill_firstaid( "firstaid" ); -@@ -192,7 +190,6 @@ static const trait_id trait_THRESH_MEDICAL( "THRESH_MEDICAL" ); - static const std::string flag_ALLOWS_NATURAL_ATTACKS( "ALLOWS_NATURAL_ATTACKS" ); - static const std::string flag_AURA( "AURA" ); - static const std::string flag_CABLE_SPOOL( "CABLE_SPOOL" ); --static const std::string flag_FILTHY( "FILTHY" ); - static const std::string flag_NO_PACKED( "NO_PACKED" ); - static const std::string flag_NO_STERILE( "NO_STERILE" ); - static const std::string flag_NO_UNWIELD( "NO_UNWIELD" ); -@@ -2019,10 +2016,8 @@ - if( bid->itype().is_valid() ) { - cbm = item( bid.c_str() ); - } -- cbm.set_flag( flag_FILTHY ); - cbm.set_flag( flag_NO_STERILE ); - cbm.set_flag( flag_NO_PACKED ); -- cbm.faults.emplace( fault_bionic_salvaged ); - here.add_item( pos(), cbm ); - } else { - g->events().send( getID(), bid ); -@@ -2094,10 +2089,8 @@ - patient.remove_bionic( target_cbm.id ); - const itype_id iid = itemtype.is_valid() ? itemtype : itype_burnt_out_bionic; - item cbm( iid, calendar::start_of_cataclysm ); -- cbm.set_flag( flag_FILTHY ); - cbm.set_flag( flag_NO_STERILE ); - cbm.set_flag( flag_NO_PACKED ); -- cbm.faults.emplace( fault_bionic_salvaged ); - get_map().add_item( patient.pos(), cbm ); - } else { - bionics_uninstall_failure( installer, patient, difficulty, success, adjusted_skill ); --- -2.35.1 - -- cgit v1.2.1