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

[Hotfix] Add [MRP] tag to the hostname for Salamander. #33904

Closed
wants to merge 1 commit into from

Conversation

JIPDawg
Copy link
Contributor

@JIPDawg JIPDawg commented Dec 17, 2024

About the PR

I changed the Hostname to include the [MRP] tag so users can see at a glance it is using the MRP ruleset.

Why / Balance

Currently the only way to confirm Salamander is the MRP server is by reading the description. Literally EVERY other MRP server has MRP as a tag. I'm requesting this be a hotfix as we routinely get people that EORG or just forget what server they are on / know which server is the MRP server. Don't see any [MRP] tag and just assume. The only other indication is at the VERY END and it's just "RP".

Technical details

It's a web edit, sue me.

Media

Requirements

Breaking changes

Changelog

no cl

@github-actions github-actions bot added S: Needs Review Status: Requires additional reviews before being fully accepted size/XL Denotes a PR that changes 5000+ lines. Branch: Stable Intended to be merged into Stable. Changes: UI Changes: Might require knowledge of UI design or code. Changes: Map Changes: Might require knowledge of mapping. Changes: Sprites Changes: Might require knowledge of spriting or visual design. S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted labels Dec 17, 2024
Copy link
Contributor

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

@github-actions github-actions bot added the S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. label Dec 17, 2024
Copy link
Contributor

github-actions bot commented Dec 17, 2024

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

Resources/Textures/Objects/Decoration/Flora/flora_trees.rsi

State Old New Status
icon Removed

Resources/Textures/Clothing/Head/Hats/beret_warden.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Clothing/Head/Hats/safarihat.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Clothing/Head/Hats/warden.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
icon Added
icon_empty Added

Resources/Textures/Objects/Devices/health_analyzer.rsi

State Old New Status
metaphysical Added

Resources/Textures/Objects/Fun/toys.rsi

State Old New Status
plushielizard-inhand-left Added
plushielizard-inhand-right Added

Resources/Textures/Objects/Materials/Scrap/generator.rsi

State Old New Status
generator_frame Added
nothing Added
old_generator_plasma Added
old_generator_plasma_fuel_leak Added
rad_dripping Added
rad_outline Added
red_x Added
uranium_generator Added
uranium_generator_fuel_tank Added

Resources/Textures/Structures/Specific/Anomalies/Cores/santa_core.rsi

State Old New Status
core Added
pulse Added

Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi

State Old New Status
santa Added

Resources/Textures/Structures/Specific/Anomalies/santa_anom.rsi

State Old New Status
anom Added
pulse Added

Edit: diff updated after 30341e0

@JIPDawg
Copy link
Contributor Author

JIPDawg commented Dec 17, 2024

hmm 280 changes. I don't think this was the right way to PR this. BACK TO MASTER IT GOES. THE MAINTS CAN FIGURE IT OUT :)

@JIPDawg JIPDawg closed this Dec 17, 2024
@JIPDawg JIPDawg reopened this Dec 17, 2024
@JIPDawg JIPDawg changed the base branch from stable to master December 17, 2024 05:08
@JIPDawg JIPDawg added P3: Standard Priority: Default priority for repository items. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. and removed Changes: UI Changes: Might require knowledge of UI design or code. Changes: Map Changes: Might require knowledge of mapping. Changes: Sprites Changes: Might require knowledge of spriting or visual design. S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. Branch: Stable Intended to be merged into Stable. size/XL Denotes a PR that changes 5000+ lines. labels Dec 17, 2024
@JIPDawg JIPDawg added A: Accessibility Area: Accessibility settings and features. T: Of Admin Interest Type: Affects administration work a lot, and might require admins to weigh in on size/XS Denotes a PR that changes 0-9 lines. labels Dec 17, 2024
@slarticodefast
Copy link
Member

I remade the PR to properly target stable #33909

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A: Accessibility Area: Accessibility settings and features. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. P3: Standard Priority: Default priority for repository items. S: Needs Review Status: Requires additional reviews before being fully accepted size/XS Denotes a PR that changes 0-9 lines. T: Of Admin Interest Type: Affects administration work a lot, and might require admins to weigh in on
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants