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] Gulag Teleporter Will Now Always Properly Strip Inventory #2965

Closed
wants to merge 2 commits into from

Conversation

NaakaKo
Copy link
Collaborator

@NaakaKo NaakaKo commented Mar 18, 2024

Original PR: https://api.github.com/repos/tgstation/tgstation/pulls/82045

About The Pull Request

Fixes #81931

I believe what was happening (as mentioned in the issue report) is that occupant would become temporarily null as the "stripping" proc would run during the escape (and the server might have yielded a few ticks during those move cycles)- so let's rectify this by decreasing the dependence on that variable by passing in the argument of our prisoner to that same proc to ensure that if we teleport, they are definitely stripped without having to deal with null weirdness.

I also cleaned up the code as well as another bug where if the reclaimer was broken, we would forceMove stuff into the machine itself, rather than the turf of the machine. that feels really weird so I just patched that up (makes the code look a lot better too since we can cram it in the "handcuffs" case).

Why It's Good For The Game

Prisoners shouldn't have their gear if they get into the gulag. I know it's a bit weird because it might be a skill issue on the security officer's behalf should they keep the door unlocked but it's even stranger for it to just not work the way it was intended.

Changelog

🆑
fix: Prisoners who are teleported to the Nanotrasen Work Camp should now always be stripped of their gear to prevent escapes.
/:cl:

san7890 and others added 2 commits March 18, 2024 20:55
## About The Pull Request

Fixes #81931

I believe what was happening (as mentioned in the issue report) is that
`occupant` would become temporarily null as the "stripping" proc would
run during the escape (and the server might have yielded a few ticks
during those move cycles)- so let's rectify this by decreasing the
dependence on that variable by passing in the argument of our prisoner
to that same proc to ensure that if we teleport, they are definitely
stripped without having to deal with null weirdness.

I also cleaned up the code as well as another bug where if the reclaimer
was broken, we would forceMove stuff _into the machine itself_, rather
than the turf of the machine. that feels really weird so I just patched
that up (makes the code look a lot better too since we can cram it in
the "handcuffs" case).
## Why It's Good For The Game

Prisoners shouldn't have their gear if they get into the gulag. I know
it's a bit weird because it might be a skill issue on the security
officer's behalf should they keep the door unlocked but it's even
stranger for it to just not work the way it was intended.
## Changelog
:cl:
fix: Prisoners who are teleported to the Nanotrasen Work Camp should now
always be stripped of their gear to prevent escapes.
/:cl:
@NaakaKo NaakaKo added the Upstream PR Merged Used by the mirror bot. label Mar 18, 2024
@CliffracerX CliffracerX closed this Aug 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Upstream PR Merged Used by the mirror bot.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants