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

Revert "Removes DragonSpawn event" #1329

Merged
merged 2 commits into from
Jun 12, 2024

Conversation

Lyndomen
Copy link
Contributor

@Lyndomen Lyndomen commented Jun 8, 2024

About the PR

Reverts #1298

Once we merge upstream this should be reverted, as Wiz merged the fix here:
space-wizards/space-station-14#28709

Thanks to Mnemotechnician, who originally submitted the fix. #1308

Why / Balance

Dragons are cool when not bugged out.

Technical details

Reverting a commenting out. Should be fine.

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Nope

Changelog
🆑

  • tweak: Space Dragons are once again roaming free

@github-actions github-actions bot added the Changes: YML Changes any yml files label Jun 8, 2024
@NullWanderer NullWanderer added S: Do Not Merge Don't merge this yet Priority: 4-Low Should be resolved at some point S: Requires This requires something else to be done before resolved labels Jun 8, 2024
@NullWanderer NullWanderer merged commit 47337d2 into DeltaV-Station:master Jun 12, 2024
11 checks passed
@Lyndomen Lyndomen deleted the revert-1298-vorenomore branch June 13, 2024 19:06
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
…22) (DeltaV-Station#1329)

Cherry picks "Fix station events schedulers, antag selection and
possibly other systems acting weird in a rare scenario."
# Description

This is being PRed mostly as a fix to an issue which caused the round to
fail to start due to an error in antag selection, which did happen in
Thief antags and may also happen with Bloodcult gamemode.

Double posting from discord:
> It fixed issues caused with antag selection at roundstart which
affected roundstart Thief selection.
> 
> Since cultists are also selected exactly at roundstart - unlike
traitors for instance, I think this might help with cultists too.
> 
> I tried to force start bloodcult gamemode in the past and it failed to
start but I since I had tracebacks disabled trying to improve
performance I'm not sure this was the cause.
> 

Credits to April for pointing this out for me after I commented on the
issue.

----

This cherry picks 79ff990 removing
changes which change methods which do not exist yet on our side.

<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

Co-authored-by: faint <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: YML Changes any yml files Priority: 4-Low Should be resolved at some point S: Do Not Merge Don't merge this yet S: Requires This requires something else to be done before resolved
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants