From e2ecf311fb0d807a50277a0b29fde435d243ad8a Mon Sep 17 00:00:00 2001 From: QuickLode <63271983+QuickLode@users.noreply.github.com> Date: Sat, 21 Oct 2023 06:28:40 -0700 Subject: [PATCH 1/2] no errors --- code/datums/diseases/black_goo.dm | 2 +- .../living/carbon/xenomorph/castes/Lurker.dm | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index 38a26f3648c7..bc3a8db49640 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -150,7 +150,7 @@ target.AddDisease(new /datum/disease/black_goo) to_chat(user, SPAN_XENOWARNING("You sense your target is now infected.")) - target.apply_effect(2, SLOW) + target.apply_effect(2, SLOW) /obj/item/weapon/zombie_claws/afterattack(obj/O as obj, mob/user as mob, proximity) if(get_dist(src, O) > 1) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm b/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm index c106eb30781b..04c9cdbe8e32 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm @@ -79,13 +79,18 @@ if (next_slash_buffed) to_chat(bound_xeno, SPAN_XENOHIGHDANGER("You significantly strengthen your attack, slowing [target_carbon]!")) - to_chat(target_carbon, SPAN_XENOHIGHDANGER("You feel a sharp pain as [bound_xeno] slashes you, slowing you down!")) - original_damage *= buffed_slash_damage_ratio - target_carbon.set_effect(get_xeno_stun_duration(target_carbon, 3), SUPERSLOW) - next_slash_buffed = FALSE - var/datum/action/xeno_action/onclick/lurker_assassinate/ability = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/onclick/lurker_assassinate) - if (ability && istype(ability)) - ability.button.icon_state = "template" + if(IS_SYNTHETIC) + to_chat(target_carbon, SPAN_XENOHIGHDANGER("[bound_xeno] targets a critical joint, damaging you!")) + original_damage *= buffed_slash_damage_ratio + next_slash_buffed = FALSE + else + to_chat(target_carbon, SPAN_XENOHIGHDANGER("You feel a sharp pain as [bound_xeno] slashes you, slowing you down!")) + original_damage *= buffed_slash_damage_ratio + target_carbon.set_effect(get_xeno_stun_duration(target_carbon, 3), SUPERSLOW) + next_slash_buffed = FALSE + var/datum/action/xeno_action/onclick/lurker_assassinate/ability = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/onclick/lurker_assassinate) + if (ability && istype(ability)) + ability.button.icon_state = "template" return original_damage From c4b07bbbf308b59fadd5ed9b2b85a527e1660bef Mon Sep 17 00:00:00 2001 From: QuickLode <63271983+QuickLode@users.noreply.github.com> Date: Sat, 21 Oct 2023 08:28:22 -0700 Subject: [PATCH 2/2] Update Lurker.dm --- code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm b/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm index 04c9cdbe8e32..647fd41d4da3 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm @@ -80,8 +80,9 @@ if (next_slash_buffed) to_chat(bound_xeno, SPAN_XENOHIGHDANGER("You significantly strengthen your attack, slowing [target_carbon]!")) if(IS_SYNTHETIC) - to_chat(target_carbon, SPAN_XENOHIGHDANGER("[bound_xeno] targets a critical joint, damaging you!")) + to_chat(target_carbon, SPAN_XENOHIGHDANGER("[bound_xeno] targets a critical joint, temporarily causing a malfunction!")) original_damage *= buffed_slash_damage_ratio + target_carbon.set_effect(get_xeno_stun_duration(target_carbon, 3), SUPERSLOW) next_slash_buffed = FALSE else to_chat(target_carbon, SPAN_XENOHIGHDANGER("You feel a sharp pain as [bound_xeno] slashes you, slowing you down!"))