Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch

code/modules/admin/outfit_editor.dm

@@ -55,7 +55,7 @@
 			"name" = initial(item.name),
 			"desc" = initial(item.desc),
 			// at this point initializing the item is probably faster tbh
-			"sprite" = icon2base64(icon(initial(item.icon), initial(item.icon_state))),
+			"sprite" = icon2base64(icon(initial(item.icon), initial(item.icon_state), SOUTH, 1)),
 		)
 
 	return data

code/modules/admin/topic.dm

@@ -2038,6 +2038,12 @@
 		var/obj/item/station_charter/charter = locate(href_list["reject_custom_name"])
 		if(istype(charter))
 			charter.reject_proposed(usr)
+	else if(href_list["approve_custom_name"])
+		if(!check_rights(R_ADMIN))
+			return
+		var/obj/item/station_charter/charter = locate(href_list["approve_custom_name"])
+		if(istype(charter))
+			charter.allow_pass(usr)
 	else if(href_list["jumpto"])
 		if(!isobserver(usr) && !check_rights(R_ADMIN))
 			return

code/modules/admin/verbs/SDQL2/SDQL_2.dm

@@ -242,7 +242,7 @@
 	var/selectors_used = FALSE
 	var/list/combined_refs = list()
 	do
-		CHECK_TICK
+		stoplag(2)
 		finished = TRUE
 		for(var/i in running)
 			var/datum/SDQL2_query/query = i