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.

Sign up for GitHub

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

Дергать за хвостик. #1617

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+8 −0
Open

Дергать за хвостик. #1617

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
715eb17
Дергать за хвостик.
KiJoking Jan 18, 2025
778ca1f
Apply suggestions from code review
KiJoking Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions code/modules/mob/living/carbon/carbon_defense.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,16 @@
"<span class='notice'>Вы трясёте <b>[src]</b> в попытке поднять [ru_ego()] на ноги!</span>", target = src,
target_message = "<span class='notice'><b>[M]</b> трясёт тебя в однозначной попытке поднять!</span>")

else if(M.zone_selected == BODY_ZONE_PRECISE_GROIN) // BLUEMOON ADD — Дергать за хвосты.
if(src.dna.features["mam_tail"] != "None")
M.visible_message( \
"<span class='warning'><b>[M]</b> дёргает хвост <b>[src]</b>!</span>", \
"<span class='warning'>Ты дёргаешь <b>[src]</b> за хвост!</span>", target = src,
target_message = "<span class='warning'><b>[M]</b> дёргает тебя за хвост!</span>")
sound_to_play = SOUND_PAT
else
return
Copy link

@FelixRuin FelixRuin Jan 20, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

итак, у нас есть ретёрн тут, а дальше далеко по коду у нас есть

  AdjustAllImmobility(-60, FALSE)
  AdjustUnconscious(-60, FALSE)
  AdjustSleeping(-100, FALSE)

получается если нацелиться на чужой пах и у того не будет хвоста - значит мы не сможем снять дебафы с кого-то при помощи хелпа из-за этого return, мне кажется его стоит убрать

KiJoking marked this conversation as resolved.
Show resolved Hide resolved

else if(M.zone_selected == BODY_ZONE_PRECISE_MOUTH) // I ADDED BOOP-EH-DEH-NOSEH - Jon
// BLUEMOON ADD START
var/mob/living/carbon/human/H = src
Expand Down
Loading