From 8795b003beef8cb58bdfc74143444ff5006a6d0f Mon Sep 17 00:00:00 2001 From: Syndicat_Meow Date: Thu, 26 Dec 2024 16:57:47 +0100 Subject: [PATCH] hmmm.... --- code/__DEFINES/ai/ai.dm | 4 -- code/_globalvars/traits/_traits.dm | 13 ---- code/datums/ai/babies/babies_behaviors.dm | 3 - .../run_away_from_target.dm | 9 --- .../ai/basic_mobs/basic_subtrees/find_food.dm | 10 --- .../ai/hunting_behavior/hunting_behaviors.dm | 4 -- code/datums/components/bakeable.dm | 7 -- code/datums/memory/_memory.dm | 3 - code/datums/wounds/_wounds.dm | 4 -- .../objects/items/grenades/spawnergrenade.dm | 5 -- .../heretic/magic/eldritch_shapeshift.dm | 3 - .../mob/living/basic/pets/cat/bread_cat_ai.dm | 11 ---- .../mob/living/basic/pets/cat/cat_ai.dm | 65 ------------------- .../mob/living/basic/pets/cat/feral.dm | 17 ----- .../mob/living/basic/pets/cat/keeki.dm | 10 --- .../mob/living/basic/pets/cat/kitten_ai.dm | 23 ------- .../mob/living/basic/pets/cat/runtime.dm | 4 -- .../vatgrowing/samples/cell_lines/common.dm | 4 -- code/modules/uplink/uplink_items/dangerous.dm | 9 --- .../code/modules/mob/living/basic/pets/cat.dm | 3 - 20 files changed, 211 deletions(-) diff --git a/code/__DEFINES/ai/ai.dm b/code/__DEFINES/ai/ai.dm index d63f0de70be8..d58dda3dbbac 100644 --- a/code/__DEFINES/ai/ai.dm +++ b/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) diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm index 39dad8a1d64c..9928191436c7 100644 --- a/code/_globalvars/traits/_traits.dm +++ b/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, */ diff --git a/code/datums/ai/babies/babies_behaviors.dm b/code/datums/ai/babies/babies_behaviors.dm index a5d7cd96123d..42a05d7db764 100644 --- a/code/datums/ai/babies/babies_behaviors.dm +++ b/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 diff --git a/code/datums/ai/basic_mobs/basic_ai_behaviors/run_away_from_target.dm b/code/datums/ai/basic_mobs/basic_ai_behaviors/run_away_from_target.dm index 2288e78d0c98..3529cc2d150c 100644 --- a/code/datums/ai/basic_mobs/basic_ai_behaviors/run_away_from_target.dm +++ b/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)) diff --git a/code/datums/ai/basic_mobs/basic_subtrees/find_food.dm b/code/datums/ai/basic_mobs/basic_subtrees/find_food.dm index 57a3f7b0d62c..f05c357b1a84 100644 --- a/code/datums/ai/basic_mobs/basic_subtrees/find_food.dm +++ b/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 diff --git a/code/datums/ai/hunting_behavior/hunting_behaviors.dm b/code/datums/ai/hunting_behavior/hunting_behaviors.dm index ad73d9b00c4a..949f82cf39f0 100644 --- a/code/datums/ai/hunting_behavior/hunting_behaviors.dm +++ b/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 diff --git a/code/datums/components/bakeable.dm b/code/datums/components/bakeable.dm index a26a3abd11c2..cda7966641c2 100644 --- a/code/datums/components/bakeable.dm +++ b/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 diff --git a/code/datums/memory/_memory.dm b/code/datums/memory/_memory.dm index 17271e570fc0..e49af06da67e 100644 --- a/code/datums/memory/_memory.dm +++ b/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, ) diff --git a/code/datums/wounds/_wounds.dm b/code/datums/wounds/_wounds.dm index 7b36e8a29959..c1320be4b9ed 100644 --- a/code/datums/wounds/_wounds.dm +++ b/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 diff --git a/code/game/objects/items/grenades/spawnergrenade.dm b/code/game/objects/items/grenades/spawnergrenade.dm index 6ecc81d921f8..3cc92acf7c24 100644 --- a/code/game/objects/items/grenades/spawnergrenade.dm +++ b/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 diff --git a/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm b/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm index 75a73afbee76..164fe3fe181b 100644 --- a/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm +++ b/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 ) diff --git a/code/modules/mob/living/basic/pets/cat/bread_cat_ai.dm b/code/modules/mob/living/basic/pets/cat/bread_cat_ai.dm index b6035f686f33..35a5d9e12afc 100644 --- a/code/modules/mob/living/basic/pets/cat/bread_cat_ai.dm +++ b/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 ..() diff --git a/code/modules/mob/living/basic/pets/cat/cat_ai.dm b/code/modules/mob/living/basic/pets/cat/cat_ai.dm index 1dfeb92bc1b3..eaf12c26fbb8 100644 --- a/code/modules/mob/living/basic/pets/cat/cat_ai.dm +++ b/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,10 +229,6 @@ 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 @@ -291,26 +236,16 @@ /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 diff --git a/code/modules/mob/living/basic/pets/cat/feral.dm b/code/modules/mob/living/basic/pets/cat/feral.dm index eb4c84f9cf64..6c679aaf1595 100644 --- a/code/modules/mob/living/basic/pets/cat/feral.dm +++ b/code/modules/mob/living/basic/pets/cat/feral.dm @@ -6,7 +6,6 @@ melee_damage_lower = 7 melee_damage_upper = 15 ai_controller = /datum/ai_controller/basic_controller/simple_hostile -<<<<<<< Updated upstream icon = 'icons/mob/simple/pets.dmi' icon_state = "cat2" icon_living = "cat2" @@ -70,22 +69,10 @@ melee_damage_upper = 20 ai_controller = /datum/ai_controller/basic_controller/simple_hostile icon = 'icons/mob/simple/pets.dmi' -======= - faction = list(FACTION_CAT, ROLE_SYNDICATE) - -/mob/living/basic/pet/cat/feral/tabby - name = "feral cat" - desc = "Kitty!! Wait, no no DON'T BITE-" - health = 40 - maxHealth = 40 - melee_damage_lower = 10 - melee_damage_upper = 20 ->>>>>>> Stashed changes icon_state = "cat" icon_living = "cat" icon_dead = "cat_dead" held_state = "cat" -<<<<<<< Updated upstream speak_emote = list("purrs", "meows") mob_size = MOB_SIZE_SMALL mob_biotypes = MOB_ORGANIC|MOB_BEAST @@ -134,7 +121,3 @@ add_verb(src, /mob/living/proc/toggle_resting) add_traits(list(TRAIT_CATLIKE_GRACE, TRAIT_VENTCRAWLER_ALWAYS, TRAIT_WOUND_LICKER), INNATE_TRAIT) ai_controller.set_blackboard_key(BB_HUNTABLE_PREY, typecacheof(huntable_items)) -======= - ai_controller = /datum/ai_controller/basic_controller/simple_hostile - faction = list(FACTION_CAT) ->>>>>>> Stashed changes diff --git a/code/modules/mob/living/basic/pets/cat/keeki.dm b/code/modules/mob/living/basic/pets/cat/keeki.dm index c5a13144602b..5cf16552e9a4 100644 --- a/code/modules/mob/living/basic/pets/cat/keeki.dm +++ b/code/modules/mob/living/basic/pets/cat/keeki.dm @@ -7,10 +7,6 @@ health = 50 maxHealth = 50 gender = FEMALE -<<<<<<< Updated upstream -======= - faction = list(FACTION_CAT) ->>>>>>> Stashed changes butcher_results = list( /obj/item/organ/internal/brain = 1, /obj/item/organ/internal/heart = 1, @@ -39,12 +35,6 @@ ) AddElement(/datum/element/consumable_mob, reagents_list = on_consume) -<<<<<<< Updated upstream -======= -/mob/living/basic/pet/cat/cak/add_cell_sample() - return - ->>>>>>> Stashed changes /mob/living/basic/pet/cat/cak/CheckParts(list/parts) . = ..() var/obj/item/organ/internal/brain/candidate = locate(/obj/item/organ/internal/brain) in contents diff --git a/code/modules/mob/living/basic/pets/cat/kitten_ai.dm b/code/modules/mob/living/basic/pets/cat/kitten_ai.dm index 9a5dc0dbca67..3a62ea18a439 100644 --- a/code/modules/mob/living/basic/pets/cat/kitten_ai.dm +++ b/code/modules/mob/living/basic/pets/cat/kitten_ai.dm @@ -6,10 +6,6 @@ BB_PET_TARGETING_STRATEGY = /datum/targeting_strategy/basic/not_friends, BB_MAX_DISTANCE_TO_FOOD = 2, ) -<<<<<<< Updated upstream -======= - ->>>>>>> Stashed changes planning_subtrees = list( /datum/ai_planning_subtree/pet_planning, /datum/ai_planning_subtree/target_retaliate, @@ -20,15 +16,8 @@ ) //if the food is too far away, point at it or meow. if its near us then go eat it -<<<<<<< Updated upstream -/datum/ai_planning_subtree/find_and_hunt_target/find_cat_food/kitten - -======= - /datum/ai_planning_subtree/find_and_hunt_target/find_cat_food/kitten - ->>>>>>> Stashed changes /datum/ai_planning_subtree/find_and_hunt_target/find_cat_food/kitten/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) var/atom/target = controller.blackboard[BB_CAT_FOOD_TARGET] if(target && get_dist(target, controller.pawn) > controller.blackboard[BB_MAX_DISTANCE_TO_FOOD]) @@ -57,17 +46,9 @@ /datum/ai_planning_subtree/beg_human /datum/ai_planning_subtree/beg_human/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) -<<<<<<< Updated upstream if(controller.blackboard_key_exists(BB_HUMAN_BEG_TARGET)) controller.queue_behavior(/datum/ai_behavior/beacon_for_food, BB_HUMAN_BEG_TARGET, BB_HUNGRY_MEOW) return -======= - - if(controller.blackboard_key_exists(BB_HUMAN_BEG_TARGET)) - controller.queue_behavior(/datum/ai_behavior/beacon_for_food, BB_HUMAN_BEG_TARGET, BB_HUNGRY_MEOW) - return - ->>>>>>> Stashed changes controller.queue_behavior(/datum/ai_behavior/find_and_set/human_beg, BB_HUMAN_BEG_TARGET, /mob/living/carbon/human) /datum/ai_behavior/find_and_set/human_beg/search_tactic(datum/ai_controller/controller, locate_path, search_range) @@ -78,8 +59,4 @@ if(!length(typecache_filter_list(human_target.held_items, locate_items))) continue return human_target -<<<<<<< Updated upstream -======= - ->>>>>>> Stashed changes return null diff --git a/code/modules/mob/living/basic/pets/cat/runtime.dm b/code/modules/mob/living/basic/pets/cat/runtime.dm index 2b50698f3572..9b3adac5a2ae 100644 --- a/code/modules/mob/living/basic/pets/cat/runtime.dm +++ b/code/modules/mob/living/basic/pets/cat/runtime.dm @@ -11,10 +11,6 @@ gender = FEMALE gold_core_spawnable = NO_SPAWN unique_pet = TRUE -<<<<<<< Updated upstream -======= - faction = list(FACTION_CAT) ->>>>>>> Stashed changes ///the family we will bring in when a round starts var/list/family = null ///saved list of kids diff --git a/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm b/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm index 1f346052c880..242be29523f8 100644 --- a/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm +++ b/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm @@ -109,11 +109,7 @@ /datum/reagent/consumable/milk/chocolate_milk = -1) virus_suspectibility = 1.5 -<<<<<<< Updated upstream resulting_atoms = list(/mob/living/basic/pet/cat = 1) //The basic cat mobs are all male, so you mightt need a gender swap potion if you want to fill the fortress with kittens. -======= - resulting_atoms = list(/mob/living/basic/pet/cat = 1) ->>>>>>> Stashed changes /datum/micro_organism/cell_line/corgi desc = "Canid cells" diff --git a/code/modules/uplink/uplink_items/dangerous.dm b/code/modules/uplink/uplink_items/dangerous.dm index 52864659eb86..966cad2f08cf 100644 --- a/code/modules/uplink/uplink_items/dangerous.dm +++ b/code/modules/uplink/uplink_items/dangerous.dm @@ -100,17 +100,8 @@ surplus = 50 purchasable_from = ~UPLINK_CLOWN_OPS -<<<<<<< Updated upstream /datum/uplink_item/dangerous/rebarxbowsyndie name = "Syndicate Rebar Crossbow" desc = "A much more proffessional version of the engineer's bootleg rebar crossbow. 3 shot mag, quicker loading, and better ammo. Owners manual included." item = /obj/item/storage/box/syndie_kit/rebarxbowsyndie cost = 12 -======= -/datum/uplink_item/dangerous/cat - name = "Feral cat grenade" - desc = "This grenade is filled with 5 feral cats in stasis. Upon activation, the feral cats are awoken and unleashed unto unlucky bystanders. WARNING: The cats are not trained to discern friend from foe!" - cost = 5 - item = /obj/item/grenade/spawnergrenade/cat - surplus = 30 ->>>>>>> Stashed changes diff --git a/monkestation/code/modules/mob/living/basic/pets/cat.dm b/monkestation/code/modules/mob/living/basic/pets/cat.dm index c85ed035d8a9..99fc68d0255e 100644 --- a/monkestation/code/modules/mob/living/basic/pets/cat.dm +++ b/monkestation/code/modules/mob/living/basic/pets/cat.dm @@ -1,12 +1,9 @@ /mob/living/basic/pet/cat -<<<<<<< Updated upstream //. = ..() worn_slot_flags = ITEM_SLOT_HEAD head_icon = 'monkestation/icons/mob/pets_held.dmi' /mob/living/basic/hostile/syndicat -======= ->>>>>>> Stashed changes //. = ..() worn_slot_flags = ITEM_SLOT_HEAD head_icon = 'monkestation/icons/mob/pets_held.dmi'