From 23bb263acbd1e3cce6cbbdb887aca7936ed3f917 Mon Sep 17 00:00:00 2001 From: Geeves Date: Mon, 28 Sep 2020 13:35:54 +0200 Subject: [PATCH] Vaurca Martial Art Fix (#10088) --- code/modules/martial_arts/vaurca.dm | 4 ++-- code/modules/mob/living/carbon/human/human_powers.dm | 5 ++++- html/changelogs/geeves-vaurca_martial_fix.yml | 6 ++++++ 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/geeves-vaurca_martial_fix.yml diff --git a/code/modules/martial_arts/vaurca.dm b/code/modules/martial_arts/vaurca.dm index 2cf2c204d85..40376bffeee 100644 --- a/code/modules/martial_arts/vaurca.dm +++ b/code/modules/martial_arts/vaurca.dm @@ -60,9 +60,9 @@ var/obj/item/grab/G = A.get_active_hand() if(G && G.affecting == D) G.state = GRAB_AGGRESSIVE - D.visible_message("[A] gets a strong grip on [D]!") + D.visible_message(SPAN_DANGER("[A] gets a strong grip on [D]!")) if(isvaurca(A)) - A.bugbite() + A.bugbite(TRUE) qdel(G) return 1 diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm index e504b2d6dc3..0da0957ac58 100644 --- a/code/modules/mob/living/carbon/human/human_powers.dm +++ b/code/modules/mob/living/carbon/human/human_powers.dm @@ -336,6 +336,9 @@ mob/living/carbon/human/proc/change_monitor() set name = "Bite" set desc = "While grabbing someone aggressively, tear into them with your mandibles." + do_bugbite() + +/mob/living/carbon/human/proc/do_bugbite(var/ignore_grab = FALSE) if(last_special > world.time) to_chat(src, SPAN_WARNING("Your mandibles still ache!")) return @@ -356,7 +359,7 @@ mob/living/carbon/human/proc/change_monitor() to_chat(src, SPAN_WARNING("You are not grabbing anyone.")) return - if(G.state < GRAB_KILL) + if(!ignore_grab && G.state < GRAB_KILL) to_chat(src, SPAN_WARNING("You must have a strangling grip to bite someone!")) return diff --git a/html/changelogs/geeves-vaurca_martial_fix.yml b/html/changelogs/geeves-vaurca_martial_fix.yml new file mode 100644 index 00000000000..9d835d4bdc0 --- /dev/null +++ b/html/changelogs/geeves-vaurca_martial_fix.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Fixed vaurca being unable to use their big martial art combo due to grab requirements." \ No newline at end of file