diff options
Diffstat (limited to 'revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch')
-rw-r--r-- | revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch | 58 |
1 files changed, 58 insertions, 0 deletions
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 new file mode 100644 index 0000000..c04562e --- /dev/null +++ b/revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch @@ -0,0 +1,58 @@ +From 95488dda031d1bee2d33c5331f75e22e3f865e45 Mon Sep 17 00:00:00 2001 +From: Chaosvolt <chaosvolt@users.noreply.github.com> +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 @@ void Character::perform_uninstall( bionic_id bid, int difficulty, int success, + 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 ); + g->m.add_item( pos(), cbm ); + } else { + g->events().send<event_type::fails_to_remove_cbm>( getID(), bid ); +@@ -2094,10 +2089,8 @@ bool Character::uninstall_bionic( const bionic &target_cbm, monster &installer, + 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 ); + g->m.add_item( patient.pos(), cbm ); + } else { + bionics_uninstall_failure( installer, patient, difficulty, success, adjusted_skill ); +-- +2.35.1 + |