Skip to content

Commit c1a071d

Browse files
PlayerUnknown14PlayerUnknown14
committed
тык
1 parent b717eec commit c1a071d

File tree

6 files changed

+169
-81
lines changed

6 files changed

+169
-81
lines changed

‎code/game/atoms.dm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -418,20 +418,20 @@
418418

419419
if(reagents)
420420
if(container_type & TRANSPARENT)
421-
. += span_notice("Внутри содержится:")
421+
. += span_notice("Содержимое:")
422422
if(reagents.reagent_list.len)
423423
if(user.can_see_reagents()) //Show each individual reagent
424424
for(var/I in reagents.reagent_list)
425425
var/datum/reagent/R = I
426-
. += span_notice("[R.volume] единиц[declension_ru(R.volume, "у", "ы", "")] [R.name].")
426+
. += span_notice("[R.name] - [R.volume] единиц[declension_ru(R.volume, "а", "ы", "")].")
427427
else //Otherwise, just show the total volume
428428
if(reagents && reagents.reagent_list.len)
429-
. += span_notice("[reagents.total_volume] единиц[declension_ru(reagents.total_volume, "у", "ы", "")] различных веществ.")
429+
. += span_notice("[reagents.total_volume] единиц[declension_ru(reagents.total_volume, "а", "ы", "")] вещества.")
430430
else
431431
. += span_notice("Ничего.")
432432
else if(container_type & AMOUNT_VISIBLE)
433433
if(reagents.total_volume)
434-
. += span_notice("Осталось ещё [reagents.total_volume] единиц[declension_ru(reagents.total_volume, "у", "ы", "")].")
434+
. += span_notice("Осталось ещё [reagents.total_volume] единиц[declension_ru(reagents.total_volume, "а", "ы", "")] вещества.")
435435
else
436436
. += span_danger("Внутри ничего нет.")
437437

‎code/modules/clothing/suits/miscellaneous.dm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1635,7 +1635,7 @@
16351635
NOMINATIVE = "чёрный балахон",
16361636
GENITIVE = "чёрного балахона",
16371637
DATIVE = "чёрному балахону",
1638-
ACCUSATIVE = "чёрного балахона",
1638+
ACCUSATIVE = "чёрный балахон",
16391639
INSTRUMENTAL = "чёрным балахоном",
16401640
PREPOSITIONAL = "чёрном балахоне"
16411641
)
@@ -1660,7 +1660,7 @@
16601660
NOMINATIVE = "чёрный капюшон",
16611661
GENITIVE = "чёрного капюшона",
16621662
DATIVE = "чёрному капюшону",
1663-
ACCUSATIVE = "чёрного капюшона",
1663+
ACCUSATIVE = "чёрный капюшон",
16641664
INSTRUMENTAL = "чёрным капюшоном",
16651665
PREPOSITIONAL = "чёрном капюшоне"
16661666
)
@@ -1683,7 +1683,7 @@
16831683
NOMINATIVE = "кроваво-чёрный балахон",
16841684
GENITIVE = "кроваво-чёрного балахона",
16851685
DATIVE = "кроваво-чёрному балахону",
1686-
ACCUSATIVE = "кроваво-чёрного балахона",
1686+
ACCUSATIVE = "кроваво-чёрный балахон",
16871687
INSTRUMENTAL = "кроваво-чёрным балахоном",
16881688
PREPOSITIONAL = "кроваво-чёрном балахоне"
16891689
)

‎code/modules/food_and_drinks/drinks/drinks.dm

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
////////////////////////////////////////////////////////////////////////////////
44
/obj/item/reagent_containers/food/drinks
55
name = "drink"
6-
desc = "yummy"
6+
desc = "Вкусняшка."
77
icon = 'icons/obj/drinks.dmi'
88
icon_state = null
99
container_type = OPENCONTAINER
@@ -35,18 +35,18 @@
3535
. = ATTACK_CHAIN_PROCEED
3636

3737
if(!reagents || !reagents.total_volume)
38-
to_chat(user, span_warning("None of [src] left, oh no!"))
38+
balloon_alert(user, "пусто!")
3939
return .
4040

