Merge branch 'master' into upstream-merge-14128

code/modules/admin/admin_verb_lists_vr.dm

@@ -128,7 +128,8 @@ var/list/admin_verbs_admin = list(
 	/client/proc/despawn_player,
 	/datum/admins/proc/view_feedback,
 	/client/proc/make_mentor,
-	/client/proc/unmake_mentor
+	/client/proc/unmake_mentor,
+	/client/proc/removetickets
 	)
 
 var/list/admin_verbs_ban = list(

code/modules/admin/admin_verbs_vr.dm

@@ -54,8 +54,6 @@
 		segments = 36
 	if(tgui_alert(usr, "\The [orbiter] will orbit around [center]. Is this okay?", "Confirm Orbit", list("Yes", "No")) == "Yes")
 		orbiter.orbit(center, distance, clock, speed, segments)
-<<<<<<< HEAD
-=======
 
 /client/proc/removetickets()
 	set name = "Security Tickets"
@@ -67,6 +65,7 @@
 
 	if(security_printer_tickets.len >= 1)
 		var/input = tgui_input_list(usr, "Which message?", "Security Tickets", security_printer_tickets)
+
 		if(!input)
 			return
 		if(tgui_alert(usr, "Do you want to remove the following message from the global list? \"[input]\"", "Remove Ticket", list("Yes", "No")) == "Yes")
@@ -74,5 +73,4 @@
 			log_and_message_admins("removed a security ticket from the global list: \"[input]\"", usr)
 
 	else
-		tgui_alert_async(usr, "The ticket list is empty.","Empty")
->>>>>>> df07586ebd... Merge pull request #14128 from Very-Soft/SecurityTickettweak
+		tgui_alert_async(usr, "The ticket list is empty.","Empty")