Skip to content

Commit

Permalink
fix duplicate definition
Browse files Browse the repository at this point in the history
  • Loading branch information
Absolucy committed Jul 1, 2024
1 parent 72ca344 commit 607ec4e
Showing 1 changed file with 0 additions and 41 deletions.
41 changes: 0 additions & 41 deletions monkestation/code/modules/blueshift/mobs/misc_pets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,44 +29,3 @@
unsuitable_atmos_damage = 0
minimum_survivable_temperature = 0
maximum_survivable_temperature = 30000

///Wild carp that just vibe ya know
/mob/living/basic/carp/passive
name = "passive carp"
desc = "A timid, sucker-bearing creature that resembles a fish. "

attack_verb_continuous = "suckers"
attack_verb_simple = "suck"

melee_damage_lower = 4
melee_damage_upper = 4
ai_controller = /datum/ai_controller/basic_controller/carp/passive

/mob/living/basic/carp/passive/Initialize(mapload)
. = ..()
AddElement(/datum/element/ai_retaliate)
AddElement(/datum/element/pet_bonus, "bloops happily!")

/**
* Carp which bites back, but doesn't look for targets and doesnt do as much damage
* Still migrate and stuff
*/
/datum/ai_controller/basic_controller/carp/passive
blackboard = list(
BB_BASIC_MOB_STOP_FLEEING = TRUE,
BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
BB_PET_TARGETING_STRATEGY = /datum/targeting_strategy/basic/not_friends,
)
ai_traits = STOP_MOVING_WHEN_PULLED
planning_subtrees = list(
/datum/ai_planning_subtree/pet_planning,
/datum/ai_planning_subtree/simple_find_nearest_target_to_flee,
/datum/ai_planning_subtree/make_carp_rift/panic_teleport,
/datum/ai_planning_subtree/flee_target,
/datum/ai_planning_subtree/find_food,
/datum/ai_planning_subtree/attack_obstacle_in_path/carp,
/datum/ai_planning_subtree/shortcut_to_target_through_carp_rift,
/datum/ai_planning_subtree/make_carp_rift/aggressive_teleport,
/datum/ai_planning_subtree/basic_melee_attack_subtree,
/datum/ai_planning_subtree/carp_migration,
)

0 comments on commit 607ec4e

Please sign in to comment.