Skip to content

Commit

Permalink
Исправления тут и там
Browse files Browse the repository at this point in the history
  • Loading branch information
@don-pardon42
don-pardon42 committed Dec 5, 2024
1 parent 09145e6 commit aa59baf
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions code/modules/food_and_drinks/drinks/drinks/bottle.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@

/obj/item/reagent_containers/drinks/bottle/whiskey
name = "Uncle Git's Special Reserve"
desc = "Премиум односолодовый виски, мягко выдержанный внутри туннелей ядерного убежища. ПРАВИЛА ТУННЕЛЬНОГО ВИСКИ."
desc = "Премиум односолодовый виски, мягко выдержанный внутри туннелей ядерного убежища. ТУННЕЛЬНЫЙ ВИСКИ РУЛИТ."
icon_state = "whiskeybottle"
list_reagents = list("whiskey" = 100)

Expand Down Expand Up @@ -215,7 +215,7 @@

/obj/item/reagent_containers/drinks/bottle/holywater
name = "flask of holy water"
desc = "A flask of the chaplain's holy water."
desc = "Фляга святой воды капеллана."
icon_state = "holyflask"
list_reagents = list("holywater" = 100)

Expand Down Expand Up @@ -273,7 +273,7 @@

/obj/item/reagent_containers/drinks/bottle/fernet
name = "Fernet Bronca"
desc = "Бутылка чистого Фернет-Бранка. Настоен на 27 различных космических трав."
desc = "Бутылка чистого Фернет-Бранка. Настоен на 27 различных космических травах."
icon_state = "fernetbottle"
list_reagents = list("fernet" = 100)

Expand Down
4 changes: 2 additions & 2 deletions code/modules/food_and_drinks/drinks/drinks/shotglass.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,14 @@
return
..()
set_light(light_intensity, null, light_color)
visible_message("<span class = 'notice'>[src] begins to burn with a blue hue!</span>")
visible_message("<span class = 'notice'>[capitalize(declent_ru(NOMINATIVE))] начинает гореть синим пламенем!</span>")
update_appearance(UPDATE_NAME|UPDATE_OVERLAYS)

/obj/item/reagent_containers/drinks/drinkingglass/shotglass/extinguish(silent = FALSE)
..()
set_light(0)
if(!silent)
visible_message("<span class = 'notice'>The dancing flame on [src] dies out.</span>")
visible_message("<span class = 'notice'>Танцующее пламя на [declent_ru(PREPOSITIONAL)] гаснет.</span>")
update_appearance(UPDATE_NAME|UPDATE_OVERLAYS)

/obj/item/reagent_containers/drinks/drinkingglass/shotglass/burn() //Let's override fire deleting the reagents inside the shot
Expand Down
20 changes: 10 additions & 10 deletions code/modules/food_and_drinks/drinks/drinks_base.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@

if(target.is_refillable() && is_drainable()) //Something like a glass. Player probably wants to transfer TO it.
if(!reagents.total_volume)
to_chat(user, "<span class='warning'>[declent_ru(NOMINATIVE)] [genderize_ru(src, "пустой", "пустая", "пустое", "пустые")].</span>")
to_chat(user, "<span class='warning'>[capitalize(declent_ru(NOMINATIVE))] [genderize_ru(src, "пустой", "пустая", "пустое", "пустые")].</span>")
return FALSE

if(target.reagents.holder_full())
to_chat(user, "<span class='warning'>[target] is full.</span>")
to_chat(user, "<span class='warning'>[capitalize(declent_ru(NOMINATIVE))] [genderize_ru(src, "полный", "полная", "полное", "полные")].</span>")
return FALSE

var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
Expand All @@ -77,11 +77,11 @@
to_chat(user, "<span class='warning'>Крышка [declent_ru(GENITIVE)] закрыта!</span>")
return FALSE
if(!target.reagents.total_volume)
to_chat(user, "<span class='warning'>[target] is empty.</span>")
to_chat(user, "<span class='warning'>[capitalize(declent_ru(NOMINATIVE))] [genderize_ru(src, "пустой", "пустая", "пустое", "пустые")].</span>")
return FALSE

if(reagents.holder_full())
to_chat(user, "<span class='warning'>[src] is full.</span>")
to_chat(user, "<span class='warning'>[capitalize(declent_ru(NOMINATIVE))] [genderize_ru(src, "полный", "полная", "полное", "полные")].</span>")
return FALSE

var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this)
Expand All @@ -93,16 +93,16 @@
. = ..()
if(in_range(user, src))
if(!reagents || reagents.total_volume == 0)
. += "<span class='notice'>[src] is empty!</span>"
. += "<span class='notice'>[capitalize(declent_ru(NOMINATIVE))] [genderize_ru(src, "пустой", "пустая", "пустое", "пустые")]!</span>"
else if(reagents.total_volume <= volume/4)
. += "<span class='notice'>[src] is almost empty!</span>"
. += "<span class='notice'>[capitalize(declent_ru(NOMINATIVE))] почти [genderize_ru(src, "полный", "полная", "полное", "полные")]!</span>"
else if(reagents.total_volume <= volume*0.66)
. += "<span class='notice'>[src] is half full!</span>"// We're all optimistic, right?!
. += "<span class='notice'>[capitalize(declent_ru(NOMINATIVE))] наполовину [genderize_ru(src, "полный", "полная", "полное", "полные")]!</span>"// We're all optimistic, right?!

else if(reagents.total_volume <= volume*0.90)
. += "<span class='notice'>[src] is almost full!</span>"
. += "<span class='notice'>[capitalize(declent_ru(NOMINATIVE))] почти [genderize_ru(src, "полный", "полная", "полное", "полные")]!</span>"
else
. += "<span class='notice'>[src] is full!</span>"
. += "<span class='notice'>[capitalize(declent_ru(NOMINATIVE))] [genderize_ru(src, "полный", "полная", "полное", "полные")]!</span>"

////////////////////////////////////////////////////////////////////////////////
/// Drinks. END
Expand Down Expand Up @@ -295,7 +295,7 @@
COOLDOWN_START(src, shaking_cooldown, 3 SECONDS)

if(shaking)
if(do_after_once(user, 3 SECONDS, target = src, allow_moving = TRUE, attempt_cancel_message = "Вы прекращаете трясти [declent_ru(ACCUSATIVE)] до того как, содержимое смешается."))
if(do_after_once(user, 3 SECONDS, target = src, allow_moving = TRUE, attempt_cancel_message = "Вы прекращаете трясти [declent_ru(ACCUSATIVE)] до того, как содержимое смешается."))
reagents.set_reacting(TRUE)
reagents.handle_reactions()
icon_state = "shaker"
Expand Down

0 comments on commit aa59baf

Please sign in to comment.