requested changes

cmss13-devs · Aug 1, 2023 · c242395 · c242395
1 parent 6e5e310
commit c242395
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/code/game/objects/items/devices/motion_detector.dm b/code/game/objects/items/devices/motion_detector.dm
@@ -229,17 +229,13 @@
 		if(human_user)
 			show_blip(human_user, M)
 
-	for(var/mob/hologram/queen/eye in GLOB.hologram_list)
-		if(eye.z != cur_turf.z || !(range_bounds.contains_atom(eye))) continue
+	for(var/mob/hologram/holo as anything in GLOB.hologram_list)
+		if(!holo.motion_sensed)
+			return
+		if(holo.z != cur_turf.z || !(range_bounds.contains_atom(holo))) continue
 		ping_count++
 		if(human_user)
-			show_blip(human_user, eye, "queen_eye")
-
-	for(var/mob/hologram/falcon/drone in GLOB.hologram_list)
-		if(drone.z != cur_turf.z || !(range_bounds.contains_atom(drone))) continue
-		ping_count++
-		if(human_user)
-			show_blip(human_user, drone, "queen_eye")
+			show_blip(human_user, holo, "queen_eye")
 
 	if(ping_count > 0)
 		playsound(loc, pick('sound/items/detector_ping_1.ogg', 'sound/items/detector_ping_2.ogg', 'sound/items/detector_ping_3.ogg', 'sound/items/detector_ping_4.ogg'), 60, 0, 7, 2)

diff --git a/code/modules/cm_preds/falcon.dm b/code/modules/cm_preds/falcon.dm
@@ -68,6 +68,7 @@
 	var/obj/item/falcon_drone/parent_drone
 	var/obj/item/clothing/gloves/yautja/owned_bracers
 	desc = "An agile drone used by Yautja to survey the hunting grounds."
+	motion_sensed = TRUE
 
 /mob/hologram/falcon/Initialize(mapload, mob/M, obj/item/falcon_drone/drone, obj/item/clothing/gloves/yautja/bracers)
 	. = ..()

diff --git a/code/modules/cm_tech/hologram.dm b/code/modules/cm_tech/hologram.dm
@@ -1,4 +1,4 @@
-GLOBAL_LIST_EMPTY(hologram_list)
+GLOBAL_LIST_EMPTY_TYPED(hologram_list, /mob/hologram)
 
 /mob/hologram
 	name = "Hologram"
@@ -16,6 +16,8 @@ GLOBAL_LIST_EMPTY(hologram_list)
 
 	var/mob/linked_mob
 	var/datum/action/leave_hologram/leave_button
+	///If can be detected on motion detectors.
+	var/motion_sensed = FALSE
 
 /mob/hologram/movement_delay()
 	. = -2 // Very fast speed, so they can navigate through easily, they can't ever have movement delay whilst as a hologram

diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
@@ -68,6 +68,7 @@
 /mob/hologram/queen
 	name = "Queen Eye"
 	action_icon_state = "queen_exit"
+	motion_sensed = TRUE
 
 	color = "#a800a8"