4141
if(!is_drainable())
42-
to_chat(user, span_warning("You need to open [src] first!"))
42+
balloon_alert(user, "сначала откройте!")
4343
return .
4444

4545
if(!get_location_accessible(target, BODY_ZONE_PRECISE_MOUTH))
4646
if(target == user)
47-
to_chat(user, span_warning("Your face is obscured."))
47+
balloon_alert(user, "ваш рот закрыт!")
4848
else
49-
to_chat(user, span_warning("[target]'s face is obscured."))
49+
balloon_alert(user, "рот цели закрыт!")
5050
return .
5151

5252
if(!target.eat(src, user))
@@ -77,9 +77,9 @@
7777
var/mob/living/silicon/robot/bro = user
7878
var/chargeAmount = max(30,4*trans)
7979
bro.cell.use(chargeAmount)
80-
to_chat(user, "<span class='notice'>Now synthesizing [trans] units of cocktail...</span>")
80+
to_chat(user, span_notice("Синтез [trans] единиц[pluralize_ru(trans, "ы", "", "")] вещества..."))
8181
addtimer(CALLBACK(reagents, TYPE_PROC_REF(/datum/reagents, add_reagent_list), ids_data), 30 SECONDS)
82-
addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, user, "<span class='notice'>Cyborg [src] refilled.</span>"), 30 SECONDS)
82+
addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, user, span_notice("Ваш[genderize_ru(gender, "", "а", "е", "и")] [declent_ru(NOMINATIVE)] снова пол[genderize_ru(gender, "он", "на", "но", "ны")].")), 30 SECONDS)
8383
else
8484
reagents.add_reagent_list(ids_data)
8585
else
@@ -90,23 +90,23 @@
9090
return ..()
9191
var/mob/living/carbon/chugger = over_object
9292
if(!(container_type & DRAINABLE))
93-
to_chat(chugger, "<span class='notice'>You need to open [src] first!</span>")
93+
balloon_alert(chugger, "сначала откройте!")
9494
return
9595
if(!get_location_accessible(chugger, BODY_ZONE_PRECISE_MOUTH))
96-
to_chat(chugger, "<span class='notice'>Your face is obscured, so you cant [pick("chugging","gulping")].</span>")
96+
balloon_alert(user, "ваш рот закрыт!")
9797
return
9898
if(reagents.total_volume && loc == chugger && src == chugger.get_active_hand())
99-
chugger.visible_message("<span class='notice'>[chugger] raises [src] to [chugger.p_their()] mouth and starts [pick("chugging","gulping")] it down like [pick("a savage","a mad beast","it's going out of style","there's no tomorrow")]!</span>",
100-
"<span class='notice'>You start chugging [src].</span>",
101-
"<span class='notice'>You hear what sounds like gulping.</span>")
99+
chugger.visible_message(span_notice("[chugger] поднос[pluralize_ru(chugger.gender, "ит", "ят")] [declent_ru(ACCUSATIVE)] к своему рту и начина[pluralize_ru(chugger.gender, "ет", "ют")] [pick("цедить", "прихлёбывать", "медленно пить", "пить", "попивать", "хлебать", "потягивать")] содержимое."),
100+
span_notice("Вы подносите [declent_ru(ACCUSATIVE)] к своему рту и начинаете [pick("цедить", "прихлёбывать", "медленно пить", "пить", "попивать", "хлебать", "потягивать")] содержимое."),
101+
span_notice("Вы слышите звуки, походящие на питьё чего-то."))
102102
chugging = TRUE
103103
while(do_after(chugger, 4 SECONDS, chugger, progress = FALSE, max_interact_count = 1, cancel_on_max = TRUE, cancel_message = span_warning("You stop chugging [src].")))
104104
chugger.eat(src, chugger, 25) //Half of a glass, quarter of a bottle.
105105
if(!reagents.total_volume) //Finish in style.
106106
chugger.emote("gasp")
107-
chugger.visible_message("<span class='notice'>[chugger] [pick("finishes","downs","polishes off","slams")] the entire [src], what a [pick("savage","monster","champ","beast")]!</span>",
108-
"<span class='notice'>You finish off [src]![prob(50) ? " Maybe that wasn't such a good idea..." : ""]</span>",
109-
"<span class='notice'>You hear a gasp and a clink.</span>")
107+
chugger.visible_message(span_notice("[chugger] [pick("залпом", "за раз", "в один присест", "не отрываясь от горла", "полностью", "досуха")] выпива[pluralize_ru(chugger.gender, "ет", "ют")] содержимое [declent_ru(GENITIVE)]."),
108+
span_notice("Вы [pick("залпом", "за раз", "в один присест", "не отрываясь от горла", "полностью", "досуха")] выпиваете содержимое [declent_ru(GENITIVE)]."),
109+
span_notice("Вы слышите громкие глотки и последующий громкий выдох."))
110110
break
111111
chugging = FALSE
112112

@@ -119,11 +119,11 @@
119119

120120
if(target.is_refillable() && is_drainable()) //Something like a glass. Player probably wants to transfer TO it.
121121
if(!reagents.total_volume)
122-
to_chat(user, "<span class='warning'> [src] is empty.</span>")
122+
balloon_alert(user, "пусто!")
123123
return FALSE
124124

125125
if(target.reagents.holder_full())
126-
to_chat(user, "<span class='warning'> [target] is full.</span>")
126+
balloon_alert(user, "нет места!")
127127
return FALSE
128128

129129
var/list/transfer_data = reagents.get_transferred_reagents(target, amount_per_transfer_from_this)
@@ -132,39 +132,39 @@
132132
if(isrobot(user))
133133
SynthesizeDrinkFromTransfer(user, transfer_data)
134134

135-
to_chat(user, "<span class='notice'> You transfer [trans] units of the solution to [target].</span>")
135+
to_chat(user, span_notice("Вы переливаете [trans] единиц[declension_ru(trans, "у", "ы", "")] вещества в [target.declent_ru(ACCUSATIVE)]."))
136136

137137
else if(target.is_drainable()) //A dispenser. Transfer FROM it TO us.
138138
if(!is_refillable())
139-
to_chat(user, "<span class='warning'>[src]'s tab isn't open!</span>")
139+
balloon_alert(user, "закрыто!")
140140
return FALSE
141141
if(!target.reagents.total_volume)
142-
to_chat(user, "<span class='warning'>[target] is empty.</span>")
142+
balloon_alert(user, "пусто!")
143143
return FALSE
144144

145145
if(reagents.holder_full())
146-
to_chat(user, "<span class='warning'>[src] is full.</span>")
146+
balloon_alert(user, "нет места!")
147147
return FALSE
148148

149149
var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this)
150-
to_chat(user, "<span class='notice'>You fill [src] with [trans] units of the contents of [target].</span>")
150+
to_chat(user, span_notice("Вы наполняете [declent_ru(ACCUSATIVE)] [trans] единиц[declension_ru(trans, "ей", "ами", "ами")] вещества из содержимого [target.declent_ru(ACCUSATIVE)]."))
151151

152152
return FALSE
153153

154154
/obj/item/reagent_containers/food/drinks/examine(mob/user)
155155
. = ..()
156156
if(in_range(user, src))
157157
if(!reagents || reagents.total_volume == 0)
158-
. += "<span class='notice'> \The [src] is empty!</span>"
158+
. += span_notice("Пусто.")
159159
else if(reagents.total_volume <= volume/4)
160-
. += "<span class='notice'> \The [src] is almost empty!</span>"
160+
. += span_notice("Почти пусто.")
161161
else if(reagents.total_volume <= volume*0.66)
162-
. += "<span class='notice'> \The [src] is half full!</span>"// We're all optimistic, right?!
162+
. += span_notice("Наполовину заполнено.")// We're all optimistic, right?!
163163

164164
else if(reagents.total_volume <= volume*0.90)
165-
. += "<span class='notice'> \The [src] is almost full!</span>"
165+
. += span_notice("Почти заполнено.")
166166
else
167-
. += "<span class='notice'> \The [src] is full!</span>"
167+
. += span_notice("Заполнено.")
168168

169169
////////////////////////////////////////////////////////////////////////////////
170170
/// Drinks. END

‎code/modules/food_and_drinks/drinks/drinks/cans.dm

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
var/can_burst = FALSE
99
var/burst_chance = 0
1010
foodtype = SUGAR
11+
gender = FEMALE
1112

1213
/obj/item/reagent_containers/food/drinks/cans/empty()
1314
if(!canopened)
@@ -17,10 +18,9 @@
1718

1819
/obj/item/reagent_containers/food/drinks/cans/examine(mob/user)
1920
. = ..()
20-
if(canopened)
21-
. += span_notice("Она открыта.")
22-
else
23-
. += span_info("Используйте <b>Ctrl+ЛКМ</b>, чтобы встряхнуть её!")
21+
. += span_notice("<b>[canopened ? "Открыто" : "Закрыто"]</b>")
22+
if(!canopened)
23+
. += span_info("Используйте <b>Ctrl+ЛКМ</b>, чтобы встряхнуть!")
2424

2525
/obj/item/reagent_containers/food/drinks/cans/attack_self(mob/user)
2626
if(canopened)
@@ -315,12 +315,12 @@
315315
name = "badmin brew"
316316
desc = "Бутылированная эссенция со вкусом щитспавна и ужасных ивентов. Наверное, это вам пить не стоит."
317317
ru_names = list(
318-
NOMINATIVE = "бутылка настойки \"Седали Пуки\"",
319-
GENITIVE = "бутылки настойки \"Седали Пуки\"",
320-
DATIVE = "бутылке настойки \"Седали Пуки\"",
321-
ACCUSATIVE = "бутылку настойки \"Седали Пуки\"",
322-
INSTRUMENTAL = "бутылкой настойки \"Седали Пуки\"",
323-
PREPOSITIONAL = "бутылке настойки \"Седали Пуки\""
318+
NOMINATIVE = "бутылка настойки \"Плохой Админ\"",
319+
GENITIVE = "бутылки настойки \"Плохой Админ\"",
320+
DATIVE = "бутылке настойки \"Плохой Админ\"",
321+
ACCUSATIVE = "бутылку настойки \"Плохой Админ\"",
322+
INSTRUMENTAL = "бутылкой настойки \"Плохой Админ\"",
323+
PREPOSITIONAL = "бутылке настойки \"Плохой Админ\""
324324
)
325325
icon_state = "badminbrew"
326326
is_glass = 1

‎code/modules/reagents/reagent_containers.dm

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
var/pass_open_check = FALSE // Pass open check in empty verb
1818

1919
/obj/item/reagent_containers/verb/set_APTFT() //set amount_per_transfer_from_this
20-
set name = "Set transfer amount"
20+
set name = "Установить объём перемещения содержимого"
2121
set category = "Object"
2222
set src in usr
2323

@@ -28,47 +28,47 @@
2828
var/default = null
2929
if(amount_per_transfer_from_this in possible_transfer_amounts)
3030
default = amount_per_transfer_from_this
31-
var/N = input("Amount per transfer from this:", "[src]", default) as null|anything in possible_transfer_amounts
31+
var/N = input("Объём перемещения отсюда:", "[declent_ru(NOMINATIVE)]", default) as null|anything in possible_transfer_amounts
3232

3333
if(!N)
3434
return
3535
if(!Adjacent(usr))
36-
to_chat(usr, "<span class='warning'>You have moved too far away!</span>")
36+
balloon_alert(usr, "слишком далеко!")
3737
return
3838

3939
if(usr.incapacitated() || HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED))
40-
to_chat(usr, "<span class='warning'>You can't use your hands!</span>")
40+
balloon_alert(usr, "руки заблокированы!")
4141
return
4242

