Merge branch 'master' into upstream-merge-31727

code/modules/admin/topic.dm

@@ -393,6 +393,8 @@
 		log_admin("[key_name(usr)] [msg]")
 		message_admins("[key_name_admin(usr)] [msg]")
 		href_list["secrets"] = "check_antagonist"
+		if(SSticker.ready_for_reboot && !SSticker.delay_end) //we undelayed after standard reboot would occur
+			SSticker.standard_reboot()
 
 	else if(href_list["end_round"])
 		if(!check_rights(R_ADMIN))

code/modules/admin/verbs/machine_upgrade.dm

@@ -1,6 +1,9 @@
 /proc/machine_upgrade(obj/machinery/M in world)
 	set name = "Tweak Component Ratings"
 	set category = "Debug"
+	if (!istype(M))
+		return
+
 	var/new_rating = input("Enter new rating:","Num") as num
 	if(new_rating && M.component_parts)
 		for(var/obj/item/stock_parts/P in M.component_parts)

code/modules/admin/verbs/randomverbs.dm

@@ -651,10 +651,10 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	set name = "Change View Range"
 	set desc = "switches between 1x and custom views"
 
-	if(view == world.view)
+	if(view == CONFIG_GET(string/default_view))
 		change_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
-		change_view(world.view)
+		change_view(CONFIG_GET(string/default_view))
 
 	log_admin("[key_name(usr)] changed their view range to [view].")
 	//message_admins("\blue [key_name_admin(usr)] changed their view range to [view].")	//why? removed by order of XSI