From 43b42c00219aa8c645c3630ed2a75e48d89a461c Mon Sep 17 00:00:00 2001
From: Doubleumc <doubleumc@comcast.net>
Date: Sat, 25 Nov 2023 19:47:50 -0500
Subject: [PATCH] convert to view

---
 code/modules/admin/game_master/game_master.dm | 18 ++++--------------
 tgui/packages/tgui/interfaces/GameMaster.js   |  4 ++--
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/code/modules/admin/game_master/game_master.dm b/code/modules/admin/game_master/game_master.dm
index f9c45a34b4..7583f4ca17 100644
--- a/code/modules/admin/game_master/game_master.dm
+++ b/code/modules/admin/game_master/game_master.dm
@@ -209,22 +209,12 @@ GLOBAL_VAR_INIT(radio_communication_clarity, 100)
 
 			return
 
-		if("delete_near_xenos")
-			if(tgui_alert(ui.user, "Do you want to delete xenos within your view range?", "Confirmation", list("Yes", "No")) != "Yes")
+		if("delete_xenos_in_view")
+			if(tgui_alert(ui.user, "Do you want to delete all xenos within your view range?", "Confirmation", list("Yes", "No")) != "Yes")
 				return
 
-			var/turf/current_turf = get_turf(usr)
-			var/view_min_x = current_turf.x - usr.client.view
-			var/view_min_y = current_turf.y - usr.client.view
-			var/view_max_x = current_turf.x + usr.client.view
-			var/view_max_y = current_turf.y + usr.client.view
-
-			for(var/mob/living/carbon/xenomorph/nearby_xeno as anything in GLOB.xeno_mob_list)
-				var/turf/xeno_turf = get_turf(nearby_xeno)
-				if(xeno_turf.z != current_turf.z || !ISINRANGE(xeno_turf.x, view_min_x, view_max_x) || !ISINRANGE(xeno_turf.y, view_min_y, view_max_y))
-					continue
-
-				qdel(nearby_xeno)
+			for(var/mob/living/carbon/xenomorph/viewed_xeno in view(ui.user.client.view))
+				qdel(viewed_xeno)
 
 			return
 
diff --git a/tgui/packages/tgui/interfaces/GameMaster.js b/tgui/packages/tgui/interfaces/GameMaster.js
index bcacfd23a6..6814a89394 100644
--- a/tgui/packages/tgui/interfaces/GameMaster.js
+++ b/tgui/packages/tgui/interfaces/GameMaster.js
@@ -87,9 +87,9 @@ export const GameMasterSpawningPanel = (props, context) => {
             </Stack.Item>
             <Stack.Item>
               <Button
-                content="Delete near xenos"
+                content="Delete viewed xenos"
                 onClick={() => {
-                  act('delete_near_xenos');
+                  act('delete_xenos_in_view');
                 }}
               />
             </Stack.Item>