Skip to content

remove nigel plushies#1064

Open
Marikiii wants to merge 4 commits into
ProjectOmu:masterfrom
Marikiii:killingness
Open

remove nigel plushies#1064
Marikiii wants to merge 4 commits into
ProjectOmu:masterfrom
Marikiii:killingness

Conversation

@Marikiii

@Marikiii Marikiii commented Jun 5, 2026

Copy link
Copy Markdown
Contributor

About the PR

Removed them.

Why / Balance

Technical details

deleted yaml

Media

Requirements

Breaking changes

Changelog

🆑 Mariki

  • remove: Removed Nigel plushies

@github-actions github-actions Bot added S: Untriaged Has not been set a status; currently not labeled. Changes: No C# Purely YAML/non-C#. Changes: Sprites Makes changes to sprites/RSIs. Changes: Map labels Jun 5, 2026
@github-actions

github-actions Bot commented Jun 5, 2026

Copy link
Copy Markdown
Contributor

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

Resources/Textures/_Goobstation/Objects/Fun/toys.rsi

State Old New Status
plushie_nigel Removed

@res0nances

Copy link
Copy Markdown
Contributor

who tf

@NotActuallyMarty NotActuallyMarty left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment out the lines in the yaml file rather than deleting them otherwise when merging changes to that file it'll be added back in when upstreaming without merge conflicts

instead of doing

(...)
id: Plushie -> <deleted>
name: Plushiename-> <deleted>
(...)

do:

(...)
# id: Plushie # This is a yaml comment
# name: Plushiename
(...)

No point in deleting the files either if nothing is using it, otherwise same applies as last, it'll get re-added if anything touches those files upstream. discard those changes.

Same with the comments if its already commented out keep as-is otherwise an upstream merge will most likely re-merge it un-commented causing errors.

removing from maps is fine as we're not upstreaming those

add it to migrations.yml replacing with null as: PlushieNigel: null

discard changes on the json for the same reasons

TLDR:

comment out instead of delete for upstream reasons it'll have the same effect. If you want it gone from files for whatever reason make a PR upstream.

@OmuStationBot

Copy link
Copy Markdown
Collaborator

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

@OmuStationBot OmuStationBot added the S: Merge Conflict There is a conflict in merging the files. label Jun 6, 2026
@Marikiii

Marikiii commented Jun 6, 2026

Copy link
Copy Markdown
Contributor Author

SIIIIIIIGHHHHHHHHH

@Marikiii

Marikiii commented Jun 6, 2026

Copy link
Copy Markdown
Contributor Author

Im fixing this tomorrow

@OmuStationBot OmuStationBot removed the S: Merge Conflict There is a conflict in merging the files. label Jun 7, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Changes: Map Changes: No C# Purely YAML/non-C#. Changes: Sprites Makes changes to sprites/RSIs. S: Untriaged Has not been set a status; currently not labeled. size/S

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants