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] The maintenance crate spawning crate is now a spawner #965

Merged
merged 5 commits into from
Dec 5, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25417
Original PR: tgstation/tgstation#80083

About The Pull Request

/obj/structure/closet/crate/maint was a type of crate that spawned a completely different crate, and then deleted itself. I have decided to swap this out for an actual spawning effect.

I have also did some subtypery to remove some duplicate code that handled randomly opening the spawned closet/crate (through I am not that satisfied with /obj/effect/spawner/random/structure/closet_empty/crate/with_loot as a sensible typepath name, I would like to ask for suggestions). I also removed a loot define, because it was no longer needed as its contents were used on a single page.

Why It's Good For The Game

Things that act like spawners should be spawners.

Maybe this fixes the CI issue on northstar where a mousetrap box gets deleted before it initializes during create and destroy? It was placed above a spawner that spawned one of these self deleting crates. I am unsure, I could not replicate this issue during testing.

Changelog

Nothing player facing.

…GNORE] (#25417)

* The maintenance crate spawning crate is now a spawner (#80083)

`/obj/structure/closet/crate/maint` was a type of crate that spawned a
completely different crate, and then deleted itself. I have decided to
swap this out for an actual spawning effect.

I have also did some subtypery to remove some duplicate code that
handled randomly opening the spawned closet/crate (through I am not that
satisfied with
`/obj/effect/spawner/random/structure/closet_empty/crate/with_loot` as a
sensible typepath name, I would like to ask for suggestions). I also
removed a loot define, because it was no longer needed as its contents
were used on a single page.

Things that act like spawners should be spawners.

Maybe this fixes the CI issue on northstar where a mousetrap box gets
deleted before it initializes during create and destroy? It was placed
above a spawner that spawned one of these self deleting crates. I am
unsure, I could not replicate this issue during testing.

Nothing player facing.

* The maintenance crate spawning crate is now a spawner

* UpdatePaths

* Update Blueshift.dmm

---------

Co-authored-by: Profakos <[email protected]>
Co-authored-by: Giz <[email protected]>
@Steals-The-PRs Steals-The-PRs added Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror labels Dec 4, 2023
@Iajret Iajret merged commit 8902782 into master Dec 5, 2023
22 checks passed
@Iajret Iajret deleted the upstream-mirror-25417 branch December 5, 2023 09:21
Iajret pushed a commit that referenced this pull request Feb 15, 2024
* Fixes Krav Maga allowing pacifism bypasses. (#81447)

## About The Pull Request

Fixes Krav Maga allowing pacifism bypasses.

## Why It's Good For The Game

Bugfixes are good for my GBP count. Also, pacifism bypasses bad.

## Changelog
:cl: CandleJaxx and Iamgoofball
fix: Fixes Krav Maga allowing pacifism bypasses.
/:cl:

* Fixes Krav Maga allowing pacifism bypasses.

---------

Co-authored-by: Iamgoofball <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Map Modification Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants