diff --git a/df.adventure.xml b/df.adventure.xml
index 0dcedda3d..39df3f4eb 100644
--- a/df.adventure.xml
+++ b/df.adventure.xml
@@ -239,6 +239,16 @@
         <pointer name='invitem' type-name='unit_inventory_item'/>
     </class-type>
 
+    <class-type type-name='adventure_item_interact_unnockst' inherits-from='adventure_optionst'>
+        <pointer name='item' type-name='item'/>
+        <pointer name='invitem' type-name='unit_inventory_item'/>
+    </class-type>
+
+    <class-type type-name='adventure_item_interact_load_ranged_weaponst' inherits-from='adventure_optionst'>
+        <pointer name='shooter' type-name='item'/>
+        <pointer name='weapon' type-name='item'/>
+    </class-type>
+
     <class-type type-name='adventure_item_interact_give_namest' inherits-from='adventure_optionst'>
         <pointer name='item' type-name='item'/>
     </class-type>
@@ -443,6 +453,7 @@
         <int32_t name='target' ref-target='unit'/>
         <pointer type-name='item' name='weapon'/>
         <pointer type-name='item' name='ammo'/>
+        <bool name='aim_carefully'/>
     </class-type>
 
     <class-type type-name='adventure_movement_shoot_tilest' inherits-from='adventure_movement_optionst'>
@@ -455,6 +466,7 @@
         <bool name='from_direct_click'/>
         <int32_t name='target' ref-target='unit'/>
         <pointer type-name='item' name='item'/>
+        <bool name='aim_carefully'/>
     </class-type>
 
     <class-type type-name='adventure_movement_throw_item_at_tilest' inherits-from='adventure_movement_optionst'>
diff --git a/df.creature.xml b/df.creature.xml
index 8cdeec21b..19905479d 100644
--- a/df.creature.xml
+++ b/df.creature.xml
@@ -664,6 +664,8 @@
         <stl-vector name='dye_color_iuse_palette_rowndex' type-name='int32_t'/>
 
         <int32_t name='use_standard_nex_body_palette_row'/>
+
+        <stl-string name='use_color_palette_token'/>
     </struct-type>
 
     <bitfield-type type-name='creature_graphics_layer_set_flag' base-type='uint64_t'> bay12: CREATURE_GRAPHICS_LAYER_SET_FLAG_*
diff --git a/df.d_basics.xml b/df.d_basics.xml
index 6069ee351..a2bb26582 100644
--- a/df.d_basics.xml
+++ b/df.d_basics.xml
@@ -1997,6 +1997,22 @@
             <item-attr name='tag' value='stopleadanimal'/>
             <item-attr name='group' value='All'/>
         </enum-item>
+        <enum-item name='LoadRangedWeapon'>
+            <item-attr name='tag' value='loadrangedweapon'/>
+            <item-attr name='group' value='All'/>
+        </enum-item>
+        <enum-item name='ShootRangedWeapon'>
+            <item-attr name='tag' value='shootrangedweapon'/>
+            <item-attr name='group' value='All'/>
+        </enum-item>
+        <enum-item name='ThrowItem'>
+            <item-attr name='tag' value='throwitem'/>
+            <item-attr name='group' value='All'/>
+        </enum-item>
+        <enum-item name='PostShootRecovery'>
+            <item-attr name='tag' value='postshootrecovery'/>
+            <item-attr name='group' value='All'/>
+        </enum-item>
     </enum-type>
 
     <enum-type type-name='misc_trait_type' base-type='int32_t'> bay12: CounterType
@@ -2093,6 +2109,7 @@
         <enum-item name='DidInteractionAnnouncementReduceDizzness'/>
         <enum-item name='HaveCheckedFavorDodge'/>
         <enum-item name='DidStrainExhaustionKO'/>
+        <enum-item name='CombatSeekAmmo'/>
     </enum-type>
 
     <enum-type type-name='charge_restrict_type' base-type='int32_t'> bay12: ChargeRestrictType
@@ -4073,6 +4090,7 @@
         <enum-item name='SeekHeistHandoff'/>
         <enum-item name='AdventureAutomove'/>
         <enum-item name='AdventureAutomoveAcrobatic'/>
+        <enum-item name='ArcherReposition'/>
     </enum-type>
 
     -- Unused: BuildPathResult
diff --git a/df.d_interface.xml b/df.d_interface.xml
index 7cc8ef0ba..fa9f164f0 100644
--- a/df.d_interface.xml
+++ b/df.d_interface.xml
@@ -1371,6 +1371,29 @@
 
         <ulong name='last_tick_update'/>
 
