From 3f8c041ea80672bfcf3ad282ae2b62892bc15045 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 22 Aug 2024 03:13:20 +0200 Subject: [PATCH] [MIRROR] Unarmed attacks with carp jaws now uses the bite attack effect (#29506) * Unarmed attacks with carp jaws now uses the bite attack effect (#85959) ## About The Pull Request The carp organ set gives your head 10-15 unarmed damage, alongside making you attack with your head... Which is, well, you're biting them with your carp jaws. So, let's make it actually use the bite effect. ## Why It's Good For The Game Makes more sense - if you're biting using carp jaws, then the effect should be a bite. ## Changelog :cl: qol: Unarmed attacks with carp jaws now uses a bite effect rather than a punch effect. /:cl: * Unarmed attacks with carp jaws now uses the bite attack effect --------- Co-authored-by: Lucy --- .../machinery/dna_infuser/organ_sets/carp_organs.dm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/dna_infuser/organ_sets/carp_organs.dm b/code/game/machinery/dna_infuser/organ_sets/carp_organs.dm index aa3e9441d84..10fcae90a95 100644 --- a/code/game/machinery/dna_infuser/organ_sets/carp_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/carp_organs.dm @@ -58,11 +58,12 @@ var/datum/species/rec_species = human_receiver.dna.species rec_species.update_no_equip_flags(tongue_owner, rec_species.no_equip_flags | ITEM_SLOT_MASK) -/obj/item/organ/internal/tongue/carp/on_bodypart_insert(obj/item/bodypart/limb) +/obj/item/organ/internal/tongue/carp/on_bodypart_insert(obj/item/bodypart/head) . = ..() - limb.unarmed_damage_low = 10 - limb.unarmed_damage_high = 15 - limb.unarmed_effectiveness = 15 + head.unarmed_damage_low = 10 + head.unarmed_damage_high = 15 + head.unarmed_effectiveness = 15 + head.unarmed_attack_effect = ATTACK_EFFECT_BITE /obj/item/organ/internal/tongue/carp/on_mob_remove(mob/living/carbon/tongue_owner) . = ..() @@ -76,10 +77,10 @@ /obj/item/organ/internal/tongue/carp/on_bodypart_remove(obj/item/bodypart/head) . = ..() - head.unarmed_damage_low = initial(head.unarmed_damage_low) head.unarmed_damage_high = initial(head.unarmed_damage_high) head.unarmed_effectiveness = initial(head.unarmed_effectiveness) + head.unarmed_attack_effect = initial(head.unarmed_attack_effect) /obj/item/organ/internal/tongue/carp/on_life(seconds_per_tick, times_fired) . = ..()