Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Syndicate and craftable garrotte #1051

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Conversation

npukoJl
Copy link

@npukoJl npukoJl commented Jan 23, 2025

Что этот PR делает

Перенос гарроты с пары

Почему это хорошо для игры

Нет гарроты - плохо. Есть - хорошо

Изображения изменений

Тестирование

Локальный сервер

Changelog

🆑
add: Добавлена гаррота. Более слабую версию можно скрафтить, а сильную только купить в аплинке синдиката
/:cl:

Copy link

sourcery-ai bot commented Jan 23, 2025

Reviewer's Guide by Sourcery

This pull request introduces the garrote item, which can be used to strangle other players. The garrote comes in two variants: a regular one and an improvised one. The improvised version is less effective and can be blocked by mouth-covering items.

State diagram for garrote grab states

stateDiagram-v2
    [*] --> Unwielded
    Unwielded --> Wielded: Use both hands
    Wielded --> Strangling: Attack from behind
    Strangling --> Released: Lose grip
    Strangling --> Released: Stop wielding
    Released --> Unwielded

    state Strangling {
        [*] --> PassiveGrab
        PassiveGrab --> NeckGrab: Improvised
        PassiveGrab --> KillGrab: Regular
    }
Loading

File-Level Changes

Change Details Files
Added the garrote item.
  • Created a new /obj/item/melee/garrote object.
  • Added a description, icon, and weight class to the garrote.
  • Added a component for two-handed wielding.
  • Added a variable to track the strangling target.
  • Added a variable to track if the garrote is improvised.
  • Added a variable to track the garrote cooldown.
  • Added a proc to update the icon state based on whether the garrote is being used.
  • Added a proc to handle wielding the garrote.
  • Added a proc to handle attacking with the garrote.
  • Added a proc to handle the strangling process.
  • Added a /obj/item/melee/garrote/improvised object.
  • Added a different description and icon state for the improvised garrote.
  • Added a different wield callback for the improvised garrote.
modular_bandastation/objects/code/items/weapons/melee/garrote.dm
Modified the object definition file to include the garrote icon.
  • Added the garrote icon to the object definition file.
modular_bandastation/objects/_objects.dme

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!
  • Generate a plan of action for an issue: Comment @sourcery-ai plan on
    an issue to generate a plan of action for it.

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@github-actions github-actions bot added the 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! label Jan 23, 2025
icon = 'modular_bandastation/objects/icons/obj/weapons/misc.dmi'
icon_state = "garrot_wrap"
var/mob/living/carbon/human/strangling
var/improvised = FALSE
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

убери эту переменную

Comment on lines 84 to 85
M.Stun(1 SECONDS)
M.Immobilize(2 SECONDS)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

создай отдельный proc, который будет тут вызываться и это поведение опиши в нем, в под типе импровизированной гарроты

@Gaxeer Gaxeer changed the title Перенос гарроты с пары Syndicate and craftable garrotte Jan 23, 2025
@AyIong AyIong added :trollface: Фича Новая, определённо уникальная и интересная фича. Она абсолютно точно всем понравится! ⚖️ Баланс Идеальный баланс. Эталон гармонии... labels Jan 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
⚖️ Баланс Идеальный баланс. Эталон гармонии... 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! :trollface: Фича Новая, определённо уникальная и интересная фича. Она абсолютно точно всем понравится!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants