Human process stuff

Author: Lumipharon

code/datums/managed_inventory.dm

@@ -19,6 +19,7 @@
 	var/list/medical_list
 	var/list/grenade_list
 	var/list/engineering_list
+	var/list/food_list
 	//damage type specific item lists
 	var/list/brute_list
 	var/list/burn_list
@@ -61,6 +62,7 @@
 		QDEL_NULL(medical_list)
 		QDEL_NULL(grenade_list)
 		QDEL_NULL(engineering_list)
+		QDEL_NULL(food_list)
 
 		QDEL_NULL(brute_list)
 		QDEL_NULL(burn_list)
@@ -82,6 +84,7 @@
 	medical_list = list()
 	grenade_list = list()
 	engineering_list = list()
+	food_list = list()
 
 	brute_list = list()
 	burn_list = list()
@@ -103,8 +106,6 @@
 		return
 	if(equipped_item in equipped_list)
 		return
-	RegisterSignal(equipped_item, COMSIG_ATOM_ENTERED, PROC_REF(item_stored))
-	RegisterSignal(equipped_item, COMSIG_ITEM_REMOVED_INVENTORY, PROC_REF(item_unequipped))
 	equipped_list += equipped_item
 
 	var/list/sort_list = list(equipped_item)
@@ -136,66 +137,85 @@
 	for(var/obj/item/thing AS in sort_list)
 		SEND_SIGNAL(thing, COMSIG_INVENTORY_STORED_REMOVAL)
 
-//wrapper due to arg order, can probs remove tho
+///Wrapper for sorting a newly stored item
 /datum/managed_inventory/proc/item_stored(mob/store_mob, obj/item/new_item, slot)
 	SIGNAL_HANDLER
 	sort_item(new_item)
 
+///Sorts an item into any relevant lists
 /datum/managed_inventory/proc/sort_item(obj/item/new_item)
-	if(isgun(new_item))
-		gun_list_add(new_item)
+	var/list/chosen_list = get_right_list(new_item)
+	if(!chosen_list)
 		return
+	if(new_item in chosen_list)
+		return //moved around on our mob
+
+	RegisterSignal(new_item, COMSIG_ATOM_ENTERED, PROC_REF(item_stored))
+	RegisterSignal(new_item, COMSIG_ITEM_REMOVED_INVENTORY, PROC_REF(item_unequipped))
+
+	if(chosen_list == gun_list)
+		gun_list_add(new_item)
+	if(chosen_list == melee_list)
+		melee_list_add(new_item)
+	if(chosen_list == grenade_list)
+		grenade_list_add(new_item)
+	if(chosen_list == ammo_list)
+		ammo_list_add(new_item)
+	if(chosen_list == medical_list)
+		medical_list_add(new_item)
+	if(chosen_list == engineering_list)
+		engineering_list_add(new_item)
+	if(chosen_list == food_list)
+		food_list_add(new_item)
+
+///Finds the right list for an item
+/datum/managed_inventory/proc/get_right_list(obj/item/new_item)
+	if(isgun(new_item))
+		return gun_list
 	if((istype(new_item, /obj/item/weapon))) //|| istype(new_item, /obj/item/attachable/bayonetknife) //they are a completely different type, so fuck out due to the force changes. sob
 		if(istype(new_item, /obj/item/weapon/twohanded/offhand))
 			return
-		melee_list_add(new_item)
-		return
+		return melee_list
 	if(istype(new_item, /obj/item/explosive/grenade))
 		if(istype(new_item, /obj/item/explosive/grenade/flare))
 			return
-		grenade_list_add(new_item)
-		return
+		return grenade_list
 	if(istype(new_item, /obj/item/ammo_magazine) || istype(new_item, /obj/item/cell/lasgun))
-		ammo_list_add(new_item)
-		return
+		return ammo_list
 	if(isitemstack(new_item))
 		if(istype(new_item, /obj/item/stack/medical))
-			medical_list_add(new_item)
-			return
+			return medical_list
 		if(istype(new_item, /obj/item/stack/sheet))
-			engineering_list_add(new_item)
-			return
+			return engineering_list
+	if(isfood(new_item))
+		return food_list
 	if(isreagentcontainer(new_item) || istype(new_item, /obj/item/tweezers_advanced) || istype(new_item, /obj/item/tweezers))
