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

/tg/ Status Effects Prelude A - Updated Trait Backend #4869

Merged
merged 3 commits into from
Nov 8, 2023

Conversation

fira
Copy link
Member

@fira fira commented Nov 7, 2023

About the pull request

Content from #4828 broken down in an individual PR

This does only a few things:

  • Adds /tg/ ASSERT which includes reasons
  • Updates the Traits backend from /tg/
  • Refactors cloak cancellation with signals because it used REMOVE_TRAIT_ALLSOURCES which is both bad and defunct

Testing Photographs and Procedure

Tested trait backend as part of main PR

@fira fira added the Code Improvement Make the code longer label Nov 7, 2023
@@ -29,20 +29,6 @@
if(!C.handcuffed)
place_handcuffs(C, user)

/obj/item/handcuffs/obj/structure/MouseDrop(mob/living/carbon/human/H)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cursed

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is, that's why i'm getting rid of it on the spot

code/modules/mob/mob.dm Outdated Show resolved Hide resolved
code/modules/mob/mob.dm Outdated Show resolved Hide resolved
code/modules/mob/mob.dm Outdated Show resolved Hide resolved
code/modules/mob/mob.dm Outdated Show resolved Hide resolved
@fira fira requested a review from Zonespace27 November 8, 2023 15:39
@Zonespace27 Zonespace27 added this pull request to the merge queue Nov 8, 2023
Merged via the queue into cmss13-devs:master with commit fa2c2b7 Nov 8, 2023
26 checks passed
github-merge-queue bot pushed a commit that referenced this pull request Nov 13, 2023
# About the pull request

AKA "Why are my leadership action buttons missing?"

I was a bit too confident in #4869 copying over /tg/ backend and didn't
question that Segrain's awesome CM-brewed traitbound elements bits were
missing from their code. Oops.

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
Restores functionality for eg. silenced guns and leadership action
buttons

# Testing Photographs and Procedure
Tested the actions are back


# Changelog
:cl:
fix: Fixed an issue in traits backend update causing among others
leadership action buttons to be missing.
/:cl:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Improvement Make the code longer
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants