Skip to content

Commit

Permalink
FIxes Hunting Grounds Escape (#7864)
Browse files Browse the repository at this point in the history
# About the pull request
Makes the escape from the hunting grounds actually work properly instead
of any item working on the scanner

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
Fixes my shit code 
# 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: Joe Lampost
fix: Fixes the escape from the hunting grounds
/:cl:

---------

Co-authored-by: kiVts <[email protected]>
  • Loading branch information
Joelampost and kiVts authored Dec 28, 2024
1 parent d005595 commit c0909f1
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions code/modules/cm_preds/yaut_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -628,20 +628,21 @@
escaped = FALSE

/obj/structure/machinery/hunt_ground_escape/attackby(obj/item/attacking_item, mob/user)
. = ..()
var/obj/item/clothing/mask/gas/yautja/hunter/mask = attacking_item
if(escaped)
to_chat(user, SPAN_NOTICE("The shutter is already open."))
return

if(mask.loc != user)
to_chat(user, SPAN_WARNING("You cannot scan [mask] without holding it."))
if(attacking_item.loc != user)
to_chat(user, SPAN_WARNING("You cannot scan [attacking_item] without holding it."))
return

if(user.action_busy)
return

to_chat(user, SPAN_DANGER("You hold the [mask] up to the console and it begins to scan..."))
if(!istype(attacking_item, /obj/item/clothing/mask/gas/yautja/hunter))
to_chat(user, SPAN_DANGER("The console refuses [attacking_item]."))
return
to_chat(user, SPAN_DANGER("You hold [attacking_item] up to the console, and it begins to scan..."))
message_all_yautja("Prey is trying to escape the hunting grounds.")

if(!do_after(user, 15 SECONDS, INTERRUPT_ALL, BUSY_ICON_GENERIC))
Expand Down

0 comments on commit c0909f1

Please sign in to comment.