summaryrefslogtreecommitdiff
path: root/src-01_radio-can-use-ups.patch
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2023-12-30 21:58:12 -0800
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2023-12-30 21:58:12 -0800
commitd4bc63a8f8ee37ec2de2f43734a60ca045e517c3 (patch)
treed49d6000c1d82e7add7cfcccf873f85224ab823c /src-01_radio-can-use-ups.patch
parentFix Mr Lapin meet the Isherwood quest looping. (diff)
downloadcataclysm-bn-d4bc63a8f8ee37ec2de2f43734a60ca045e517c3.tar.xz
Updated to 0.5.1
Removed obsolete mods. Revert removal of Alonso. Revert biodiesel working in petrol engines. Revert hard skill caps. Revert three more broken limb changesets. Revert another ammo rebalance changeset. Revert craftable smokeless gunpowder changeset. Revised book chapters revert patch. Fix some bad terrain in the godco patch. Fix some bad terrain in the prison island patch.
Diffstat (limited to 'src-01_radio-can-use-ups.patch')
-rw-r--r--src-01_radio-can-use-ups.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/src-01_radio-can-use-ups.patch b/src-01_radio-can-use-ups.patch
index 0d811a5..d75e8dc 100644
--- a/src-01_radio-can-use-ups.patch
+++ b/src-01_radio-can-use-ups.patch
@@ -18,8 +18,8 @@
+ if( !it->units_sufficient( *p ) || !( it->has_flag( flag_USE_UPS ) &&
+ p->has_enough_charges( *it, false ) ) ) {
p->add_msg_if_player( m_info, _( "Your tactical tonfa is out of power." ) );
- it->convert( itype_shocktonfa_off ).active = false;
- } else {
+ it->convert( itype_shocktonfa_off );
+ it->active = false;
@@ -4099,7 +4102,8 @@
int iuse::mp3( player *p, item *it, bool, const tripoint & )
{