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

[MIRROR] Splits up a big file in the nukie antagonist folder #2229

Merged
merged 1 commit into from
Mar 2, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1237
Original PR: tgstation/tgstation#81632

About The Pull Request

This hacks up the nukeop.dm file in the antagonists/nukeop folder.

This was originally for the antag datum, and became a kitchen sink that a lot of disparate stuff got dumped into. Now, the code has been split up into individual folders (based on antag/team datum type) and put into order.

In doing all this, I noticed that the reinforcement datum is unused, and the fix PR for that will probably merge conflict with this (arghghhhh).

Why It's Good For The Game

Sweep sweep tidy code makes my brain feel better.

I was going to add something that needed a new nukie antag datum type and couldn't bring myself to cram it into the already bloated nukeop.dm file, so we must do this first.

Changelog

🆑 Rhials
code: Splits up the nuclear operative antagonist datum folder.
/:cl:

* Splits up a big file in the nukie antagonist folder

* Deletes a file that should have been deleted

---------

Co-authored-by: Rhials <[email protected]>
Co-authored-by: SomeRandomOwl <[email protected]>
@Iajret Iajret merged commit 35c02ba into master Mar 2, 2024
24 checks passed
@Iajret Iajret deleted the upstream-mirror-1237 branch March 2, 2024 19:21
AnywayFarus added a commit that referenced this pull request Mar 2, 2024
Iajret pushed a commit that referenced this pull request Apr 29, 2024
* Adds a funny scene when getting Sisyphus achievement (#82897)

## About The Pull Request


https://github.com/tgstation/tgstation/assets/137328283/979231c3-70cd-49dd-8d4d-2a8554adfbb3

## Why It's Good For The Game

This PR makes getting the “Ordeal of Sisyphus” extremely pointless by
teleporting carried boulder and spessman back to the Lavaland. In my
opinion, this feature is funny and suits the spirit of this achievement.

## Changelog

:cl:
add: Added a short scene when getting an Ordeal of Sisyphus achievement.
/:cl:

* Adds a funny scene when getting Sisyphus achievement

---------

Co-authored-by: Interception&? <[email protected]>
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.

3 participants