From cb2e5f367c0b1a0a6ade9d4232e17b2c1f594030 Mon Sep 17 00:00:00 2001 From: RadiantFlash7 Date: Wed, 4 Jun 2025 20:01:33 -0400 Subject: [PATCH] Re-adds Tajaran Tackle Bonus (#3726) ## About The Pull Request Re-adds the tajaran bonus for tackles for having tajaran ears removed in #3443 ## Why It's Good For The Game The bonus was removed under the impression that Tajarans recieved a +4 to tackling, instead of a +2. This is because of the +2 for having a tail in the tackling code. However, the +2 for having a tail, is locked behind a trait that only xenos have. Meaning that tajarans only ever had a +2, on par with moths. Thus, there was no reason to remove the buff for tajarans. Edit: ~~As it was expressed to be concerns of people gamer maxing- Tails also do not count towards or against defending unless it's a lizard tail.~~ It seems TG broke this during refractoring, and now anyone with a wagging tail has a bonus to preventing tackles; Which is- interesting. Implanting a tajaran's ears, also do not effect tackling as you need the feline grace trait to get a tackle bonus as well. On that note I'll re-emphasize my reasoning for it from the original PR #1513 : Tajarans currently get unique eyes, which are incredibly weak to flashes and welding, in exchange for minorish night vision capabilities. However, they were also given unique sensitive ears which will pretty much always be deafened from flashbangs. Theres no real upside to this- so I figure making Tajaran ears apply a bonus to tackling would be a good idea. The buff is on par with moth's tackling skill, and thus fairly balanced. Plus, cat pouncing memes is pretty great. ## Proof Of Testing
Screenshots/Videos
## Changelog :cl: add: Re-adds Tajaran tackle bonus, changed to 1+ /:cl: --------- Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com> --- code/datums/components/tackle.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index 5a55a2b59aa..2be49f808f9 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -445,7 +445,11 @@ var/obj/item/organ/wings/sacker_wing = sacker.get_organ_slot(ORGAN_SLOT_EXTERNAL_WINGS) if(sacker_wing) attack_mod += 2 - + // BUBBER EDIT START - Taj tackle bonus (same as moths) + var/obj/item/organ/ears/cat/tajaran/sacker_tajaran_ears = sacker.get_organ_slot(ORGAN_SLOT_EARS) + if(istype(sacker_tajaran_ears) && istajaran(sacker)) + attack_mod += 1 // UwU pounces on you + // BUBBER EDIT END var/obj/item/organ/cyberimp/chest/spine/potential_spine = sacker.get_organ_slot(ORGAN_SLOT_SPINE) if(istype(potential_spine)) attack_mod += potential_spine.strength_bonus