fixes unrelated bug to human AI, also fixes dropped items not being r…

…emoved from equipment map
cmss13-devs · Sep 24, 2024 · ab10637 · ab10637
1 parent 2c72024
commit ab10637
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm
@@ -633,7 +633,7 @@ GLOBAL_LIST_INIT(rebel_rifles, list(
 	var/gunpath = pick(GLOB.rebel_smgs)
 	var/ammopath = GLOB.rebel_smgs[gunpath]
 
-	spawn_weapon(gunpath, ammopath, M, ammo_amount)
+	spawn_weapon(gunpath, ammopath, M, FALSE, ammo_amount)
 
 	return 1
 
@@ -643,7 +643,7 @@ GLOBAL_LIST_INIT(rebel_rifles, list(
 	var/gunpath = pick(GLOB.rebel_shotguns)
 	var/ammopath = GLOB.rebel_shotguns[gunpath]
 
-	spawn_weapon(gunpath, ammopath, M, ammo_amount)
+	spawn_weapon(gunpath, ammopath, M, FALSE, ammo_amount)
 
 	return 1
 
@@ -653,7 +653,7 @@ GLOBAL_LIST_INIT(rebel_rifles, list(
 	var/gunpath = pick(GLOB.rebel_rifles)
 	var/ammopath = GLOB.rebel_rifles[gunpath]
 
-	spawn_weapon(gunpath, ammopath, M, ammo_amount)
+	spawn_weapon(gunpath, ammopath, M, FALSE, ammo_amount)
 
 	return 1
 

diff --git a/code/modules/mob/living/carbon/human/ai/action_datums/melee_atom.dm b/code/modules/mob/living/carbon/human/ai/action_datums/melee_atom.dm
@@ -26,7 +26,7 @@
 
 	//X.do_click(src, "", list())
 
-	brain.unholster_primary()
+	brain.unholster_primary() // this should eventually have support for melee weapons
 	//brain.ensure_primary_hand(brain.primary_weapon)
 	brain.tied_human.do_click(target, "", list())
 

diff --git a/code/modules/mob/living/carbon/human/ai/brain/ai_brain_items.dm b/code/modules/mob/living/carbon/human/ai/brain/ai_brain_items.dm
@@ -247,6 +247,12 @@
 			appraise_inventory(slot == "belt", slot == "backpack", slot == "left_pocket", slot == "right_pocket")
 			break
 
+	for(var/id in equipment_map)
+		for(var/obj/item/item_ref as anything in equipment_map[id])
+			if(item_ref == dropped)
+				equipment_map[id] -= item_ref
+				return
+
 /datum/human_ai_brain/proc/set_primary_weapon(obj/item/weapon/gun/new_gun)
 	if(primary_weapon)
 		UnregisterSignal(primary_weapon, COMSIG_PARENT_QDELETING)