-		medical_list_add(new_item)
-		return
+		return medical_list
 
 //boiler plate
 
 ///Adds an item to this list
 /datum/managed_inventory/proc/gun_list_add(obj/item/new_item)
-	SIGNAL_HANDLER
 	if(new_item in gun_list)
 		return
 	//I feel like there was some dumb ass reason why I wasn't able to do this... but with testing it works fine??
 	//might have been relevant for non weapons in storage?
 	//keep an eye on this.
 	gun_list += new_item
-	RegisterSignals(new_item, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING, COMSIG_INVENTORY_STORED_REMOVAL), PROC_REF(gun_list_removal), TRUE)//COMSIG_MOVABLE_MOVED is sent AFTER COMSIG_ATOM_ENTERED.. this is fucking annoying but eh
+	RegisterSignals(new_item, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING, COMSIG_INVENTORY_STORED_REMOVAL), PROC_REF(gun_list_removal))//COMSIG_MOVABLE_MOVED is sent AFTER COMSIG_ATOM_ENTERED.. this is fucking annoying but eh
 	SEND_SIGNAL(src, COMSIG_INVENTORY_DAT_GUN_ADDED)
 
 ///Adds an item to this list
 /datum/managed_inventory/proc/melee_list_add(obj/item/new_item)
-	SIGNAL_HANDLER
 	if(new_item in melee_list)
 		return
 	melee_list += new_item
-	RegisterSignals(new_item, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING, COMSIG_INVENTORY_STORED_REMOVAL), PROC_REF(melee_list_removal), TRUE)
+	RegisterSignals(new_item, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING, COMSIG_INVENTORY_STORED_REMOVAL), PROC_REF(melee_list_removal))
 	SEND_SIGNAL(src, COMSIG_INVENTORY_DAT_MELEE_ADDED)
 
 ///Adds an item to the relevant med lists
 /datum/managed_inventory/proc/medical_list_add(obj/item/new_item)
-	SIGNAL_HANDLER
-	RegisterSignals(new_item, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING, COMSIG_INVENTORY_STORED_REMOVAL), PROC_REF(medical_list_removal), TRUE)
+	RegisterSignals(new_item, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING, COMSIG_INVENTORY_STORED_REMOVAL), PROC_REF(medical_list_removal))
 	var/generic = TRUE
 	for(var/damtype in GLOB.ai_damtype_to_heal_list)
 		if(!(new_item.type in GLOB.ai_damtype_to_heal_list[damtype]))
@@ -242,21 +262,23 @@
 
 ///Adds an item to this list
 /datum/managed_inventory/proc/ammo_list_add(obj/item/new_item)
-	SIGNAL_HANDLER
 	ammo_list |= new_item
-	RegisterSignals(new_item, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING, COMSIG_INVENTORY_STORED_REMOVAL), PROC_REF(ammo_list_removal), TRUE)
+	RegisterSignals(new_item, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING, COMSIG_INVENTORY_STORED_REMOVAL), PROC_REF(ammo_list_removal))
 
 ///Adds an item to this list
 /datum/managed_inventory/proc/grenade_list_add(obj/item/new_item)
-	SIGNAL_HANDLER
 	grenade_list |= new_item
-	RegisterSignals(new_item, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING, COMSIG_INVENTORY_STORED_REMOVAL), PROC_REF(grenade_list_removal), TRUE)
+	RegisterSignals(new_item, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING, COMSIG_INVENTORY_STORED_REMOVAL), PROC_REF(grenade_list_removal))
 
 ///Adds an item to this list
 /datum/managed_inventory/proc/engineering_list_add(obj/item/new_item)
-	SIGNAL_HANDLER
 	engineering_list |= new_item
-	RegisterSignals(new_item, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING, COMSIG_INVENTORY_STORED_REMOVAL), PROC_REF(engineering_list_removal), TRUE)
+	RegisterSignals(new_item, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING, COMSIG_INVENTORY_STORED_REMOVAL), PROC_REF(engineering_list_removal))
+
+///Adds an item to this list
+/datum/managed_inventory/proc/food_list_add(obj/item/new_item)
+	food_list |= new_item
+	RegisterSignals(new_item, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING, COMSIG_INVENTORY_STORED_REMOVAL), PROC_REF(food_list_removal))
 
 ///Removes an item from this list
 /datum/managed_inventory/proc/gun_list_removal(obj/item/moving_item)
@@ -317,4 +339,10 @@
 	engineering_list -= moving_item
 	UnregisterSignal(moving_item, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING, COMSIG_INVENTORY_STORED_REMOVAL))
 
-
+///Removes an item from this list
+/datum/managed_inventory/proc/food_list_removal(obj/item/moving_item)
+	SIGNAL_HANDLER
+	if(!QDELETED(moving_item) && moving_item.loc == owner)
+		return //still in inventory
+	food_list -= moving_item
+	UnregisterSignal(moving_item, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING, COMSIG_INVENTORY_STORED_REMOVAL))

code/modules/ai/ai_behaviors/ai_behavior.dm

@@ -64,7 +64,6 @@ Registers signals, handles the pathfinding element addition/removal alongside ma
 	mob_parent = parent_to_assign
 	set_escorted_atom(null, escorted_atom)
 	//We always use the escorted atom as our reference point for looking for target. So if we don't have any escorted atom, we take ourselve as the reference
-	START_PROCESSING(SSprocessing, src)
 	if(is_offered_on_creation)
 		LAZYOR(GLOB.ssd_living_mobs, mob_parent)
 
@@ -79,6 +78,7 @@ Registers signals, handles the pathfinding element addition/removal alongside ma
 
 ///Register ai behaviours
 /datum/ai_behavior/proc/start_ai()
+	START_PROCESSING(SSprocessing, src)
 	if(escorted_atom)
 		global_set_escorted_atom(null, escorted_atom)
 	RegisterSignal(SSdcs, COMSIG_GLOB_AI_GOAL_SET, PROC_REF(set_goal_node))

code/modules/ai/ai_behaviors/human_mobs/helper_procs.dm

@@ -27,6 +27,14 @@
 			return FALSE
 	return TRUE
 
+/obj/item/reagent_containers/food/ai_should_use(mob/living/target, mob/living/user)
+	if(!ishuman(target))
+		return FALSE
+	var/mob/living/carbon/human/human_target = target
+	if((reagents.get_reagent_amount(/datum/reagent/consumable/nutriment) * 37.5) + human_target.nutrition >= NUTRITION_OVERFED)
+		return FALSE
+	return TRUE
+
 ///AI uses this item in some manner, such as consuming or activating it
 /obj/item/proc/ai_use(mob/living/target, mob/living/user)
 	return FALSE
@@ -69,6 +77,14 @@
 		attack_self(user)
 		return TRUE
 
+/obj/item/reagent_containers/food/ai_use(mob/living/target, mob/living/user)
+	target.attackby(src, user)
+
+/obj/item/reagent_containers/food/snacks/ai_use(mob/living/target, mob/living/user)
+	if(package)
+		attack_self(user)
+	return ..()
+
 ///AI mob interaction with this atom, such as picking it up
 /atom/proc/do_ai_interact(mob/living/interactor)
 	interactor.UnarmedAttack(src, TRUE) //only used for picking up items atm

code/modules/ai/ai_behaviors/human_mobs/human_mob.dm

@@ -87,9 +87,20 @@
 	if(mob_parent.do_actions)
 		return ..()
 
+	if(human_parent.lying_angle)
+		INVOKE_ASYNC(human_parent, TYPE_PROC_REF(/mob/living/carbon/human, get_up))
+
 	if((medical_rating >= AI_MED_MEDIC) && medic_process())
 		return
 
+	var/mob/living/carbon/human/human_parent = mob_parent
+	if((human_parent.nutrition <= NUTRITION_HUNGRY) && length(mob_inventory.food_list) && (human_parent.nutrition + (37.5 * human_parent.reagents.get_reagent_amount(/datum/reagent/consumable/nutriment)) < NUTRITION_WELLFED))
+		var/obj/item/reagent_containers/food/food = mob_inventory.food_list[1]
+		food.ai_use(mob_parent, mob_parent)
+
+	if(mob_parent.buckled && !istype(mob_parent.buckled, /obj/structure/droppod)) //unbuckling from your pod midflight is not ideal
+		mob_parent.buckled.unbuckle_mob(mob_parent)
+
 	for(var/datum/action/action in ability_list)
 		if(!action.ai_should_use(atom_to_walk_to)) //todo: some of these probably should be aimmed at combat_target somehow...
 			continue
