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] Lockers and crates shake when someone is trying to break out of them #2277

Merged
merged 1 commit into from
Mar 6, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1294
Original PR: tgstation/tgstation#81801

About The Pull Request

Makes lockers and crates do a little shake when someone is trying to resist out of them.

lockerShakeDemo3.mp4

Why It's Good For The Game

A little bit of visual flair, lets players know if someone is trying to get out of a locker.

Changelog

🆑 Seven
add: Lockers and crates now shake when someone is attempting to resist out of them.
/:cl:

… of them (#1294)

* Lockers and crates shake when someone is trying to break out of them (#81801)

## About The Pull Request

Makes lockers and crates do a little shake when someone is trying to
resist out of them.


https://github.com/tgstation/tgstation/assets/40921881/94703c79-a22c-43e6-ac31-8621173a0953


## Why It's Good For The Game

A little bit of visual flair, lets players know if someone is trying to
get out of a locker.

## Changelog

:cl: Seven
add: Lockers and crates now shake when someone is attempting to resist
out of them.
/:cl:

---------

Co-authored-by: san7890 <[email protected]>

* Lockers and crates shake when someone is trying to break out of them

---------

Co-authored-by: Lufferly <[email protected]>
Co-authored-by: san7890 <[email protected]>
@Iajret Iajret merged commit e7b617e into master Mar 6, 2024
24 checks passed
@Iajret Iajret deleted the upstream-mirror-1294 branch March 6, 2024 18:40
AnywayFarus added a commit that referenced this pull request Mar 6, 2024
Iajret pushed a commit that referenced this pull request May 2, 2024
* Vote clean up and admin additions (#82981)

## About The Pull Request

- Fixes `vote_delay` not being a thing. I broke this two years ago but
there's no bug report associated.

- Admins can now reset the vote delay (to let people vote again
instantly)

- Admins can now end the current vote immediately (rather than
cancelling)

- Custom multi and custom single combined into one vote

## Why It's Good For The Game

Makes voting a bit easier to use, both for admins and for coders adding
new votes.


![image](https://github.com/tgstation/tgstation/assets/51863163/40b8857c-76b7-4a58-82bc-1b82640d550a)

## Changelog

:cl: Melbert
admin: Custom Single and Custom Multi votes are now combined into one
vote
admin: Admins can now end votes instantly, rather than cancelling them
admin: Admins can now reset the vote cooldown
fix: Vote cooldown actually applies now
/:cl:

* Vote clean up and admin additions

---------

Co-authored-by: MrMelbert <[email protected]>
ReezeBL pushed a commit that referenced this pull request May 3, 2024
* Vote clean up and admin additions (#82981)

## About The Pull Request

- Fixes `vote_delay` not being a thing. I broke this two years ago but
there's no bug report associated.

- Admins can now reset the vote delay (to let people vote again
instantly)

- Admins can now end the current vote immediately (rather than
cancelling)

- Custom multi and custom single combined into one vote

## Why It's Good For The Game

Makes voting a bit easier to use, both for admins and for coders adding
new votes.


![image](https://github.com/tgstation/tgstation/assets/51863163/40b8857c-76b7-4a58-82bc-1b82640d550a)

## Changelog

:cl: Melbert
admin: Custom Single and Custom Multi votes are now combined into one
vote
admin: Admins can now end votes instantly, rather than cancelling them
admin: Admins can now reset the vote cooldown
fix: Vote cooldown actually applies now
/:cl:

* Vote clean up and admin additions

---------

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