Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prevent tackle sound from Queen corpses #7225

Merged
merged 8 commits into from
Oct 26, 2024
Merged

Prevent tackle sound from Queen corpses #7225

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7082342
Verifying if the queen is dead on check_bloc
Ibessas Sep 26, 2024
24e335c
Merge branch 'master' into fix-tackle-dead-queen
Ibessas Sep 27, 2024
226fb1b
unregister check on death
Ibessas Sep 30, 2024
2da0465
Merge branch 'fix-tackle-dead-queen' of https://github.com/Ibessas/cm…
Ibessas Sep 30, 2024
1a6b2ae
Change request
Ibessas Oct 26, 2024
c140603
Removing empty space
Ibessas Oct 26, 2024
22bf1b5
Merge branch 'master' into fix-tackle-dead-queen
Ibessas Oct 26, 2024
4f28385
Change request
Ibessas Oct 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@
/mob/living/carbon/xenomorph/queen/proc/check_block(mob/queen, turf/new_loc)
SIGNAL_HANDLER
realforest2001 marked this conversation as resolved.
Show resolved Hide resolved
for(var/mob/living/carbon/xenomorph/xeno in new_loc.contents)
if(xeno.hivenumber == hivenumber)
if(xeno.hivenumber == hivenumber && hive.living_xeno_queen)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if(xeno.hivenumber == hivenumber && hive.living_xeno_queen)
if(xeno.hivenumber == hivenumber)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, thanks for the suggestion!

xeno.KnockDown((5 DECISECONDS) / GLOBAL_STATUS_MULTIPLIER)
playsound(src, 'sound/weapons/alien_knockdown.ogg', 25, 1)

Expand Down
Loading