Skip to content

Commit

Permalink
Merge pull request #37814 from olanti-p/pseuso-typo-fix
Browse files Browse the repository at this point in the history
Fix typo in item id of bio lockpick pseudo item
  • Loading branch information
ZhilkinSerg authored Feb 7, 2020
2 parents e7271b0 + 5885a7e commit 5079712
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion data/json/items/tool/entry_tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"use_action": { "type": "picklock", "pick_quality": 5 }
},
{
"id": "pseuso_bio_picklock",
"id": "pseudo_bio_picklock",
"type": "TOOL",
"name": "bio lockpick",
"description": "this a pseudo item",
Expand Down
2 changes: 1 addition & 1 deletion gfx/ChestHole16Tileset/tile_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -28736,7 +28736,7 @@
"rotates": false
},
{
"id": "pseuso_bio_picklock",
"id": "pseudo_bio_picklock",
"fg": 3225,
"bg": 632,
"rotates": false
Expand Down
2 changes: 1 addition & 1 deletion gfx/HitButton_iso/tile_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"fg": 2502
},
{
"id": ["unknown", "null", "t_null", "tr_null", "f_null", "fd_null", "vp_null", "apparatus", "bio_blade_weapon", "bio_blaster_gun", "bio_claws_weapon", "bio_eye_optic", "bio_laser_gun", "bio_lightning", "pseuso_bio_picklock", "software_blood_data", "software_hacking", "software_math", "software_medical", "software_useless", "testflames", "toolset", "generic_no_ammo", "cvd_machine", "muscle", "vp_pointer_fake_ammo", "vp_pseuso_bio_picklock", "vp_null", "vp_tracker", "vp_aisle_lights", "vp_roof_cloth", "vp_roof", "vp_hdroof", "vp_engine_1cyl", "vp_engine_vtwin", "vp_engine_inline4", "vp_engine_v6", "vp_engine_v8", "vp_engine_v12", "vp_diesel_engine_v6", "vp_diesel_engine_v8", "vp_diesel_engine_i6", "vp_engine_electric", "vp_engine_electric_enhanced", "vp_engine_electric_large", "vp_engine_electric_small", "vp_engine_plasma", "vp_foot_pedals", "vp_hand_rims", "vp_gas_tank_small", "vp_gas_tank", "vp_napalm_tank", "vp_gas_tank_little", "vp_diesel_tank_small", "vp_diesel_tank", "vp_diesel_tank_little", "vp_small_storage_battery", "vp_medium_storage_battery", "vp_storage_battery_mount", "vp_storage_battery_removable", "vp_storage_battery", "vp_minireactor", "vp_hydrogen_tank", "vp_water_tank_small", "vp_water_tank_little", "vp_water_tank", "vp_water_dirty_tank_small", "vp_water_dirty_tank_little", "vp_water_dirty_tank", "vp_water_tank_barrel", "vp_controls", "vp_controls_electronic", "vp_muffler", "vp_seatbelt", "vp_vehicle_alarm", "vp_seatbelt_heavyduty", "vp_v_curtain", "vp_aisle_curtain", "vp_water_faucet", "vp_plating_wood", "vp_plating_steel", "vp_plating_superalloy", "vp_plating_spiked", "vp_plating_hard", "vp_plating_military", "vp_headlight", "vp_headlight_reinforced", "vp_horn_bicycle", "vp_horn_car", "vp_horn_big", "vp_beeper", "vp_battery_motorbike", "vp_battery_car", "vp_alternator_motorbike", "vp_alternator_car", "vp_alternator_truck", "vp_generator_7500w", "vp_inboard_mirror", "vp_stereo", "vp_engine_1cyl_small", "vp_jumper_cable", "vp_jumper_cable_heavy", "vp_jumper_cable_debug", "vp_roof_wood", "vp_plating_chitin", "vp_plating_bone", "vp_metal_wheel", "vp_mounted_rm614", "vp_mounted_rm298", "vp_door_motor", "vp_drive_by_wire_controls", "vp_cam_control", "vp_atomic_lamp", "vp_atomic_light", "vp_vehicle_clock", "fake_UPS", "fire", "money", "pointer_fake_ammo" ],
"id": ["unknown", "null", "t_null", "tr_null", "f_null", "fd_null", "vp_null", "apparatus", "bio_blade_weapon", "bio_blaster_gun", "bio_claws_weapon", "bio_eye_optic", "bio_laser_gun", "bio_lightning", "pseudo_bio_picklock", "software_blood_data", "software_hacking", "software_math", "software_medical", "software_useless", "testflames", "toolset", "generic_no_ammo", "cvd_machine", "muscle", "vp_pointer_fake_ammo", "vp_pseudo_bio_picklock", "vp_null", "vp_tracker", "vp_aisle_lights", "vp_roof_cloth", "vp_roof", "vp_hdroof", "vp_engine_1cyl", "vp_engine_vtwin", "vp_engine_inline4", "vp_engine_v6", "vp_engine_v8", "vp_engine_v12", "vp_diesel_engine_v6", "vp_diesel_engine_v8", "vp_diesel_engine_i6", "vp_engine_electric", "vp_engine_electric_enhanced", "vp_engine_electric_large", "vp_engine_electric_small", "vp_engine_plasma", "vp_foot_pedals", "vp_hand_rims", "vp_gas_tank_small", "vp_gas_tank", "vp_napalm_tank", "vp_gas_tank_little", "vp_diesel_tank_small", "vp_diesel_tank", "vp_diesel_tank_little", "vp_small_storage_battery", "vp_medium_storage_battery", "vp_storage_battery_mount", "vp_storage_battery_removable", "vp_storage_battery", "vp_minireactor", "vp_hydrogen_tank", "vp_water_tank_small", "vp_water_tank_little", "vp_water_tank", "vp_water_dirty_tank_small", "vp_water_dirty_tank_little", "vp_water_dirty_tank", "vp_water_tank_barrel", "vp_controls", "vp_controls_electronic", "vp_muffler", "vp_seatbelt", "vp_vehicle_alarm", "vp_seatbelt_heavyduty", "vp_v_curtain", "vp_aisle_curtain", "vp_water_faucet", "vp_plating_wood", "vp_plating_steel", "vp_plating_superalloy", "vp_plating_spiked", "vp_plating_hard", "vp_plating_military", "vp_headlight", "vp_headlight_reinforced", "vp_horn_bicycle", "vp_horn_car", "vp_horn_big", "vp_beeper", "vp_battery_motorbike", "vp_battery_car", "vp_alternator_motorbike", "vp_alternator_car", "vp_alternator_truck", "vp_generator_7500w", "vp_inboard_mirror", "vp_stereo", "vp_engine_1cyl_small", "vp_jumper_cable", "vp_jumper_cable_heavy", "vp_jumper_cable_debug", "vp_roof_wood", "vp_plating_chitin", "vp_plating_bone", "vp_metal_wheel", "vp_mounted_rm614", "vp_mounted_rm298", "vp_door_motor", "vp_drive_by_wire_controls", "vp_cam_control", "vp_atomic_lamp", "vp_atomic_light", "vp_vehicle_clock", "fake_UPS", "fire", "money", "pointer_fake_ammo" ],
"//": "pseudo-items / stuff that shouldn't exist go here.",
"///": "also includes many vehicle parts which exist on undrawn layers of vehicles",
"fg": 7
Expand Down
2 changes: 1 addition & 1 deletion src/bionics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ bool Character::activate_bionic( int b, bool eff_only )

mod_moves( -100 );
} else if( bio.id == bio_lockpick ) {
tmp_item = item( "pseuso_bio_picklock", 0 );
tmp_item = item( "pseudo_bio_picklock", 0 );
g->refresh_all();
if( invoke_item( &tmp_item ) == 0 ) {
if( tmp_item.charges > 0 ) {
Expand Down

0 comments on commit 5079712

Please sign in to comment.