@@ -383,7 +394,7 @@
 			human_ai_state_flags &= ~(HUMAN_AI_ANY_HEALING)
 			late_initialize()
 			return
-		if(current_action == MOVING_TO_SAFETY)
+		if((current_action == MOVING_TO_SAFETY) || !combat_target)
 			if(attacker && attacker.faction != mob_parent.faction)
 				set_combat_target(attacker)
 			return

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -27,21 +27,15 @@
 		else
 			reagents.add_reagent(rid, amount, data)
 
-/obj/item/reagent_containers/food/snacks/proc/On_Consume(mob/M)
-	if(!usr)
-		return
-
+///Handles effects when the snack is finished
+/obj/item/reagent_containers/food/snacks/proc/On_Consume(mob/consumer)
 	if(reagents.total_volume)
 		return
 
-	balloon_alert_to_viewers("Eats \the [src]")
-
-	usr.dropItemToGround(src)	//so icons update :[
-
+	consumer.dropItemToGround(src)
 	if(trash)
-		var/obj/item/T = new trash
-		usr.put_in_hands(T)
-
+		var/obj/item/new_trash = new trash
+		consumer.put_in_hands(new_trash)
 	qdel(src)
 
 /obj/item/reagent_containers/food/snacks/attack_self(mob/user as mob)
@@ -53,7 +47,7 @@
 	attack_hand(xeno_attacker)
 
 /obj/item/reagent_containers/food/snacks/attack(mob/M, mob/user, def_zone)
-	if(!reagents.total_volume)						//Shouldn't be needed but it checks to see if it has anything left in it.
+	if(!reagents?.total_volume)						//Shouldn't be needed but it checks to see if it has anything left in it.
 		balloon_alert(user, "None of [src] left")
 		M.dropItemToGround(src)	//so icons update :[
 		qdel(src)
@@ -692,9 +686,9 @@
 	. = ..()
 	unpopped = rand(1,10)
 
-/obj/item/reagent_containers/food/snacks/popcorn/On_Consume()
+/obj/item/reagent_containers/food/snacks/popcorn/On_Consume(mob/consumer)
 	if(prob(unpopped))	//lol ...what's the point?
-		to_chat(usr, span_warning("You bite down on an un-popped kernel!"))
+		to_chat(consumer, span_warning("You bite down on an un-popped kernel!"))
 		unpopped = max(0, unpopped-1)
 	return ..()
 
@@ -855,22 +849,22 @@
 	balloon_alert_to_viewers("unwraps [src]")
 	package = FALSE
 
-/obj/item/reagent_containers/food/snacks/monkeycube/On_Consume(mob/M)
-	to_chat(M, span_warning("Something inside of you suddently expands!</span>"))
-	balloon_alert_to_viewers("eats [src]", ignored_mobs = M)
-	usr.dropItemToGround(src)
-	if(!ishuman(M))
+/obj/item/reagent_containers/food/snacks/monkeycube/On_Consume(mob/consumer)
+	to_chat(consumer, span_warning("Something inside of you suddently expands!</span>"))
+	balloon_alert_to_viewers("eats [src]", ignored_mobs = consumer)
+	consumer.dropItemToGround(src)
+	if(!ishuman(consumer))
 		return ..()
 	//Do not try to understand.
-	var/obj/item/surprise = new(M)
+	var/obj/item/surprise = new(consumer)
 	var/mob/ook = monkey_type
 	surprise.icon = initial(ook.icon)
 	surprise.icon_state = initial(ook.icon_state)
 	surprise.name = "malformed [initial(ook.name)]"
 	surprise.desc = "Looks like \a very deformed [initial(ook.name)], a little small for its kind. It shows no signs of life."
 	surprise.transform *= 0.6
-	surprise.add_mob_blood(M)
-	var/mob/living/carbon/human/H = M
+	surprise.add_mob_blood(consumer)
+	var/mob/living/carbon/human/H = consumer
 	var/datum/limb/E = H.get_limb("chest")
 	E.fracture()
 	for (var/datum/internal_organ/I in E.internal_organs)
@@ -880,7 +874,7 @@
 		E.cavity = 0
 	else 		//someone is having a bad day
 		E.createwound(CUT, 30)
-		surprise.embed_into(M, E)
+		surprise.embed_into(consumer, E)
 	qdel(src)
 
 /obj/item/reagent_containers/food/snacks/monkeycube/proc/Expand()