+        <bool name='setting_ammo'/>
+        <int32_t name='setting_ammo_squad_id' ref-target='squad'/>
+        <int32_t name='setting_ammo_scroll_position'/>
+        <bool name='setting_ammo_scrolling'/>
+        <stl-string name='setting_ammo_amount_str'/>
+        <bool name='setting_ammo_entering_amount'/>
+        <bool name='setting_ammo_mat'/>
+        <int32_t name='setting_ammo_mat_sea_index'/>
+        <stl-vector type-name='entity_material_category' name='am_cand_civ_mat'/>
+        <stl-vector type-name='int16_t' name='am_cand_spec_mat'/>
+        <stl-vector type-name='int32_t' name='am_cand_spec_matg'/>
+        <bool name='setting_ammo_new_type'/>
+        <stl-vector type-name='int16_t' name='am_cand_type'/>
+        <stl-vector type-name='int32_t' name='am_cand_subtype'/>
+        <stl-bit-vector name='am_cand_foreign'/>
+        <int32_t name='setting_ammo_scroll_position_am'/>
+        <bool name='setting_ammo_scrolling_am'/>
+
+        <bool name='setting_supplies'/>
+        <stl-vector type-name='int32_t' name='setting_supplies_squad_id' ref-target='squad'/>
+        <int32_t name='setting_supplies_scroll_position'/>
+        <bool name='setting_supplies_scrolling'/>
+
         <bool name='customizing_equipment'/>
         <int32_t name='customizing_squad_id'/>
         <int32_t name='customizing_squad_pos'/>
@@ -2721,12 +2744,6 @@
         <stl-vector pointer-type='entity_uniform' name='cand_uniform'/>
     </struct-type>
 
-    <struct-type type-name='squad_supplies_interfacest'>
-        <bool name='open'/>
-
-        <int32_t name='squad_id'/>
-    </struct-type>
-
     <struct-type type-name='create_squad_interfacest'>
         <bool name='open'/>
 
@@ -4924,8 +4941,16 @@
         <pointer type-name='item' name='shooter_it'/>
         <pointer type-name='item' name='ammo_it'/>
         <pointer type-name='item' name='thrown_it'/>
+        <bool name='show_no_prepped_ammo_warning'/>
 
         <stl-vector name='projectile_target_list' pointer-type='projectile_target_list_optionst'/>
+
+        <bool name='aiming_carefully'/>
+        <pointer name='target_unit' type-name='unit'/>
+        <int32_t name='scroll_position_aim_target'/>
+        <bool name='scrolling_aim_target'/>
+
+        <bool name='came_from_direct_click'/>
     </struct-type>
 
     <struct-type type-name='adventure_interface_lookst'>
@@ -5330,7 +5355,6 @@
         <compound name='info' type-name='info_interfacest'/>
         <compound name='squads' type-name='squads_interfacest'/>
         <compound name='create_squad' type-name='create_squad_interfacest'/>
-        <compound name='squad_supplies' type-name='squad_supplies_interfacest'/>
         <compound name='assign_uniform' type-name='assign_uniform_interfacest'/>
         <compound name='create_work_order' type-name='create_work_order_interfacest'/>
         <compound name='hotkey' type-name='hotkeys_interfacest'/>
diff --git a/df.g_src.keybindings.xml b/df.g_src.keybindings.xml
index 35673815b..039841c7d 100644
--- a/df.g_src.keybindings.xml
+++ b/df.g_src.keybindings.xml
@@ -358,6 +358,7 @@
         <enum-item name='MULTI_ATTACK'/>
         <enum-item name='A_LOOK'/>
         <enum-item name='A_SEARCH'/>
+        <enum-item name='A_NOCK'/>
         <enum-item name='A_ODOR'/>
         <enum-item name='A_DISPLAY_ODOR'/>
         <enum-item name='A_YIELD'/>
diff --git a/df.item.xml b/df.item.xml
index 1264029ff..ed4c4227b 100644
--- a/df.item.xml
+++ b/df.item.xml
@@ -2409,6 +2409,8 @@
         <stl-vector name='temp_save' has-bad-pointers='true' pointer-type='item'/>
 
         <stl-vector name='temp_save_compat' type-name='int32_t'/>
+
+        <stl-unordered-map name='deleters' comment='std::unordered_set&lt;df::item *&gt;'/>
     </struct-type>
 
     <enum-type type-name='artifact_flags'> bay12: ArtifactFlagType
diff --git a/df.itemdef.xml b/df.itemdef.xml
index ca7e6b256..ecf9c5745 100644
--- a/df.itemdef.xml
+++ b/df.itemdef.xml
@@ -166,6 +166,12 @@
         <enum-item name='TRAINING'/>
     </enum-type>
 
+    <enum-type type-name='weapon_load_type' base-type='int32_t'> bay12: WeaponLoadType
+        <enum-item name='NONE' value='-1'/>
+        <enum-item name='NOCKED'/>
+        <enum-item name='LOADED'/>
+    </enum-type>
+
     <class-type type-name='itemdef_weaponst' inherits-from='itemdef'
                 instance-vector='$global.world.raws.itemdefs.weapons'>
         <stl-string name="name"/>
@@ -182,7 +188,19 @@
         <df-flagarray name='flags' index-enum='weapon_flags'/>
         <stl-vector name="attacks" pointer-type='weapon_attack'/>
         <int32_t name="shoot_force"/>
+        <stl-vector type-name='physical_attribute_type' name='shot_force_phys_att'/>
+        <stl-vector type-name='int32_t' name='shot_force_phys_att_val'/>
+        <stl-vector type-name='mental_attribute_type' name='shot_force_ment_att'/>
+        <stl-vector type-name='int32_t' name='shot_force_ment_att_val'/>
+        <stl-vector type-name='job_skill' name='shot_force_skill'/>
+        <stl-vector type-name='int32_t' name='shot_force_skill_val'/>
         <int32_t name="shoot_maxvel"/>
+        <enum type-name='weapon_load_type' name='load_type'/>
+        <int32_t name='aim_difficulty'/>
+        <int32_t name='beginner_load_time'/>
+        <int32_t name='advanced_load_time'/>
+        <int32_t name='initiate_shot_time'/>
+        <int32_t name='shot_recovery_time'/>
         <static-array name='texpos' type-name='int32_t' count='28'/>
         <stl-vector name='graphics_info' pointer-type='itemdef_weapon_graphics_infost'/>
     </class-type>
diff --git a/df.job.xml b/df.job.xml
index 9b2e20bd1..3a36baaac 100644
--- a/df.job.xml
+++ b/df.job.xml
@@ -1414,6 +1414,10 @@
             <item-attr name='caption' value='No Activity'/>
             <item-attr name='type' value='Crime'/>
         </enum-item>
+        <enum-item name='StoreSquadEquipmentItem'>
+            <item-attr name='caption' value='Store Squad Equipment Item'/>
+            <item-attr name='type' value='Hauling'/>
+        </enum-item>
     </enum-type>
 
     <bitfield-type type-name='job_flags' base-type='uint32_t'> bay12: JOBFLAG_*
diff --git a/df.proj.xml b/df.proj.xml
index 702036e12..169da9c73 100644
--- a/df.proj.xml
+++ b/df.proj.xml
@@ -10,7 +10,6 @@
         <flag-bit name='has_hit_ground' comment='DELETE'/>
         <flag-bit name='bouncing'/>
         <flag-bit name='high_flying'/>
-
         <flag-bit name='piercing'/>
         <flag-bit name='to_be_deleted'/>
         <flag-bit name='hits_friends'/>
@@ -24,6 +23,8 @@
         <flag-bit name='struck'/>
         <flag-bit name='auto_hit'/>
         <flag-bit name='item_link_deleted'/>
+
+        <flag-bit name='small_aim_minus'/>
     </bitfield-type>
 
     <df-linked-list-type type-name='proj_list_link' item-type='projectile'/>
@@ -57,6 +58,8 @@
         <int32_t name="last_knock_item" ref-target='item'/>
         <int32_t name="last_knock_unit" ref-target='unit'/>
         <int32_t name="spec_target_unit" ref-target='unit' since='v0.40.01' comment='uninitialized+saved'/>
+        <int16_t name='target_bp'/>
+        <int32_t name='hit_chance_modifier'/>
 
         <int32_t name="pos_x"/>
         <int32_t name="pos_y"/>
diff --git a/df.unit.xml b/df.unit.xml
index 38ebb5760..c78452e6a 100644
--- a/df.unit.xml
+++ b/df.unit.xml
@@ -1096,6 +1096,56 @@
         <int32_t name='fatigue'/>
     </struct-type>
 
+    <bitfield-type type-name='unit_move_load_ranged_weapon_flag' base-type='uint32_t'> bay12: UNIT_MOVE_LOAD_RANGED_WEAPON_FLAG_*
+        <flag-bit name='then_shoot'/>
+        <flag-bit name='playcombat'/>
+    </bitfield-type>
+
+    <struct-type type-name='unit_action_data_load_ranged_weapon' original-name='unit_move_load_ranged_weaponst'>
+        <int32_t name='movewait'/>
+        <int32_t name='shooter_itid' ref-target='item'/>
+        <int32_t name='ammo_itid' ref-target='item'/>
+        <bitfield name='flags' base-type='uint32_t' type-name='unit_move_load_ranged_weapon_flag'/>
+        <int32_t name='target_unid' ref-target='unit'/>
+        <int16_t name='target_lx'/>
+        <int16_t name='target_ly'/>
+        <int16_t name='target_lz'/>
+        <int16_t name='target_bp'/>
+        <int32_t name='target_bp_hit_chance_adjustment'/>
+    </struct-type>
+
+    <bitfield-type type-name='unit_move_shoot_ranged_weapon_flag' base-type='uint32_t'> bay12: UNIT_MOVE_SHOOT_RANGED_WEAPON_FLAG_*
+        <flag-bit name='playcombat'/>
+    </bitfield-type>
+
+    <struct-type type-name='unit_action_data_shoot_ranged_weapon' original-name='unit_move_shoot_ranged_weaponst'>
+        <int32_t name='movewait'/>
+        <int32_t name='shooter_itid' ref-target='item'/>
+        <int32_t name='ammo_itid' ref-target='item'/>
+        <bitfield name='flags' base-type='uint32_t' type-name='unit_move_shoot_ranged_weapon_flag'/>
+        <int32_t name='target_unid' ref-target='unit'/>
+        <int16_t name='target_lx'/>
+        <int16_t name='target_ly'/>
+        <int16_t name='target_lz'/>
+        <int16_t name='target_bp'/>
+        <int32_t name='target_bp_hit_chance_adjustment'/>
+    </struct-type>
+
+    <struct-type type-name='unit_action_data_throw_item' original-name='unit_move_throw_itemst'>
+        <int32_t name='movewait'/>
+        <int32_t name='thrown_itid' ref-target='item'/>
+        <int32_t name='target_unid' ref-target='unit'/>
+        <int16_t name='target_lx'/>
+        <int16_t name='target_ly'/>
+        <int16_t name='target_lz'/>
+        <int16_t name='target_bp'/>
+        <int32_t name='target_bp_hit_chance_adjustment'/>
+    </struct-type>
+
+    <struct-type type-name='unit_action_data_post_shoot_recovery' original-name='unit_move_post_shoot_recoveryst'>
+        <int32_t name='movewait'/>
+    </struct-type>
+
     <struct-type type-name='unit_action' original-name='unit_movest'>
         <enum name='type' type-name='unit_action_type' init-value='None'/>
 
@@ -1131,6 +1181,10 @@
             <compound name='dismount' type-name='unit_action_data_dismount'/>
             <compound name='leadanimal' type-name='unit_action_data_lead_animal'/>
             <compound name='stopleadanimal' type-name='unit_action_data_stop_lead_animal'/>
+            <compound name='loadrangedweapon' type-name='unit_action_data_load_ranged_weapon'/>
+            <compound name='shootrangedweapon' type-name='unit_action_data_shoot_ranged_weapon'/>
+            <compound name='throwitem' type-name='unit_action_data_throw_item'/>
+            <compound name='postshootrecovery' type-name='unit_action_data_post_shoot_recovery'/>
         </compound>
     </struct-type>
 
@@ -1215,6 +1269,7 @@
         <enum-item name='Pet' comment='Left shoulder, right shoulder, or head, selected randomly using pet_seed'/>
         <enum-item name='SewnInto'/>
         <enum-item name='Strapped'/>
+        <enum-item name='Nocked'/>
     </enum-type>
 
     <struct-type type-name='unit_inventory_item' original-name='invitemst'>
@@ -1228,7 +1283,7 @@
                  refers-to='$$._global._parent._global.body.body_plan.body_parts[$]'/>
 
         <int32_t name='pet_seed' comment='RNG seed for Pet mode'/>
-        <int32_t name='wound_id' init-value='-1' comment='-1 unless suture'/>
+        <int32_t name='wound_id' init-value='-1' comment='also nocked_in_itemid'/>
     </struct-type>
 
     <enum-type type-name='soldier_mood_type' base-type='int32_t'> bay12: SoldierMoodType
@@ -1311,7 +1366,7 @@
         <flag-bit name='trade_resolved' comment='(CIV_RESOLVED)'/>
         <flag-bit name='has_breaks' comment='(EVALUATE_LEAKS)'/>
         <flag-bit name='gutted' comment='(HEALTH_GUTTED)'/>
-        <flag-bit comment='(UNUSED_16)'/>
+        <flag-bit name='must_forget_completely_keep_rooms'/>
 
         <flag-bit name='locked_in_for_trading' comment="(TRADE_LOCKED) Locked in for trading"/>
         <flag-bit name='slaughter' comment='(BUTCHERABLE) marked for slaughter'/>
@@ -2744,7 +2799,6 @@
         <int32_t name='next_action_id'/>
 
         <compound name='counters'> not a compound:
-            <int32_t name='think_counter' comment='loaddelay'/>
             <int32_t name='job_counter' comment='movewait'/>
             <int32_t name='swap_counter'/>