changes to the PR since i didn't have perms to push directly

cmss13-devs · Sep 24, 2024 · 9c891c6 · 9c891c6
1 parent 0ce8fff
commit 9c891c6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/code/modules/mob/living/carbon/human/ai/brain/ai_brain_health.dm b/code/modules/mob/living/carbon/human/ai/brain/ai_brain_health.dm
@@ -101,6 +101,7 @@
 			if(!bleed_heal)
 				goto bone
 
+			end_gun_fire()
 			holster_primary()
 			equip_item_from_equipment_map(HUMAN_AI_HEALTHITEMS, bleed_heal)
 			sleep(short_action_delay)
@@ -124,6 +125,7 @@
 			if(!bone_heal)
 				goto fire
 
+			end_gun_fire()
 			holster_primary()
 			equip_item_from_equipment_map(HUMAN_AI_HEALTHITEMS, bone_heal)
 			sleep(short_action_delay)
@@ -146,6 +148,7 @@
 			if(!burn_heal)
 				goto pain
 
+			end_gun_fire()
 			holster_primary()
 			equip_item_from_equipment_map(HUMAN_AI_HEALTHITEMS, burn_heal)
 			sleep(short_action_delay)
@@ -169,6 +172,7 @@
 			if(!painkiller)
 				goto tox
 
+			end_gun_fire()
 			holster_primary()
 			equip_item_from_equipment_map(HUMAN_AI_HEALTHITEMS, painkiller)
 			sleep(short_action_delay)
@@ -191,6 +195,7 @@
 			if(!tox_heal)
 				goto oxy
 
+			end_gun_fire()
 			holster_primary()
 			equip_item_from_equipment_map(HUMAN_AI_HEALTHITEMS, tox_heal)
 			sleep(short_action_delay)
@@ -212,6 +217,7 @@
 			if(!oxy_heal)
 				return
 
+			end_gun_fire()
 			holster_primary()
 			equip_item_from_equipment_map(HUMAN_AI_HEALTHITEMS, oxy_heal)
 			sleep(short_action_delay)

diff --git a/code/modules/mob/living/carbon/human/ai/brain/ai_brain_targeting.dm b/code/modules/mob/living/carbon/human/ai/brain/ai_brain_targeting.dm
@@ -146,7 +146,7 @@
 
 	tied_human.face_atom(current_target)
 
-	if(get_dist(tied_human, current_target) > gun_data.maximum_range && COOLDOWN_FINISHED(src, return_fire))
+	if((get_dist(tied_human, current_target) > gun_data.maximum_range) && COOLDOWN_FINISHED(src, return_fire))
 		currently_busy = FALSE
 		return
 

diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
@@ -253,7 +253,7 @@ bullets/shells. ~N
 	max_rounds = 5 // For shotguns, though this will be determined by the handful type when generated.
 	flags_atom = FPRINT|CONDUCT
 	flags_magazine = AMMUNITION_HANDFUL
-	flags_human_ai = null
+	flags_human_ai = NONE
 	attack_speed = 3 // should make reloading less painful
 
 /obj/item/ammo_magazine/handful/Initialize(mapload, spawn_empty)