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

bugfix: Исправление ввода чисел в ВВ + Возможность отмены раздачи куклы призракам #6521

Merged
merged 2 commits into from
Feb 8, 2025
Merged

bugfix: Исправление ввода чисел в ВВ + Возможность отмены раздачи куклы призракам #6521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b80536
bugfix: Исправление ввода чисел в ВВ + Возможность отмены раздачи кук…
dageavtobusnick Feb 3, 2025
50f2ac8
Merge branch 'master220' into vv_input_fix
BeebBeebBoob Feb 8, 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
2 changes: 1 addition & 1 deletion code/modules/admin/verbs/modifyvariables.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ GLOBAL_LIST_INIT(VVpixelmovement, list("step_x", "step_y", "step_size", "bound_h


if(VV_NUM)
.["value"] = tgui_input_number(src, "Введите число:", "Число", current_value)
.["value"] = tgui_input_number(src, "Введите число:", "Число", current_value, max_value = INFINITY)
if(.["value"] == null)
.["class"] = null
return
Expand Down
4 changes: 2 additions & 2 deletions code/modules/admin/verbs/randomverbs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(!mob)
return
if(!istype(M))
alert("This can only be used on instances of type /mob")
tgui_alert(src, "This can only be used on instances of type /mob")
return
offer_control(M)

Expand Down Expand Up @@ -1275,7 +1275,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
var/keep_name = tgui_alert(src, "Вы хотите, чтобы существа сохранили свои имена?", "Сохранить имена?", list("Да", "Нет"))

var/list/mobs = shuffle(GLOB.alive_player_list.Copy()) // might change while iterating

log_and_message_admins("polymorphed ALL living mobs.")

for(var/mob/living/M in mobs)
Expand Down
3 changes: 2 additions & 1 deletion code/modules/mob/mob_helpers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@
minhours = tgui_input_number(usr, "Минимальное количество часов, необходимое для игры на [offer_mob]?", "Установите число часов", 10)
else
minhours = hours

if(isnull(minhours))
return
log_and_message_admins("has offered control of ([key_name_admin(offer_mob)]) to ghosts with [minhours] hrs playtime")
var/question = "Вы хотите войти в раунд как [offer_mob.real_name ? offer_mob.real_name : offer_mob][offer_mob.job ? " ([offer_mob.job])" : ""]"
if(isnull(hide_role))
Expand Down