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.

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

Prevent tackle sound from Queen corpses #7225

Merged
merged 8 commits into from
Oct 26, 2024

Conversation

Ibessas
Copy link
Contributor

@Ibessas Ibessas commented Sep 26, 2024

About the pull request

Fixes Issue #7223

Verifying if the queen is dead on check_bloc to prevent playing the sound.
Tested on almayer with dead queen body, dead drone body ade dead crusher body

Explain why it's good for the game

Fixing bug to improve game quality

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.
Test: https://www.youtube.com/watch?v=kn_JU-B11pg

Changelog

🆑
fix: Prevent tackle noises from Queen corpses
/:cl:

@cmss13-ci cmss13-ci bot added Missing Changelog Maintainers always document their changes. Fix Fix one bug, make ten more and removed Missing Changelog Maintainers always document their changes. labels Sep 26, 2024
@private-tristan
Copy link
Contributor

uhh... if another queen evos won't it make the other queen corpse start knocking down again/

@Ibessas
Copy link
Contributor Author

Ibessas commented Sep 28, 2024

uhh... if another queen evos won't it make the other queen corpse start knocking down again/

Looking after it

@ihatethisengine
Copy link
Contributor

ihatethisengine commented Sep 29, 2024

Just check mob's state instead???

queen.stat == DEAD

Or even better unregister the signal from the mob on queen's death

Copy link
Member

@realforest2001 realforest2001 left a comment

Choose a reason for hiding this comment

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

As suggested, this needs to be checking if the queen is dead AND unregistering the signal if she is.
if(is_dead()) UnregisterSignal(src, COMSIG_MOVABLE_PRE_MOVE) return

@@ -443,7 +443,7 @@
/mob/living/carbon/xenomorph/queen/proc/check_block(mob/queen, turf/new_loc)
SIGNAL_HANDLER
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!

@realforest2001 realforest2001 marked this pull request as draft September 30, 2024 09:45
@blackcrystall
Copy link
Contributor

What a problem to unreg signal on proc death?

@harryob
Copy link
Member

harryob commented Oct 26, 2024

by the way, you need to mark your prs as ready to review when you'd like a maintainer to look over and merge

CleanShot 2024-10-26 at 21 21 34@2x

Copy link
Member

@harryob harryob left a comment

Choose a reason for hiding this comment

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

What a problem to unreg signal on proc death?

as mentioned, just put the UnregisterSignal line in /mob/living/carbon/xenomorph/queen/death()

@Ibessas Ibessas marked this pull request as ready for review October 26, 2024 22:20
@Ibessas Ibessas requested a review from harryob October 26, 2024 22:21
@harryob harryob changed the title Verifying if the queen is dead on check_bloc Prevent tackle sound from Queen corpses Oct 26, 2024
@harryob harryob added this pull request to the merge queue Oct 26, 2024
Merged via the queue into cmss13-devs:master with commit 4f6fead Oct 26, 2024
30 checks passed
cmss13-ci bot added a commit that referenced this pull request Oct 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants