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

Breaks up hallucination.dm into smaller files #11250

Merged
merged 11 commits into from
Sep 22, 2024

Conversation

Tsar-Salat
Copy link
Contributor

@Tsar-Salat Tsar-Salat commented Jul 29, 2024

About The Pull Request

Sorts hallucination code by type, instead of aggregating it all in one amalgamated file

removes some Sleep() from hallucination code

Nabs a few small fixes

Ports:

Why It's Good For The Game

Unsleeping stuff is good.

This code has basically been untouched and is kinda in a bad place. Gonna be another one of my side projects to get hallucination code updated so we can nab the Memory System from TeeGee.

Testing Photographs and Procedure

Screenshots&Videos
Screen.Recording.2024-07-28.213734.1.mp4

Changelog

🆑 rkz, LemonInTheDark, MrMelbert, Mothblocks, NotRanged, Dennok, TemporalOroboros, Timothymtorres, AnturK
code: removes sleep() from hallucination code
fix: fixes infinite bubblegum hallucination
fix: fixes xenomorph hallucination shitcode
fix: plasmaflood hallucination no longer blocks clicks
/:cl:

@Tsar-Salat Tsar-Salat changed the title Kills sleepers from hallucination code Sorts Hallucination code. Kills sleepers, and fixes a few bugs. Jul 29, 2024
Copy link

github-actions bot commented Sep 8, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

1 similar comment
Copy link

github-actions bot commented Sep 8, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Tsar-Salat
Copy link
Contributor Author

Guessing the name is too scary or something.

@Tsar-Salat Tsar-Salat changed the title Sorts Hallucination code. Kills sleepers, and fixes a few bugs. Breaks up hallucination.dm into smaller files Sep 21, 2024
@PowerfulBacon PowerfulBacon added this pull request to the merge queue Sep 22, 2024
Merged via the queue into BeeStation:master with commit 178b636 Sep 22, 2024
21 checks passed
@Tsar-Salat Tsar-Salat deleted the unsleep-hallucination branch September 22, 2024 19:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants