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] Patches & renaming for NO_DECONSTRUCTION flag #2897

Merged
merged 3 commits into from
Apr 16, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1917
Original PR: tgstation/tgstation#82547

About The Pull Request

  1. Renames NO_DECONSTRUCTION -> NO_DEBRIS_AFTER_DECONSTRUCTION. As the name suggests when the object is deconstructed it won't drop any items/debris. After my last refactor for this flag it now serves a new purpose so its name has been changed to match that

  2. Fixes objects that are now using NO_DECONSTRUCTION incorrectly. Some of these changes include

    • Removing the flag in objects where there are no means to deconstruct them (e.g. jukebox, hydroponics soil, flora etc)
    • Replacing the flags old purpose by overriding its tool procs so that it regains its old behaviour(e.g. You once again cannot deconstruct ctf reinforced tables, survival pods, indestructible windows etc)

Changelog

🆑 SyncIt21
code: renamed NO_DECONSTRUCTION to NO_DEBRIS_AFTER_DECONSTRUCTION so its name matches its intended purpose
fix: fixes some items that incorrectly used NO_DECONSTRUCTION prior to its refactor, meaning makes some objects non deconstructable again
/:cl:

)

* [NO GBP] Patches & renaming for `NO_DECONSTRUCTION` flag (#82547)

## About The Pull Request

1. Renames `NO_DECONSTRUCTION` -> `NO_DEBRIS_AFTER_DECONSTRUCTION`. As
the name suggests when the object is deconstructed it won't drop any
items/debris. After my last refactor for this flag it now serves a new
purpose so its name has been changed to match that

2. Fixes objects that are now using `NO_DECONSTRUCTION` incorrectly.
Some of these changes include
- Removing the flag in objects where there are no means to deconstruct
them (e.g. jukebox, hydroponics soil, flora etc)
- Replacing the flags old purpose by overriding its tool procs so that
it regains its old behaviour(e.g. You once again cannot deconstruct ctf
reinforced tables, survival pods, indestructible windows etc)

## Changelog
:cl:
code: renamed `NO_DECONSTRUCTION` to `NO_DEBRIS_AFTER_DECONSTRUCTION` so
its name matches its intended purpose
fix: fixes some items that incorrectly used `NO_DECONSTRUCTION` prior to
its refactor, meaning makes some objects non deconstructable again
/:cl:

* [NO GBP] Patches & renaming for `NO_DECONSTRUCTION` flag

* Update colony_fabricator.dm

* renames, this probally needs testing

* just a test

* Revert "renames, this probally needs testing"

This reverts commit 8f3490c95e03869079260824789a73bc0de06481.

* Revert "[MODULAR] Adds an entirely new map to Nova's roster: Ouroboros! (#773)"

This reverts commit 56a100f88677bfb3af7814549b8e4fbf5a0faeb4.

* Fixes most of our items hopefully to work with the new lack of flag

* Reapply "[MODULAR] Adds an entirely new map to Nova's roster: Ouroboros! (#773)"

This reverts commit 2b063ae4c5680c7d3eef90615dbc28d59d2cdf15.

* Additional missed things/fixing mistakes

* But wait there's more

* Update lavaland_surface_prefab_homestead.dmm

---------

Co-authored-by: SyncIt21 <[email protected]>
Co-authored-by: SomeRandomOwl <[email protected]>
Co-authored-by: Mal <[email protected]>
@Iajret Iajret merged commit a2d7ca1 into master Apr 16, 2024
24 of 25 checks passed
AnywayFarus added a commit that referenced this pull request Apr 16, 2024
@Iajret Iajret deleted the upstream-mirror-1917 branch April 16, 2024 13:16
Iajret pushed a commit that referenced this pull request Jun 8, 2024
…lacklisted map framework to modifiers [MDB IGNORE] (#2897)

* Adds a random martial arts modifier to deathmatch + Adds a blacklisted map framework to modifiers (#83465)

## About The Pull Request

Title.

Uses pickweight, to ensure rare martial arts stay rare. 

Common:

* Carp
* CQC

Uncommon:
* EVIL boxing

LEGENDARY:
* Wrestling
* UNNERFED PLASMA FIST
* Psychotic brawling (bath salts, rare because its a meme)

Does not work on meat tower.
## Why It's Good For The Game

Variety is good! Also, theres only one way to get martial arts in DM and
thats meat tower. There is ALSO very little way to get evil boxing,
mushpunch, plasmafist, etc. This allows people to go absolutely nuts in
death match, and I think thats a good thing.
## Changelog
:cl:
add: New deathmatch modifier: "Random martial arts"
/:cl:

* Adds a random martial arts modifier to deathmatch + Adds a blacklisted map framework to modifiers

---------

Co-authored-by: nikothedude <[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.

4 participants