Block jesters from killing people#1268
Merged
EmoGarbage404 merged 5 commits intoEphemeralSpace:masterfrom Feb 28, 2026
Merged
Conversation
Contributor
|
You foool |
EmoGarbage404
commented
Feb 24, 2026
Contributor
Author
EmoGarbage404
left a comment
EmoGarbage404
left a comment
There was a problem hiding this comment.
review for myself: add a proper message when you get Dudded
moonheart08
requested changes
Feb 25, 2026
Content.Server/_ES/Masks/Jester/Components/ESChangeMaskOnKillObjectiveComponent.cs
Outdated
Show resolved
Hide resolved
|
|
||
| public readonly EntityUid Killer = killer; | ||
|
|
||
| public bool ValidKill => !Suicide; |
Contributor
There was a problem hiding this comment.
Feels subjective enough it shouldn't be here OR should be a method on a system somewhere so it can become more subjective later.
Contributor
Author
There was a problem hiding this comment.
I think that there should probably be a shared interface between the kill report events and then the system can have a method that evaluates them. Rn it's kinda just lazily duped between the two events which is Whatever but obviously not ideal.
…bjectiveComponent.cs Co-authored-by: Moony <moony@hellomouse.net>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
About the PR
adds some new stuff to jesters. Now, when a jester kills someone, they lose their mask and become The Fool. The fool is just an unaligned jester mask that has an uncompletable objective so they always register as losing.
Closes #1250
Media