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] Adds an admin button to send nuke ops reinforcements #723

Merged
merged 1 commit into from
Nov 20, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25124
Original PR: tgstation/tgstation#79695

About The Pull Request

Often times I want to send a second wave of nukies if the first wave completely flukes, but sending reinforcements is hard (I don't want to trigger a whole new nuke team, the Infiltrator is deployed to NT space, etc).

So I add a button to check-antagonists that allow admins to one-click send more nuke ops.

image

I also took the opportunity to polish up the other admin button, particularly giving a reminder if it's being forced under the pop limit.

Changelog

🆑 Melbert
admin: Adds a button to check-antagonists that allows admins to send Nuke Op reinforcements with a single button
admin: Nuke Ops check antagonists now show you full war status (declared / not declared)
fix: Fixes multiple nuke teams (or an admin) being able to declare war at once
/:cl:

…NORE] (#25124)

* Adds an admin button to send nuke ops reinforcements (#79695)

## About The Pull Request

Often times I want to send a second wave of nukies if the first wave
completely flukes, but sending reinforcements is hard (I don't want to
trigger a whole new nuke team, the Infiltrator is deployed to NT space,
etc).

So I add a button to check-antagonists that allow admins to one-click
send more nuke ops.

![image](https://github.com/tgstation/tgstation/assets/51863163/a36484b7-9d8b-4741-a09d-e9c4f8303c52)

I also took the opportunity to polish up the other admin button,
particularly giving a reminder if it's being forced under the pop limit.

## Changelog

:cl: Melbert
admin: Adds a button to check-antagonists that allows admins to send
Nuke Op reinforcements with a single button
admin: Nuke Ops check antagonists now show you full war status (declared
/ not declared)
fix: Fixes multiple nuke teams (or an admin) being able to declare war
at once
/:cl:

* Adds an admin button to send nuke ops reinforcements

---------

Co-authored-by: MrMelbert <[email protected]>
@Iajret Iajret merged commit 5bf3377 into master Nov 20, 2023
24 checks passed
@Iajret Iajret deleted the upstream-mirror-25124 branch November 20, 2023 13:07
AnywayFarus added a commit that referenced this pull request Nov 20, 2023
Iajret pushed a commit that referenced this pull request Feb 1, 2024
* Fix teleportation putting you outside of reservations  (#81203)

## About The Pull Request

Blocks teleportation if someone is about to be transported into a
reservation not intended for them.
Fixes #45529 

## Why It's Good For The Game

Prevents people from GBJing themselves in the reservation level or
getting into a reservation they're not allowed to enter.
## Changelog
:cl:
fix: Teleportations will no longer exceed reservation bounds.
/:cl:

* Fix teleportation putting you outside of reservations

---------

Co-authored-by: distributivgesetz <[email protected]>
ReezeBL pushed a commit that referenced this pull request Feb 6, 2024
…#1786)

* Fix teleportation putting you outside of reservations  (#81203)

## About The Pull Request

Blocks teleportation if someone is about to be transported into a
reservation not intended for them.
Fixes #45529 

## Why It's Good For The Game

Prevents people from GBJing themselves in the reservation level or
getting into a reservation they're not allowed to enter.
## Changelog
:cl:
fix: Teleportations will no longer exceed reservation bounds.
/:cl:

* Fix teleportation putting you outside of reservations

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: distributivgesetz <[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