From fdbc1f7710446cbc8456a6191ba10ec668203d2a Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Sun, 22 Mar 2020 13:24:43 -0400 Subject: [PATCH] Yet another one --- .../living/simple_mob/subtypes/animal/farm animals/chicken.dm | 2 +- .../mob/living/simple_mob/subtypes/animal/pets/bird.dm | 2 +- .../modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm | 2 +- .../mob/living/simple_mob/subtypes/animal/sif/frostfly.dm | 2 +- .../mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm | 2 +- .../mob/living/simple_mob/subtypes/animal/sif/kururak.dm | 2 +- .../mob/living/simple_mob/subtypes/animal/sif/racoon.dm | 2 +- code/modules/mob/living/simple_mob/subtypes/blob/spore.dm | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm index 2bf3568287..d33e93e042 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm @@ -18,7 +18,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have? response_help = "pets" response_disarm = "gently pushes aside" response_harm = "kicks" - attacktext = list("kicked") + attacktext = list("pecked") has_langs = list("Bird") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/bird.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/bird.dm index 4042dd30b4..7dc23ef7f9 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/bird.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/bird.dm @@ -23,7 +23,7 @@ softfall = TRUE parachuting = TRUE - attacktext = list("claws", "pecks") + attacktext = list("clawed", "pecked") speak_emote = list("chirps", "caws") has_langs = list("Bird") response_help = "pets" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm index 0aa74f9e6b..b0486e083c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm @@ -36,7 +36,7 @@ melee_damage_upper = 10 base_attack_cooldown = 1 SECOND attack_edge = 1 // Razor-edged wings, and 'claws' made for digging through ice. - attacktext = list("nipped", "bit", "cut", "clawed") + attacktext = list("nipped", "bitten", "cut", "clawed") say_list_type = /datum/say_list/duck ai_holder_type = /datum/ai_holder/simple_mob/retaliate/cooperative diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm index 5711868d15..00da66f1c3 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm @@ -43,7 +43,7 @@ melee_damage_lower = 5 melee_damage_upper = 10 base_attack_cooldown = 1.5 SECONDS - attacktext = list("nipped", "bit", "pinched") + attacktext = list("nipped", "bitten", "pinched") projectiletype = /obj/item/projectile/energy/blob/freezing diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm index ae1abb363f..6440a9b061 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm @@ -50,7 +50,7 @@ pass_flags = PASSTABLE - attacktext = list("bit", "buffeted", "slashed") + attacktext = list("bitten", "buffeted", "slashed") say_list_type = /datum/say_list/glitterfly ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive/glitterfly diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm index 22c2d02082..accb31561e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm @@ -45,7 +45,7 @@ melee_damage_upper = 25 attack_armor_pen = 40 base_attack_cooldown = 2 SECONDS - attacktext = list("gouged", "bit", "cut", "clawed", "whipped") + attacktext = list("gouged", "bitten", "cut", "clawed", "whipped") armor = list( "melee" = 30, diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm index b2e913bfb2..b815f8276e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm @@ -39,7 +39,7 @@ melee_damage_lower = 5 melee_damage_upper = 15 base_attack_cooldown = 1 SECOND - attacktext = list("nipped", "bit", "cut", "clawed") + attacktext = list("nipped", "bitten", "cut", "clawed") armor = list( "melee" = 15, diff --git a/code/modules/mob/living/simple_mob/subtypes/blob/spore.dm b/code/modules/mob/living/simple_mob/subtypes/blob/spore.dm index 9c540c00f6..f796931395 100644 --- a/code/modules/mob/living/simple_mob/subtypes/blob/spore.dm +++ b/code/modules/mob/living/simple_mob/subtypes/blob/spore.dm @@ -20,7 +20,7 @@ movement_cooldown = 0 hovering = TRUE - attacktext = list("slams into") + attacktext = list("slammed into") attack_sound = 'sound/effects/slime_squish.ogg' say_list_type = /datum/say_list/spore @@ -118,7 +118,7 @@ desc = "A parasitic organism attached to a deceased body, controlling it directly as if it were a puppet." melee_damage_lower += 8 // 10 total. melee_damage_upper += 11 // 15 total. - attacktext = list("claws") + attacktext = list("clawed") H.forceMove(src) infested = H