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

…лы призракам
ss220-space · Feb 3, 2025 · 2b80536 · 2b80536
1 parent 5e35d40
commit 2b80536
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm
@@ -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
@@ -236,7 +236,7 @@ GLOBAL_LIST_INIT(VVpixelmovement, list("step_x", "step_y", "step_size", "bound_h
 				return
 			.["type"] = type
 			var/list/arguments
-			
+
 			if(tgui_alert(usr, "Вы хотите добавить аргументы?", "Новый атом", list("Да", "Нет")) == "Да")
 				arguments = get_callproc_args(FALSE)
 			else
@@ -252,7 +252,7 @@ GLOBAL_LIST_INIT(VVpixelmovement, list("step_x", "step_y", "step_size", "bound_h
 				return
 			.["type"] = type
 			var/list/arguments
-			
+
 			if(tgui_alert(usr, "Вы хотите добавить аргументы?", "Новый атом", list("Да", "Нет")) == "Да")
 				arguments = get_callproc_args(FALSE)
 			else
@@ -272,7 +272,7 @@ GLOBAL_LIST_INIT(VVpixelmovement, list("step_x", "step_y", "step_size", "bound_h
 
 			.["type"] = type
 			var/list/arguments
-			
+
 			if(tgui_alert(usr, "Вы хотите добавить аргументы?", "Новый атом", list("Да", "Нет")) == "Да")
 				arguments = get_callproc_args(FALSE)
 			else

diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
@@ -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)
 
@@ -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)

diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
@@ -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))