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

Eris goes insane, 2025 #47

Merged
merged 2 commits into from
Sep 9, 2024
Merged

Conversation

Erisfiregamer1
Copy link
Collaborator

@Erisfiregamer1 Erisfiregamer1 commented Sep 9, 2024

About the PR

Some of the admins asked for this

Why / Balance

These changes SUCKED and nobody LOVED them

Technical details

Just a bunch of reverts

Media

Requirements

  • [-] I have read and I am following the Pull Request Guidelines. I understand that not doing so may get my pr closed at maintainer’s discretion
  • [-] I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

lol, lmao

Changelog

🆑

  • add: Reverted some honestly terrible changes. Nuclear core removal and salv shuttle are back.

Copy link

github-actions bot commented Sep 9, 2024

Thank you for contributing to the Space Station 14 repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow our git usage documentation

You can move your current work from the master branch to another branch by doing git branch <branch_name and resetting the master branch.

@github-actions github-actions bot added the Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. label Sep 9, 2024
@github-actions github-actions bot closed this Sep 9, 2024
Copy link

github-actions bot commented Sep 9, 2024

RSI Diff Bot; head commit 9f7ff61 merging into ae1a703
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Misc/nuke_core_container.rsi

State Old New Status
closed Added
core_closed Added
core_open Added
inhand-left Added
inhand-right Added
open Added

Resources/Textures/Objects/Misc/plutonium_core.rsi

State Old New Status
icon Added

Edit: diff updated after 9f7ff61

@Erisfiregamer1 Erisfiregamer1 changed the title Reapply "plutonium core steal objective" (#29578) Eris goes insane, 2025 Sep 9, 2024
@Guloveos Guloveos reopened this Sep 9, 2024
@Guloveos Guloveos merged commit e6a0d89 into The-Arcadis-Team:master Sep 9, 2024
7 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants