Небольшие фиксы по ишуям (#2519)

Co-authored-by: Builder13 <[email protected]>
SierraBay · Jul 24, 2024 · a53306e · a53306e
1 parent ed102f2
commit a53306e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
@@ -796,10 +796,16 @@ Ccomp's first proc.
 	set name = "Change View Range"
 	set desc = "switches between 1x and custom views"
 
-	if(view == world.view)
+	// [SIERRA-EDIT]
+	// if(view == world.view) // SIERRA-EDIT - Original
+	if(view == get_preference_value(/datum/client_preference/client_view))
+	// [/SIERRA-EDIT]
 		view = input("Select view range:", "FUCK YE", 7) in list(1,2,3,4,5,6,7,8,9,10,11,12,13,14,128)
 	else
+		// [SIERRA-EDIT]
+		// view = world.view // SIERRA-EDIT - Original
 		view = get_preference_value(/datum/client_preference/client_view)
+		// [/SIERRA-EDIT]
 
 	log_and_message_admins("changed their view range to [view].")
 

diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
@@ -90,12 +90,14 @@
 /obj/item/reagent_containers/glass/throw_impact(atom/hit_atom)
 	if (QDELETED(src))
 		return
-	if (!LAZYISIN(matter, MATERIAL_GLASS) && (length(reagents.reagent_list) > 0)) // Не стеклянные предметы просто проливают содержимое на пол/моба, если содержимое есть
-//		if (length(reagents.reagent_list) > 0)
-		visible_message(
-			SPAN_DANGER("\The [src] bounces and spills all its contents!")
-		)
-		reagents.splash(hit_atom, reagents.total_volume)
+	if (!LAZYISIN(matter, MATERIAL_GLASS)) // Не стеклянные предметы просто проливают содержимое на пол/моба, если содержимое есть
+		// [SIERRA-ADD]
+		if (length(reagents.reagent_list) > 0)
+			visible_message(
+				SPAN_DANGER("\The [src] bounces and spills all its contents!")
+			)
+			reagents.splash(hit_atom, reagents.total_volume)
+		// [/SIERRA-ADD]
 		return
 	if (prob(80))
 		if (length(reagents.reagent_list) > 0)

diff --git a/mods/utility_items/code/multimeter.dm b/mods/utility_items/code/multimeter.dm
@@ -135,7 +135,8 @@
 	return mapload ? INITIALIZE_HINT_LATELOAD : INITIALIZE_HINT_NORMAL
 
 // Overrides this because otherwise this leads us to unit tests failing
-/obj/structure/closet/crate/secure/loot
+/obj/structure/closet/crate/secure/loot/Initialize(mapload, need_fill)
+	. = ..()
 	codelen = 4
 
 // Proceeding to do stuff