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

Шибари, Доильный, Юбки #1558

Open
wants to merge 8 commits into
base: master
Choose a base branch
from

Conversation

Sin-of-Geleus
Copy link

@Sin-of-Geleus Sin-of-Geleus commented Jan 2, 2025

Описание

  • Изменения были проверены на локальном сервере
  • Этот пулл-реквест готов к тест-мерджу.
  • Изменения были портированы с другого сервера

Причина изменений

Демонстрация изменений

@@ -8,4 +8,4 @@
# NOTE: syntax was changed to allow hyphenation of ranknames, since spaces are stripped. #
###############################################################################################

yourckeygoeshere = Host
geleus = Host

Choose a reason for hiding this comment

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

ты чё мышь

Suggested change
geleus = Host
yourckeygoeshere = Host

Copy link
Author

Choose a reason for hiding this comment

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

Закидывал не сортируя. Да да. Я точно не пытался сделать переворот.

@@ -32,5 +32,14 @@
// Paper instructions for shibari kit

/obj/item/paper/shibari_kit_instructions
default_raw_text = "Hello! Congratulations on your purchase of the shibari kit by LustWish! Some newbies may get confused by our ropes, so we prepared a small instructions for you! First of all, you have to have a wrench to construct the stand itself. Secondly, you can use screwdrivers to change the color of your shibari stand. Just replace the plastic fittings! Thirdly, if you want to tie somebody to a bondage stand you need to fully tie their body, on both groin and chest!. To do that you need to use rope on body and then on groin of character, then you can just buckle them to the stand like any chair. Don't forget to have some ropes on your hand to actually tie them to the stand, as there's no ropes included with it! And that's it!"
default_raw_text = "Hello! Congratulations on your purchase of the shibari kit by KinkMate! Some newbies may get confused by our ropes, so we prepared a small instructions for you! First of all, you have to have a wrench to construct the stand itself. Secondly, you can use screwdrivers to change the color of your shibari stand. Just replace the plastic fittings! Thirdly, if you want to tie somebody to a bondage stand you need to fully tie their body, on both groin and chest!. To do that you need to use rope on body and then on groin of character, then you can just buckle them to the stand like any chair. Don't forget to have some ropes on your hand to actually tie them to the stand, as there's no ropes included with it! And that's it!"

Choose a reason for hiding this comment

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

LustWish чем тебе не угодил? KinkMate этож название вендомата, а не компании

@@ -27,7 +29,19 @@
to_chat(user, span_warning("You fail to assemble [src]!"))
return

new resulting_structure (get_turf(src))
var/obj/structure/chair/final_structure = new resulting_structure (get_turf(user))
if(current_color && istype(final_structure, /obj/structure/chair/milking_machine))

Choose a reason for hiding this comment

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

мне что-то говорит, что первая проверка не имеет смысла сколько current_color = "" выставленной изначально, которая делает, что он существует (цвет)

Copy link
Author

Choose a reason for hiding this comment

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

Там по сути должна быть механика выбора цвета из двух возможных. Но пришлось её упразднить. Я не смог её портировать.

Comment on lines +37 to +40
if(current_color == "pink")
new_milker.icon_state = "milking_pink_off"
else
new_milker.icon_state = "milking_teal_off"

Choose a reason for hiding this comment

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

вообще буду дико занудным, но в этой ситуации лучше сделать всёж через new_milker.icon_state = "milking_[current_color]_off" выставив базовый цвет teal (или как обычный должен быть)

@@ -122,5 +126,6 @@
!peeker.is_eyes_covered(FALSE) && !(eye_blocker && eye_blocker.tint > 0) && \
!(peeker.invisibility > peeked.invisibility) && !(peeker.alpha <= 30)))
return
to_chat(peeked, span_warning("[peeker] подсматривает под твою [worn_uniform.name]!"))
to_chat(peeker, span_warning("[peeked] замечает, как ты подсматриваешь под [peeked.ru_ego()] [worn_uniform.name]!"))
if(peeker in view(1, peeked.client))

Choose a reason for hiding this comment

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

получается только с 1 тайла можно будет заметить как подглядывают?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants