hmmm....

code/__DEFINES/ai/ai.dm

@@ -31,11 +31,7 @@
 ///Finish the behavior successfully
 #define AI_BEHAVIOR_SUCCEEDED (1<<1)
 ///Finish the behavior unsuccessfully
-<<<<<<< Updated upstream
 #define AI_BEHAVIOR_FAILED (1<<1)
-=======
-#define AI_BEHAVIOR_FAILED (1<<2)
->>>>>>> Stashed changes
 
 #define AI_BEHAVIOR_INSTANT (NONE)
 

code/_globalvars/traits/_traits.dm

@@ -611,10 +611,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		/* "TRAIT_TOSS_GUN_HARD" = TRAIT_TOSS_GUN_HARD, */
 		/* "TRAIT_UNHUSKABLE" = TRAIT_UNHUSKABLE, */
 		/* "TRAIT_USER_SCOPED" = TRAIT_USER_SCOPED, */
-<<<<<<< Updated upstream
 		"TRAIT_WOUND_LICKER" = TRAIT_WOUND_LICKER,
-=======
->>>>>>> Stashed changes
 		/* "TRAIT_XRAY_HEARING" = TRAIT_XRAY_HEARING, */
 	),
 	/obj/item = list(
@@ -656,18 +653,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_UNCATCHABLE" = TRAIT_UNCATCHABLE,
 		"TRAIT_UNCOMPOSTABLE" = TRAIT_UNCOMPOSTABLE,
 		"TRAIT_WIELDED" = TRAIT_WIELDED,
-<<<<<<< Updated upstream
 		/* "TRAIT_BAIT_UNCONSUMABLE" = TRAIT_BAIT_UNCONSUMABLE, */
 		"TRAIT_BAKEABLE" = TRAIT_BAKEABLE,
-=======
-		"TRAIT_BAKEABLE" = TRAIT_BAKEABLE,
-		"TRAIT_FEATHERED" = TRAIT_FEATHERED,
-		"TRAIT_NON_IMPORTANT_SHOE_BLOCK" = TRAIT_NON_IMPORTANT_SHOE_BLOCK,
-		"TRAIT_LABOURED_BREATHING" = TRAIT_LABOURED_BREATHING,
-		"TRAIT_ASSISTED_BREATHING" = TRAIT_ASSISTED_BREATHING,
-		"TRAIT_NO_ORGAN_DECAY" = TRAIT_NO_ORGAN_DECAY,
-		/* "TRAIT_BAIT_UNCONSUMABLE" = TRAIT_BAIT_UNCONSUMABLE, */
->>>>>>> Stashed changes
 		/* "TRAIT_BYPASS_RANGED_ARMOR" = TRAIT_BYPASS_RANGED_ARMOR, */
 		/* "TRAIT_CONTRABAND_BLOCKER" = TRAIT_CONTRABAND_BLOCKER, */
 		/* "TRAIT_GERM_SENSITIVE" = TRAIT_GERM_SENSITIVE, */

code/datums/ai/babies/babies_behaviors.dm

@@ -38,11 +38,8 @@
 		if(other.gender != living_pawn.gender && !(other.flags_1 & HOLOGRAM_1)) //Better safe than sorry ;_;
 			controller.set_blackboard_key(target_key, other)
 			return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
-<<<<<<< Updated upstream
 
 	return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
-=======
->>>>>>> Stashed changes
 
 	return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
 

code/datums/ai/basic_mobs/basic_ai_behaviors/run_away_from_target.dm

@@ -19,10 +19,6 @@
 
 /datum/ai_behavior/run_away_from_target/perform(seconds_per_tick, datum/ai_controller/controller, target_key, hiding_location_key)
 	if (controller.blackboard[BB_BASIC_MOB_STOP_FLEEING])
-<<<<<<< Updated upstream
-=======
-		finish_action(controller, succeeded = FALSE, target_key = target_key, hiding_location_key = hiding_location_key)
->>>>>>> Stashed changes
 		return AI_BEHAVIOR_DELAY
 	var/atom/target = controller.blackboard[hiding_location_key] || controller.blackboard[target_key]
 	if (QDELETED(target) || !can_see(controller.pawn, target, run_distance))
@@ -63,15 +59,10 @@
 	. = ..()
 	if (clear_failed_targets)
 		controller.clear_blackboard_key(target_key)
-<<<<<<< Updated upstream
 
 /datum/ai_behavior/run_away_from_target/run_and_shoot
 	clear_failed_targets = FALSE
 
-=======
-/datum/ai_behavior/run_away_from_target/run_and_shoot
-	clear_failed_targets = FALSE
->>>>>>> Stashed changes
 /datum/ai_behavior/run_away_from_target/run_and_shoot/perform(seconds_per_tick, datum/ai_controller/controller, target_key, hiding_location_key)
 	var/atom/target = controller.blackboard[target_key]
 	if(QDELETED(target))

code/datums/ai/basic_mobs/basic_subtrees/find_food.dm

@@ -10,20 +10,10 @@
 	var/emotes_blackboard_list = BB_EAT_EMOTES
 
 /datum/ai_planning_subtree/find_food/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
-<<<<<<< Updated upstream
 	if(controller.blackboard[BB_NEXT_FOOD_EAT] > world.time)
 		return
 	if(!controller.blackboard_key_exists(found_food_key))
 		controller.queue_behavior(finding_behavior, found_food_key, controller.blackboard[food_list_key])
-=======
-	var/list/foods_list = controller.blackboard[food_list_key]
-	if(!length(foods_list))
-		CRASH("the types of food has not been supplied in the [food_list_key] key!")
-	if(controller.blackboard[BB_NEXT_FOOD_EAT] > world.time)
-		return
-	if(!controller.blackboard_key_exists(found_food_key))
-		controller.queue_behavior(finding_behavior, found_food_key, foods_list)
->>>>>>> Stashed changes
 		return
 	controller.queue_behavior(/datum/ai_behavior/interact_with_target/eat_food, found_food_key, emotes_blackboard_list)
 	return SUBTREE_RETURN_FINISH_PLANNING

code/datums/ai/hunting_behavior/hunting_behaviors.dm

@@ -63,11 +63,7 @@
 		return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
 	return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
 
-<<<<<<< Updated upstream
 /datum/ai_behavior/find_hunt_target/proc/valid_dinner(mob/living/source, atom/dinner, radius)
-=======
-/datum/ai_behavior/find_hunt_target/proc/valid_dinner(mob/living/source, atom/dinner, radius, datum/ai_controller/controller, seconds_per_tick)
->>>>>>> Stashed changes
 	if(isliving(dinner))
 		var/mob/living/living_target = dinner
 		if(living_target.stat == DEAD) //bitch is dead

code/datums/components/bakeable.dm

@@ -16,14 +16,7 @@
 	/// Reagents that should be added to the result
 	var/list/added_reagents
 
-<<<<<<< Updated upstream
 /datum/component/bakeable/Initialize(bake_result, required_bake_time, positive_result, use_large_steam_sprit, list/added_reagents)
-=======
-	/// Reagents that should be added to the result
-	var/list/added_reagents
-
-/datum/component/bakeable/Initialize(bake_result, required_bake_time, positive_result, use_large_steam_sprite)
->>>>>>> Stashed changes
 	. = ..()
 	if(!isitem(parent)) //Only items support baking at the moment
 		return COMPONENT_INCOMPATIBLE

code/datums/memory/_memory.dm

@@ -277,11 +277,8 @@
 		/mob/living/basic/stickman,
 		/mob/living/basic/stickman/dog,
 		/mob/living/simple_animal/hostile/megafauna/dragon/lesser,
-<<<<<<< Updated upstream
 		/mob/living/basic/pet/cat,
 		/mob/living/basic/pet/cat/cak,
-=======
->>>>>>> Stashed changes
 		/obj/item/food/sausage/american,
 		/obj/item/skub,
 	)