4343
amount_per_transfer_from_this = N
44-
to_chat(usr, "<span class='notice'>[src] will now transfer [N] units at a time.</span>")
44+
to_chat(usr, span_notice("Теперь [declent_ru(NOMINATIVE)] буд[pluralize_ru(gender, "ет", "ут")] по [N] единиц[declension_ru(N, "у", "ы", "")] вещества за раз."))
4545

4646
/obj/item/reagent_containers/AltClick(mob/user)
4747
if(Adjacent(user))
4848
set_APTFT()
4949

5050
/obj/item/reagent_containers/verb/empty()
5151

52-
set name = "Empty Container"
52+
set name = "Вылить содержимое"
5353
set category = "Object"
5454
set src in usr
5555

5656
if(usr.incapacitated() || HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED))
5757
return
58-
if(alert(usr, "Are you sure you want to empty that?", "Empty Container:", "Yes", "No") != "Yes")
58+
if(tgui_alert(usr, "Вы уверены?", "Вылить содержимое", list("Да", "Нет")) != "Да")
5959
return
6060
if(!usr.Adjacent(src) || usr.incapacitated() || HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED))
6161
return
6262
if(isturf(usr.loc) && loc == usr)
6363
if(!is_open_container() && !pass_open_check)
64-
to_chat(usr, "<span class='warning'>Open [src] first.</span>")
64+
balloon_alert(usr, "сначала откройте!")
6565
return
6666
if(reagents.total_volume)
67-
to_chat(usr, "<span class='notice'>You empty [src] onto the floor.</span>")
67+
balloon_alert(usr, "содержимое вылито")
6868
reagents.reaction(usr.loc)
6969
reagents.clear_reagents()
7070
else
71-
to_chat(usr, "<span class='notice'>You tried emptying [src], but there's nothing in it.</span>")
71+
balloon_alert(usr, "пусто, нечего выливать!")
7272

7373
/obj/item/reagent_containers/New()
7474
create_reagents(volume, temperature_min, temperature_max)
@@ -110,10 +110,10 @@
110110
/obj/item/reagent_containers/attack_self(mob/user = usr)
111111
if(has_lid)
112112
if(is_open_container())
113-
to_chat(user, "<span class='notice'>You put the lid on [src].</span>")
113+
balloon_alert(user, "крышка надета")
114114
add_lid()
115115
else
116-
to_chat(user, "<span class='notice'>You take the lid off [src].</span>")
116+
balloon_alert(user, "крышка снята")
117117
remove_lid()
118118

119119

@@ -126,19 +126,19 @@
126126
/obj/item/reagent_containers/wash(mob/user, atom/source)
127127
if(is_open_container())
128128
if(reagents.total_volume >= volume)
129-
to_chat(user, "<span class='warning'>[src] is full.</span>")
129+
balloon_alert(user, "нет места!")
130130
return
131131
else
132132
reagents.add_reagent("water", min(volume - reagents.total_volume, amount_per_transfer_from_this))
133-
to_chat(user, "<span class='notice'>You fill [src] from [source].</span>")
133+
to_chat(user, span_notice("Вы наполняете [declent_ru(ACCUSATIVE)] из [source.declent_ru(GENITIVE)]."))
134134
return
135135
..()
136136

137137
/obj/item/reagent_containers/examine(mob/user)
138138
. = ..()
139139
if(visible_transfer_rate)
140-
. += "<span class='notice'>It will transfer [amount_per_transfer_from_this] unit[amount_per_transfer_from_this != 1 ? "s" : ""] at a time.</span>"
140+
. += span_notice("Объём перемещения содержимого отсюда - <b>[amount_per_transfer_from_this]</b> единиц[declension_ru(amount_per_transfer_from_this, "а", "ы", "")] вещества за раз.")
141141

142142
if(possible_transfer_amounts)
143-
. += "<span class='notice'>Alt-click to change the transfer amount.</span>"
143+
. += span_notice("Используйте <b>Alt+ЛКМ</b>, чтобы изменить объём перемещения содержимого.")
144144

0 commit comments

Comments
 (0)