diff --git a/code/__DEFINES/ai.dm b/code/__DEFINES/ai.dm index e90ace09004..0dc68fc0d7f 100644 --- a/code/__DEFINES/ai.dm +++ b/code/__DEFINES/ai.dm @@ -37,7 +37,7 @@ // Monkey AI controller blackboard keys -#define BB_MONKEY_AGRESSIVE "BB_monkey_agressive" +#define BB_MONKEY_AGGRESSIVE "BB_monkey_aggressive" #define BB_MONKEY_GUN_NEURONS_ACTIVATED "BB_monkey_gun_aware" #define BB_MONKEY_GUN_WORKED "BB_monkey_gun_worked" #define BB_MONKEY_BEST_FORCE_FOUND "BB_monkey_bestforcefound" diff --git a/code/datums/ai/monkey/monkey_behaviors.dm b/code/datums/ai/monkey/monkey_behaviors.dm index beb3060d4cd..60db04a3893 100644 --- a/code/datums/ai/monkey/monkey_behaviors.dm +++ b/code/datums/ai/monkey/monkey_behaviors.dm @@ -212,7 +212,7 @@ controller.blackboard[BB_MONKEY_GUN_WORKED] = TRUE // 'worked' // no de-aggro - if(controller.blackboard[BB_MONKEY_AGRESSIVE]) + if(controller.blackboard[BB_MONKEY_AGGRESSIVE]) return if(DT_PROB(MONKEY_HATRED_REDUCTION_PROB, delta_time)) diff --git a/code/datums/ai/monkey/monkey_controller.dm b/code/datums/ai/monkey/monkey_controller.dm index 4d0997bf145..be5b2f923bc 100644 --- a/code/datums/ai/monkey/monkey_controller.dm +++ b/code/datums/ai/monkey/monkey_controller.dm @@ -8,7 +8,7 @@ have ways of interacting with a specific mob and control it. movement_delay = 0.4 SECONDS planning_subtrees = list(/datum/ai_planning_subtree/monkey_tree) blackboard = list( - BB_MONKEY_AGRESSIVE = FALSE, + BB_MONKEY_AGGRESSIVE = FALSE, BB_MONKEY_BEST_FORCE_FOUND = 0, BB_MONKEY_ENEMIES = list(), BB_MONKEY_BLACKLISTITEMS = list(), @@ -31,7 +31,7 @@ have ways of interacting with a specific mob and control it. . = ..() if(. & AI_CONTROLLER_INCOMPATIBLE) return - blackboard[BB_MONKEY_AGRESSIVE] = TRUE //Angry cunt + blackboard[BB_MONKEY_AGGRESSIVE] = TRUE //Angry cunt /datum/ai_controller/monkey/TryPossessPawn(atom/new_pawn) if(!isliving(new_pawn)) diff --git a/code/datums/ai/monkey/monkey_subtrees.dm b/code/datums/ai/monkey/monkey_subtrees.dm index b231c98686c..6cf98dc4701 100644 --- a/code/datums/ai/monkey/monkey_subtrees.dm +++ b/code/datums/ai/monkey/monkey_subtrees.dm @@ -11,10 +11,10 @@ return var/mob/living/selected_enemy - if(length(enemies) || controller.blackboard[BB_MONKEY_AGRESSIVE]) //We have enemies or are pissed + if(length(enemies) || controller.blackboard[BB_MONKEY_AGGRESSIVE]) //We have enemies or are pissed var/list/valids = list() for(var/mob/living/possible_enemy in view(MONKEY_ENEMY_VISION, living_pawn)) - if(possible_enemy == living_pawn || (!enemies[possible_enemy] && (!controller.blackboard[BB_MONKEY_AGRESSIVE] || HAS_AI_CONTROLLER_TYPE(possible_enemy, /datum/ai_controller/monkey)))) //Are they an enemy? (And do we even care?) + if(possible_enemy == living_pawn || (!enemies[possible_enemy] && (!controller.blackboard[BB_MONKEY_AGGRESSIVE] || HAS_AI_CONTROLLER_TYPE(possible_enemy, /datum/ai_controller/monkey)))) //Are they an enemy? (And do we even care?) continue // Weighted list, so the closer they are the more likely they are to be chosen as the enemy valids[possible_enemy] = CEILING(100 / (get_dist(living_pawn, possible_enemy) || 1), 1) diff --git a/code/datums/ai/objects/vending_machines/vending_machine_controller.dm b/code/datums/ai/objects/vending_machines/vending_machine_controller.dm index c46e07e2451..dc3c425a9fa 100644 --- a/code/datums/ai/objects/vending_machines/vending_machine_controller.dm +++ b/code/datums/ai/objects/vending_machines/vending_machine_controller.dm @@ -13,7 +13,7 @@ if(!istype(new_pawn, /obj/machinery/vending)) return AI_CONTROLLER_INCOMPATIBLE var/obj/machinery/vending/vendor_pawn = new_pawn - vendor_pawn.tiltable = FALSE //Not manually tiltable by hitting it anymore. We are now agressively doing it ourselves. + vendor_pawn.tiltable = FALSE //Not manually tiltable by hitting it anymore. We are now aggressively doing it ourselves. vendor_pawn.AddElement(/datum/element/waddling) vendor_pawn.AddElement(/datum/element/footstep, FOOTSTEP_OBJ_MACHINE, 1, -6, vary = TRUE) vendor_pawn.squish_damage = 15 diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm index 5eae09c57a4..3a1ae848281 100644 --- a/code/datums/martial/cqc.dm +++ b/code/datums/martial/cqc.dm @@ -126,7 +126,7 @@ D.grabbedby(A, 1) if(old_grab_state == GRAB_PASSIVE) D.drop_all_held_items() - A.setGrabState(GRAB_AGGRESSIVE) //Instant agressive grab if on grab intent + A.setGrabState(GRAB_AGGRESSIVE) //Instant aggressive grab if on grab intent log_combat(A, D, "grabbed", addition="aggressively") D.visible_message(span_warning("[A] violently grabs [D]!"), \ span_userdanger("You're grabbed violently by [A]!"), span_hear("You hear sounds of aggressive fondling!"), COMBAT_MESSAGE_RANGE, A) diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index dd0ab6064b6..f35d9026d73 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -306,7 +306,7 @@ /obj/item/defibrillator/compact/combat/loaded/nanotrasen name = "elite Nanotrasen defibrillator" - desc = "A belt-equipped state-of-the-art defibrillator. Can revive through thick clothing, has an experimental self-recharging battery, and can be utilized in combat via applying the paddles in a disarming or agressive manner." + desc = "A belt-equipped state-of-the-art defibrillator. Can revive through thick clothing, has an experimental self-recharging battery, and can be utilized in combat via applying the paddles in a disarming or aggressive manner." icon_state = "defibnt" //needs defib inhand sprites inhand_icon_state = "defibnt" worn_icon_state = "defibnt" diff --git a/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm index b8e8e6619f0..8bdefde04d3 100644 --- a/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm +++ b/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm @@ -47,7 +47,7 @@ victim.adjustOrganLoss(pick(ORGAN_SLOT_BRAIN,ORGAN_SLOT_EARS,ORGAN_SLOT_EYES,ORGAN_SLOT_LIVER,ORGAN_SLOT_LUNGS,ORGAN_SLOT_STOMACH,ORGAN_SLOT_HEART),25) /datum/eldritch_knowledge/spell/area_conversion - name = "Agressive Spread" + name = "Aggressive Spread" desc = "Spreads rust to nearby surfaces. Already rusted surfaces are destroyed." gain_text = "All wise men know well not to touch the Bound King." cost = 1 diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index fece33be889..f161e94f8b1 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -495,7 +495,7 @@ if(prob(10)) switch(rand(1,4)) if(1) //blood rage - magnification.ai_controller.blackboard[BB_MONKEY_AGRESSIVE] = TRUE + magnification.ai_controller.blackboard[BB_MONKEY_AGGRESSIVE] = TRUE if(2) //brain death magnification.apply_damage(500,BRAIN,BODY_ZONE_HEAD,FALSE,FALSE,FALSE) if(3) //primal gene (gorilla) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 50662cb8342..a4127eb420e 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -883,21 +883,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(!source.dna.features["ears"] || source.dna.features["ears"] == "None" || source.head && (source.head.flags_inv & HIDEHAIR) || (source.wear_mask && (source.wear_mask.flags_inv & HIDEHAIR)) || !noggin || noggin.status == BODYPART_ROBOTIC) bodyparts_to_add -= "ears" - if(mutant_bodyparts["wings"]) - if(!source.dna.features["wings"] || source.dna.features["wings"] == "None" || (source.wear_suit && (source.wear_suit.flags_inv & HIDEJUMPSUIT) && (!source.wear_suit.species_exception || !is_type_in_list(src, source.wear_suit.species_exception)))) - bodyparts_to_add -= "wings" - - if(mutant_bodyparts["wings_open"]) - if(source.wear_suit && (source.wear_suit.flags_inv & HIDEJUMPSUIT) && (!source.wear_suit.species_exception || !is_type_in_list(src, source.wear_suit.species_exception))) - bodyparts_to_add -= "wings_open" - else if (mutant_bodyparts["wings"]) - bodyparts_to_add -= "wings_open" - - if(mutant_bodyparts["moth_antennae"]) - if(!source.dna.features["moth_antennae"] || source.dna.features["moth_antennae"] == "None" || !noggin) - bodyparts_to_add -= "moth_antennae" - - //Digitigrade legs are stuck in the phantom zone between true limbs and mutant bodyparts. Mainly it just needs more agressive updating than most limbs. + //Digitigrade legs are stuck in the phantom zone between true limbs and mutant bodyparts. Mainly it just needs more aggressive updating than most limbs. var/update_needed = FALSE var/not_digitigrade = TRUE for(var/obj/item/bodypart/bodypart as anything in source.bodyparts) diff --git a/code/modules/mob/living/simple_animal/hostile/ooze.dm b/code/modules/mob/living/simple_animal/hostile/ooze.dm index b46b92bc092..f57c2b1fbc5 100644 --- a/code/modules/mob/living/simple_animal/hostile/ooze.dm +++ b/code/modules/mob/living/simple_animal/hostile/ooze.dm @@ -109,7 +109,7 @@ ///Its good stats and high mobility makes this a good assasin type creature. It's vulnerabilites against cold, shotguns and /mob/living/simple_animal/hostile/ooze/gelatinous name = "Gelatinous Cube" - desc = "A cubic ooze native to Sholus VII.\nSince the advent of space travel this species has established itself in the waste treatment facilities of several space colonies.\nIt is often considered to be the third most infamous invasive species due to its highly agressive and predatory nature." + desc = "A cubic ooze native to Sholus VII.\nSince the advent of space travel this species has established itself in the waste treatment facilities of several space colonies.\nIt is often considered to be the third most infamous invasive species due to its highly aggressive and predatory nature." speed = 1 damage_coeff = list(BRUTE = 1, BURN = 0.6, TOX = 0.5, CLONE = 1.5, STAMINA = 0, OXY = 1) melee_damage_lower = 20 diff --git a/modular_skyrat/master_files/code/modules/clothing/head/monkey_magnification_helmet.dm b/modular_skyrat/master_files/code/modules/clothing/head/monkey_magnification_helmet.dm index da28eb82303..94af7b32dcb 100644 --- a/modular_skyrat/master_files/code/modules/clothing/head/monkey_magnification_helmet.dm +++ b/modular_skyrat/master_files/code/modules/clothing/head/monkey_magnification_helmet.dm @@ -91,7 +91,7 @@ if(prob(10)) switch(rand(1,4)) if(1) //blood rage - magnification.ai_controller.blackboard[BB_MONKEY_AGRESSIVE] = TRUE + magnification.ai_controller.blackboard[BB_MONKEY_AGGRESSIVE] = TRUE if(2) //brain death magnification.apply_damage(500,BRAIN,BODY_ZONE_HEAD,FALSE,FALSE,FALSE) if(3) //primal gene (gorilla)