code/datums/wounds/_wounds.dm

@@ -514,11 +514,7 @@
 /datum/wound/proc/check_grab_treatments(obj/item/I, mob/user)
 	return FALSE
 
-<<<<<<< Updated upstream
 /// Like try_treating() but for unhanded interactions, used by joint dislocations for manual bodypart chiropractice for example. Ignores thick material checks since you can pop an arm into place through a thick suit unlike using sutures
-=======
-/// Like try_treating() but for unhanded interactions from humans, used by joint dislocations for manual bodypart chiropractice for example. Ignores thick material checks since you can pop an arm into place through a thick suit unlike using sutures
->>>>>>> Stashed changes
 /datum/wound/proc/try_handling(mob/living/user)
 	return FALSE
 

code/game/objects/items/grenades/spawnergrenade.dm

@@ -75,7 +75,6 @@
 /obj/item/grenade/spawnergrenade/cat
 	name = "Catnade"
 	desc = "You can hear faint meowing and the sounds of claws on metal coming from within."
-<<<<<<< Updated upstream
 	spawner_type = list(/mob/living/basic/pet/cat/feral, /mob/living/basic/pet/cat/feraltabby)
 	deliveryamt = 5
 
@@ -84,7 +83,3 @@
 	desc = "You can hear aggressive meowing and the sounds of sharpened claws on metal coming from within."
 	spawner_type = /mob/living/basic/pet/cat/syndicat
 	deliveryamt = 3
-=======
-	spawner_type = /mob/living/basic/pet/cat/feral
-	deliveryamt = 5
->>>>>>> Stashed changes

code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm

@@ -18,8 +18,5 @@
 		/mob/living/basic/pet/dog/corgi,
 		/mob/living/basic/pet/fox,
 		/mob/living/simple_animal/bot/secbot,
-<<<<<<< Updated upstream
 		/mob/living/basic/pet/cat,
-=======
->>>>>>> Stashed changes
 	)

code/modules/mob/living/basic/pets/cat/bread_cat_ai.dm

@@ -9,11 +9,7 @@
 
 /datum/ai_planning_subtree/find_and_hunt_target/turn_off_stove
 	target_key = BB_STOVE_TARGET
-<<<<<<< Updated upstream
 	hunting_behavior = /datum/ai_behavior/hunt_target/unarmed_attack_target/stove_target
-=======
-	hunting_behavior = /datum/ai_behavior/hunt_target/interact_with_target/stove_target
->>>>>>> Stashed changes
 	finding_behavior = /datum/ai_behavior/find_hunt_target/stove
 	hunt_targets = list(/obj/machinery/oven/range)
 	hunt_range = 9
@@ -29,17 +25,10 @@
 			return FALSE
 	return TRUE
 
-<<<<<<< Updated upstream
 /datum/ai_behavior/hunt_target/unarmed_attack_target/stove_target
 	always_reset_target = TRUE
 
 /datum/ai_behavior/hunt_target/unarmed_attack_target/stove_target/target_caught(mob/living/hunter, obj/machinery/oven/range/stove)
-=======
-/datum/ai_behavior/hunt_target/interact_with_target/stove_target
-	always_reset_target = TRUE
-
-/datum/ai_behavior/hunt_target/interact_with_target/stove_target/target_caught(mob/living/hunter, obj/machinery/oven/range/stove)
->>>>>>> Stashed changes
 	if(stove.open)
 		return
 	return ..()

code/modules/mob/living/basic/pets/cat/cat_ai.dm

@@ -6,10 +6,6 @@
 		BB_BABIES_PARTNER_TYPES = list(/mob/living/basic/pet/cat),
 		BB_BABIES_CHILD_TYPES = list(/mob/living/basic/pet/cat/kitten),
 	)
-<<<<<<< Updated upstream
-=======
-
->>>>>>> Stashed changes
 	ai_movement = /datum/ai_movement/basic_avoidance
 	idle_behavior = /datum/idle_behavior/idle_random_walk
 	planning_subtrees = list(
@@ -23,10 +19,6 @@
 		/datum/ai_planning_subtree/territorial_struggle,
 		/datum/ai_planning_subtree/make_babies,
 		/datum/ai_planning_subtree/random_speech/cats,
-<<<<<<< Updated upstream
-=======
-		/datum/ai_planning_subtree/basic_melee_attack_subtree,
->>>>>>> Stashed changes
 	)
 
 /datum/ai_planning_subtree/reside_in_home
@@ -37,25 +29,13 @@
 
 /datum/ai_planning_subtree/reside_in_home/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
 	var/mob/living/living_pawn = controller.pawn
-<<<<<<< Updated upstream
-	if(controller.blackboard_key_exists(BB_CAT_HOME))
-		controller.queue_behavior(/datum/ai_behavior/enter_cat_home, BB_CAT_HOME)
-		return
-=======
-
 	if(controller.blackboard_key_exists(BB_CAT_HOME))
 		controller.queue_behavior(/datum/ai_behavior/enter_cat_home, BB_CAT_HOME)
 		return
-
->>>>>>> Stashed changes
 	if(istype(living_pawn.loc, /obj/structure/cat_house))
 		if(SPT_PROB(leave_home_chance, seconds_per_tick))
 			controller.set_blackboard_key(BB_CAT_HOME, living_pawn.loc)
 		return SUBTREE_RETURN_FINISH_PLANNING
-<<<<<<< Updated upstream
-=======
-
->>>>>>> Stashed changes
 	if(SPT_PROB(reside_chance, seconds_per_tick))
 		controller.queue_behavior(/datum/ai_behavior/find_and_set/valid_home, BB_CAT_HOME, /obj/structure/cat_house)
 
@@ -64,10 +44,6 @@
 		if(home.resident_cat)
 			continue
 		return home
-<<<<<<< Updated upstream
-=======
-
->>>>>>> Stashed changes
 	return null
 
 /datum/ai_behavior/enter_cat_home
@@ -84,11 +60,7 @@
 	var/obj/structure/cat_house/home = controller.blackboard[target_key]
 	var/mob/living/basic/living_pawn = controller.pawn
 	if(living_pawn == home.resident_cat || isnull(home.resident_cat))
-<<<<<<< Updated upstream
 		living_pawn.melee_attack(home)
-=======
-		controller.ai_interact(target = home)
->>>>>>> Stashed changes
 		return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
 
 	return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
@@ -114,10 +86,6 @@
 	if(controller.blackboard_key_exists(BB_TRESSPASSER_TARGET))
 		controller.queue_behavior(/datum/ai_behavior/territorial_struggle, BB_TRESSPASSER_TARGET, BB_HOSTILE_MEOWS)
 		return SUBTREE_RETURN_FINISH_PLANNING
-<<<<<<< Updated upstream
-=======
-
->>>>>>> Stashed changes
 	controller.queue_behavior(/datum/ai_behavior/find_and_set/cat_tresspasser, BB_TRESSPASSER_TARGET, /mob/living/basic/pet/cat)
 
 /datum/ai_behavior/find_and_set/cat_tresspasser/search_tactic(datum/ai_controller/controller, locate_path, search_range)
@@ -165,15 +133,8 @@
 	var/list/threaten_list = controller.blackboard[cries_key]
 	if(length(threaten_list))
 		living_pawn.say(pick(threaten_list), forced = "ai_controller")
-<<<<<<< Updated upstream
 	if(!prob(end_battle_chance))
 		return
-=======
-
-	if(!prob(end_battle_chance))
-		return
-
->>>>>>> Stashed changes
 	//50 50 chance we lose
 	var/datum/ai_controller/loser_controller = prob(50) ? controller : target.ai_controller
 
@@ -200,10 +161,6 @@
 		return
 	return ..()
 
-<<<<<<< Updated upstream
-=======
-
->>>>>>> Stashed changes
 /datum/ai_behavior/find_hunt_target/hunt_mice/valid_dinner(mob/living/source, mob/living/mouse, radius)
 	if(mouse.stat == DEAD || mouse.mind)
 		return FALSE
@@ -249,21 +206,13 @@
 
 /datum/ai_planning_subtree/find_and_hunt_target/find_cat_food
 	target_key = BB_CAT_FOOD_TARGET
-<<<<<<< Updated upstream
 	hunting_behavior = /datum/ai_behavior/hunt_target/unarmed_attack_target/find_cat_food
-=======
-	hunting_behavior = /datum/ai_behavior/hunt_target/interact_with_target/find_cat_food
->>>>>>> Stashed changes
 	finding_behavior = /datum/ai_behavior/find_hunt_target/find_cat_food
 	hunt_targets = list(/obj/item/fish, /obj/item/food/deadmouse, /obj/item/food/fishmeat)
 	hunt_chance = 75
 	hunt_range = 9
 
-<<<<<<< Updated upstream
 /datum/ai_behavior/hunt_target/unarmed_attack_target/find_cat_food
-=======
-/datum/ai_behavior/hunt_target/interact_with_target/find_cat_food
->>>>>>> Stashed changes
 	always_reset_target = TRUE
 
 /datum/ai_behavior/find_hunt_target/find_cat_food/valid_dinner(mob/living/source, atom/dinner, radius)
@@ -280,37 +229,23 @@
 	if(!controller.blackboard_key_exists(BB_KITTEN_TO_FEED))
 		controller.queue_behavior(/datum/ai_behavior/find_and_set/valid_kitten, BB_KITTEN_TO_FEED, /mob/living/basic/pet/cat/kitten)
 		return
-<<<<<<< Updated upstream
-=======
-
->>>>>>> Stashed changes
 	controller.queue_behavior(/datum/ai_behavior/deliver_food_to_kitten, BB_KITTEN_TO_FEED, BB_FOOD_TO_DELIVER)
 
 /datum/ai_behavior/find_and_set/valid_kitten
 
 /datum/ai_behavior/find_and_set/valid_kitten/search_tactic(datum/ai_controller/controller, locate_path, search_range)
 	var/mob/living/kitten = locate(locate_path) in oview(search_range, controller.pawn)
 	//kitten already has food near it, go feed another hungry kitten
-<<<<<<< Updated upstream
 	if(isnull(kitten))
 		return null
-=======
-
-	if(isnull(kitten))
-		return null
-
->>>>>>> Stashed changes
 	var/list/nearby_food = typecache_filter_list(oview(2, kitten), controller.blackboard[BB_HUNTABLE_PREY])
 	if(kitten.stat != DEAD && !length(nearby_food))
 		return kitten
 	return null
 
 /datum/ai_behavior/deliver_food_to_kitten
-<<<<<<< Updated upstream
 
 /datum/ai_behavior/deliver_food_to_kitten
-=======
->>>>>>> Stashed changes
 	behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT | AI_BEHAVIOR_CAN_PLAN_DURING_EXECUTION | AI_BEHAVIOR_REQUIRE_REACH
 	action_cooldown = 5 SECONDS