-
Notifications
You must be signed in to change notification settings - Fork 51
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
base: master
Are you sure you want to change the base?
Conversation
Reviewer's Guide by SourceryThis 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 statesstateDiagram-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
}
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
icon = 'modular_bandastation/objects/icons/obj/weapons/misc.dmi' | ||
icon_state = "garrot_wrap" | ||
var/mob/living/carbon/human/strangling | ||
var/improvised = FALSE |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
убери эту переменную
modular_bandastation/objects/code/items/weapons/melee/garrote.dm
Outdated
Show resolved
Hide resolved
modular_bandastation/objects/code/items/weapons/melee/garrote.dm
Outdated
Show resolved
Hide resolved
modular_bandastation/objects/code/items/weapons/melee/garrote.dm
Outdated
Show resolved
Hide resolved
modular_bandastation/objects/code/items/weapons/melee/garrote.dm
Outdated
Show resolved
Hide resolved
modular_bandastation/objects/code/items/weapons/melee/garrote.dm
Outdated
Show resolved
Hide resolved
M.Stun(1 SECONDS) | ||
M.Immobilize(2 SECONDS) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
создай отдельный proc
, который будет тут вызываться и это поведение опиши в нем, в под типе импровизированной гарроты
Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
![:trollface: :trollface:](https://github.githubassets.com/images/icons/emoji/trollface.png)
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself |
![:trollface: :trollface:](https://github.githubassets.com/images/icons/emoji/trollface.png)
Что этот PR делает
Перенос гарроты с пары
Почему это хорошо для игры
Нет гарроты - плохо. Есть - хорошо
Изображения изменений
Тестирование
Локальный сервер
Changelog
🆑
add: Добавлена гаррота. Более слабую версию можно скрафтить, а сильную только купить в аплинке синдиката
/:cl: