From 22a10ce4290e7255722247ed228468cf0a3493db Mon Sep 17 00:00:00 2001 From: Sin-of-Geleus Date: Sat, 7 Dec 2024 12:34:19 +0200 Subject: [PATCH 1/2] =?UTF-8?q?=D0=A7=D0=B8=D0=BD=D0=B8=D0=BC=20=D0=BD?= =?UTF-8?q?=D0=B0=D0=B4=D0=BF=D0=B8=D1=81=D0=B8=20=D0=BD=D0=B0=20=D1=82?= =?UTF-8?q?=D0=B5=D0=BB=D0=B5=20(6=20=D1=87=D0=B0=D1=81=D0=BE=D0=B2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Исправлен код нанесения надписей на теле и гениталиях. --- code/modules/surgery/bodyparts/parts.dm | 8 ++-- modular_splurt/code/modules/paperwork/pen.dm | 48 +++++++++++--------- 2 files changed, 30 insertions(+), 26 deletions(-) diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm index 5418f33dc9e0..ed913125ff0e 100644 --- a/code/modules/surgery/bodyparts/parts.dm +++ b/code/modules/surgery/bodyparts/parts.dm @@ -1,9 +1,9 @@ /obj/item/bodypart/chest name = BODY_ZONE_CHEST - ru_name = "грудь" - ru_name_v = "груди" - ru_name_y = "грудь" - ru_name_capital = "Грудь" + ru_name = "туловище" + ru_name_v = "туловище" + ru_name_y = "туловище" + ru_name_capital = "Туловище" desc = "It's impolite to stare at a person's chest." icon_state = "default_human_chest" max_damage = 200 diff --git a/modular_splurt/code/modules/paperwork/pen.dm b/modular_splurt/code/modules/paperwork/pen.dm index 0f180cdd4f90..cbf4f9bb5417 100644 --- a/modular_splurt/code/modules/paperwork/pen.dm +++ b/modular_splurt/code/modules/paperwork/pen.dm @@ -1,4 +1,4 @@ -/obj/item/pen/attack(mob/living/M, mob/user, stealth) +/obj/item/pen/attack(mob/living/M, mob/living/user, stealth) if(!istype(M)) return @@ -13,13 +13,9 @@ return // BLUEMOON EDIT START - возможность писать на отдельных частях тела - var/try_to_write_on_genitals = FALSE - var/target_body_part - - target_body_part = zone2body_parts_covered_complicated(user.zone_selected) - + var/target_body_part = zone2body_parts_covered_complicated(user.zone_selected) if(!target_body_part) - to_chat(user, span_warning("You must choose a bodypart on your doll to write on!")) + to_chat(user, span_warning("Вы должны выбрать часть тела!")) return var/list/items_on_target = list() @@ -28,12 +24,10 @@ for(var/A in items_on_target) var/obj/item/worn_clothes = A if(worn_clothes.body_parts_covered & target_body_part) - to_chat(user, span_warning("The target body part is covered with their clothes.")) + to_chat(user, span_warning("Вам мешает одежда.")) return - var/obj/item/G - if(try_to_write_on_genitals && T.exposed_genitals.len) - G = user:pick_receiving_organ(T, NONE, "Pick a genital to write on", "PRESS CANCEL to write on the targeted body part") + var/obj/item/G = user.pick_receiving_organ(T, NONE, "Выбирите где оставить надпись", "Выберите CANCEL что-бы написать на выбранной конечности") // BLUEMOON ADD END /* BLUEMOON REMOVAL START - сверху более умная реализация по отдельным частям тела @@ -42,8 +36,11 @@ return / BLUEMOON REMOVAL END */ - var/obj/item/BP = (G ? G : T.get_bodypart(user.zone_selected)) - + var/obj/item/bodypart/BP = G ? G : T.get_bodypart(user.zone_selected) // Выборка части тела + if(user.zone_selected == BODY_ZONE_PRECISE_GROIN) // проверка на гроин + BP = T.get_bodypart(BODY_ZONE_CHEST) + if(isnull(BP)) // Если выбраны глаза или рот + return /* BLUEMOON ADD START - перемещаем код выше var/obj/item/BP = (G ? G : T.get_bodypart(user.zone_selected)) @@ -51,25 +48,32 @@ return / BLUEMOON ADD END */ - var/writting = input(user, "Add writing, doesn't replace current text", "Writing on [T]") as text|null + if(target_body_part == 2) // проверка на туловище + target_body_part = CHEST + + + + var/writting = input(user, "Оставить надпись, не заменяет уже имеющийся", "Надпись на [T]") as text|null if(!writting) return - if(!(user==T)) - src.visible_message("[user] begins to write on [T]'s [BP:name].") + if(user != T) + src.visible_message("[user] начинает выводить натпись на [T]'s [BP.name].") else - to_chat(user, "You begin to write on your [BP:name].") + to_chat(user, "Вы начали выводить надпись на [BP.name].") if(do_mob(user, T, 4 SECONDS)) - if((length(BP:writtentext))+(length(writting)) < 130) //130 character limit to stop spamming. - BP:writtentext += html_encode(writting) //you can add to text, not remove it. + if((length(BP.writtentext))+(length(writting)) < 130) //130 лимит символов. + BP.writtentext += html_encode(writting) //you can add to text, not remove it. else - to_chat(user, "There isnt enough space to write that on [T]'s [BP:name].") + to_chat(user, "Недостаточно места для надписи на [T]'s [BP.name].") return if(!(user==T)) - to_chat(user, "You write on [T]'s [BP:name].") + to_chat(user, "Вы оставили надпись на [T]'s [BP.name].") else - to_chat(user, "You write on your [BP:name].") + to_chat(user, "Вы оставили надпись на [BP.name].") else . = ..() + + From ddf934d0b05825296f92f36de28756efb987d5f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA?= <80326524+SmiLeYre@users.noreply.github.com> Date: Sat, 7 Dec 2024 18:12:23 +0300 Subject: [PATCH 2/2] Update pen.dm --- modular_splurt/code/modules/paperwork/pen.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_splurt/code/modules/paperwork/pen.dm b/modular_splurt/code/modules/paperwork/pen.dm index cbf4f9bb5417..a19cd2e2f40b 100644 --- a/modular_splurt/code/modules/paperwork/pen.dm +++ b/modular_splurt/code/modules/paperwork/pen.dm @@ -58,7 +58,7 @@ return if(user != T) - src.visible_message("[user] начинает выводить натпись на [T]'s [BP.name].") + src.visible_message("[user] начинает выводить надпись на [T]'s [BP.name].") else to_chat(user, "Вы начали выводить надпись на [BP.name].")