-
Notifications
You must be signed in to change notification settings - Fork 565
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
Conversation
uhh... if another queen evos won't it make the other queen corpse start knocking down again/ |
Looking after it |
Just check mob's state instead??? queen.stat == DEAD Or even better unregister the signal from the mob on queen's death |
There was a problem hiding this 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) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if(xeno.hivenumber == hivenumber && hive.living_xeno_queen) | |
if(xeno.hivenumber == hivenumber) |
There was a problem hiding this comment.
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!
…ss13 into fix-tackle-dead-queen
What a problem to unreg signal on proc death? |
There was a problem hiding this 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()
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: