Fix clock cult armor #11957
Merged
Fix clock cult armor #11957
Conversation
This file contains 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
Tsar-Salat
commented
Nov 29, 2024
| @@ -18,10 +18,10 @@ | |||
|
|
|||
| /obj/item/clothing/suit/clockwork/equipped(mob/living/user, slot) | |||
| . = ..() | |||
| if(istype(user, /mob/living/carbon/human/consistent) || istype(user, /mob/living/carbon/human/dummy)) | |||
| if((istype(user, /mob/living/carbon/human/consistent) && !user.client) || (istype(user, /mob/living/carbon/human/dummy) && !user.client)) | |||
There was a problem hiding this comment.
One would expect dummies and consistent to only exist in unit tests, but something is screwing me and I don't know what, so I think this is the clearest option.
There was a problem hiding this comment.
Dummies exist for mob previews, what exactly goes wrong without the client check?
There was a problem hiding this comment.
Regular crew are being accepted as types of consistent or dummy humans, which makes it early return and not shock them.
There was a problem hiding this comment.
That makes no sense, that should never happen
There was a problem hiding this comment.
I really don't like this, something is definitely going wrong if this is needed and its hiding some other erronous behaviour
PowerfulBacon
approved these changes
Feb 10, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 Pull Request
I put in a new check in #11749 that makes it so UI dummies could correctly wear the cult armor without it processing and shocking.
Something fucked up, so I have reinforced the check and the clockcult check is now a OR operator.
closes #11954
Why It's Good For The Game
Testing Photographs and Procedure
Screenshots&Videos
Clockcult can wear
Regular crew cannot
dreamseeker_8VoVoOhcwb.mp4
Changelog
🆑
fix: inverted clockcult armor checks. Cultists can wear armor again, normals cannot
/:cl: