Skip to content

Commit

Permalink
fixes holograms triggering ares sensors (#7674)
Browse files Browse the repository at this point in the history
# About the pull request

As title

# Explain why it's good for the game

Holograms that no one can see shouldn't be triggering ares.

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
fix: Hologram mobs no longer trigger ares sensors.
/:cl:
  • Loading branch information
realforest2001 authored Nov 27, 2024
1 parent c83ed7d commit f4236dc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions code/__DEFINES/typecheck/mobs_generic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@
#define isnewplayer(A) (istype(A, /mob/new_player))
#define isHellhound(A) (istype(A, /mob/living/carbon/xenomorph/hellhound))
#define isaghost(A) (copytext(A.key, 1, 2) == "@")

#define ishologram(A) (istype(A, /mob/hologram))
2 changes: 1 addition & 1 deletion code/game/machinery/ARES/ARES_step_triggers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@


/obj/effect/step_trigger/ares_alert/access_control/Crossed(atom/passer as mob|obj)
if(isobserver(passer) || isxeno(passer))
if(isobserver(passer) || isxeno(passer) || ishologram(passer))
return FALSE
if(!passer)
return FALSE
Expand Down

0 comments on commit f4236dc

Please sign in to comment.