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] Brings the captain's safe off the wall, safes now save their contents #2475

Merged
merged 1 commit into from
Mar 20, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1487
Original PR: tgstation/tgstation#81762

About The Pull Request

I originally was gonna make the captain's spare ID safe float in the air if the wall under it was taken down, but it looked poor and was going against the vision for wall items (and go against the wallening) so my alternative proposition is this, taking the safe off the wall.
It's now a golden safe (like the one in the vault) but is interacted the exact same, it's now just a thing on the floor rather than being on a wall.
I'm not a spriter so I didn't give it a custom icon but if anyone wants to they can feel free to add one, just a golden version of the regular safe felt kinda eh.

I also added a wallframe version of the secure safe for when it is taken down. It will conserve its contents and be permanently locked until put back up. This doesn't apply to the new captain safe since it isn't a wall item.

Why It's Good For The Game

Closes tgstation/tgstation#80588
Prevents people from cheesing the spare and/or it being too easy to destroy.

Changelog

🆑 JohnFulpWillard
fix: The captain's safe is no longer on the wall, therefore cannot be cheesed by breaking the wall it sits on.
fix: Tearing down a wall that a safe is on now drops the safe with its contents, rather than dropping the contents onto the floor. The safe's contents cannot be interacted with while it's not on a wall.
/:cl:

… contents (#1487)

* Brings the captain's safe off the wall, safes now save their contents (#81762)

## About The Pull Request

I originally was gonna make the captain's spare ID safe float in the air
if the wall under it was taken down, but it looked poor and was going
against the vision for wall items (and go against the wallening) so my
alternative proposition is this, taking the safe off the wall.
It's now a golden safe (like the one in the vault) but is interacted the
exact same, it's now just a thing on the floor rather than being on a
wall.
I'm not a spriter so I didn't give it a custom icon but if anyone wants
to they can feel free to add one, just a golden version of the regular
safe felt kinda eh.

I also added a wallframe version of the secure safe for when it is taken
down. It will conserve its contents and be permanently locked until put
back up. This doesn't apply to the new captain safe since it isn't a
wall item.

## Why It's Good For The Game

Closes tgstation/tgstation#80588
Prevents people from cheesing the spare and/or it being too easy to
destroy.

## Changelog

:cl:
fix: The captain's safe is no longer on the wall, therefore cannot be
cheesed by breaking the wall it sits on.
fix: Tearing down a wall that a safe is on now drops the safe with its
contents, rather than dropping the contents onto the floor. The safe's
contents cannot be interacted with while it's not on a wall.
/:cl:

* Brings the captain's safe off the wall, safes now save their contents

* Void and Blueshift

---------

Co-authored-by: John Willard <[email protected]>
Co-authored-by: SomeRandomOwl <[email protected]>
@ReezeBL ReezeBL merged commit 23d21e5 into master Mar 20, 2024
24 checks passed
@ReezeBL ReezeBL deleted the upstream-mirror-1487 branch March 20, 2024 07:25
AnywayFarus added a commit that referenced this pull request Mar 20, 2024
Iajret pushed a commit that referenced this pull request May 15, 2024
* Blood Brothers admin tooling (#83130)

## About The Pull Request


![image](https://github.com/tgstation/tgstation/assets/7483112/99cedf4f-843c-4813-aa79-917a06cc8164)

Makes it easier to see how many more people a Blood Brother can convert
Also makes it easier to increment/decrement the number of people they
can convert (for instance if they convert someone who immediately goes
AFK, you can refund it).

## Why It's Good For The Game

Admins were finding it kind of hard to figure out how to do this

## Changelog

:cl:
admin: Admins can now more easily modify whether a Blood Brother can
convert someone
/:cl:

* Blood Brothers admin tooling

---------

Co-authored-by: Jacquerel <[email protected]>
Co-authored-by: NovaBot13 <[email protected]>
ReezeBL pushed a commit that referenced this pull request May 16, 2024
* Blood Brothers admin tooling (#83130)

## About The Pull Request


![image](https://github.com/tgstation/tgstation/assets/7483112/99cedf4f-843c-4813-aa79-917a06cc8164)

Makes it easier to see how many more people a Blood Brother can convert
Also makes it easier to increment/decrement the number of people they
can convert (for instance if they convert someone who immediately goes
AFK, you can refund it).

## Why It's Good For The Game

Admins were finding it kind of hard to figure out how to do this

## Changelog

:cl:
admin: Admins can now more easily modify whether a Blood Brother can
convert someone
/:cl:

* Blood Brothers admin tooling

---------

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

deconstructing the wall the spare id safe is on drops the spare
3 participants