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.

Sign up for GitHub

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

Fix clock cult armor #11957

Merged
merged 1 commit into from
Feb 10, 2025
Merged

Fix clock cult armor #11957

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/modules/antagonists/clock_cult/items/brass_clothing.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Copy link
Contributor Author

Choose a reason for hiding this comment

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

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.

Copy link
Member

@PowerfulBacon PowerfulBacon Nov 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Dummies exist for mob previews, what exactly goes wrong without the client check?

Copy link
Contributor Author

@Tsar-Salat Tsar-Salat Nov 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Regular crew are being accepted as types of consistent or dummy humans, which makes it early return and not shock them.

Copy link
Member

Choose a reason for hiding this comment

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

That makes no sense, that should never happen

Copy link
Member

Choose a reason for hiding this comment

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

I really don't like this, something is definitely going wrong if this is needed and its hiding some other erronous behaviour

//Fake people need not apply (it fucks up my unit tests)
return
if(is_servant_of_ratvar(user) && allow_any)
if(is_servant_of_ratvar(user) || allow_any)
return
to_chat(user, "<span class='userdanger'>You feel a shock of energy surge through your body!</span>")
user.dropItemToGround(src, TRUE)
Expand Down
Loading