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

Gamma alert ≠ Gamma armoury #15678

Merged
merged 5 commits into from Jul 26, 2021

Conversation

S34NW
Copy link
Member

@S34NW S34NW commented Mar 6, 2021

What Does This PR Do

This PR Decouples the gamma armoury shuttle from the alert level. Meaning admins can call the shuttle without gamma alert, and the shuttle does not get called automatically with the alert.

Why It's Good For The Game

This is implementing feedback from this forum thread
This gives admins more flexibility in their tools, sometimes they may feel like gamma alert is warranted but do not call it due to the shuttle giving the crew a helping hand. It also allows the deployment of the gamma shuttle later if needed, at the admin's discretion.

Images of changes

New button in the admin secrets tab for moving the shuttle:
2021-03-06 11_48_10-Window

Updated gamma alert text to remove references to the shuttle:
2021-03-06 11_56_52-Window2

Adds a new report for the shuttle being called/recalled:
2021-03-06 11_56_52-Window

Changelog

🆑
tweak: Gamma armory now operates independently of gamma alert
/:cl:

Copy link
Contributor

@Kyep Kyep left a comment

Choose a reason for hiding this comment

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

I'll approve this.

@AffectedArc07 AffectedArc07 added the Tweak This PR tweaks something ingame label Mar 6, 2021
code/modules/admin/admin.dm Outdated Show resolved Hide resolved
code/modules/admin/admin.dm Outdated Show resolved Hide resolved
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Copy link
Member

@farie82 farie82 left a comment

Choose a reason for hiding this comment

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

Some minor things

code/modules/admin/admin.dm Outdated Show resolved Hide resolved
code/modules/admin/admin.dm Outdated Show resolved Hide resolved
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Copy link
Contributor

@variableundefined variableundefined left a comment

Choose a reason for hiding this comment

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

I don't see an issue with this. We might have a GA or two get a bit confused but that should be over quick.

@variableundefined variableundefined merged commit f9d6300 into ParadiseSS13:master Jul 26, 2021
@S34NW S34NW deleted the gammadoesnotgrantguns branch August 6, 2021 14:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Tweak This PR tweaks something ingame
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants