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

Fix atom name/desc not copying on appearance set #2145

Merged

Conversation

TobleroneSwordfish
Copy link
Contributor

Fixes #2107 by adding a desc var to appearances and changing atom var access methods to always defer to appearance.
There's a warning on the IconAppearance class that begins "Woe, weary traveler" so hopefully I've done all the steps right to avoid doom or whatever.
Includes a DM test to hopefully prove it works.

@boring-cyborg boring-cyborg bot added Client Involves the OpenDream client Runtime Involves the OpenDream server/runtime labels Dec 18, 2024
OpenDreamRuntime/Objects/DreamObject.cs Outdated Show resolved Hide resolved
OpenDreamRuntime/Objects/Types/DreamObjectAtom.cs Outdated Show resolved Hide resolved
Content.Tests/DMProject/Tests/Image/appearance.dm Outdated Show resolved Hide resolved
OpenDreamRuntime/AtomManager.cs Outdated Show resolved Hide resolved
OpenDreamRuntime/Objects/Types/DreamObjectAtom.cs Outdated Show resolved Hide resolved
OpenDreamRuntime/Objects/Types/DreamObjectAtom.cs Outdated Show resolved Hide resolved
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@TobleroneSwordfish
Copy link
Contributor Author

guh

Copy link

github-actions bot commented Jan 5, 2025

This pull request has conflicts, please resolve those before we can evaluate the pull request.

…/TobleroneSwordfish/appearance_name_desc_copying

# Conflicts:
#	Content.IntegrationTests/DMProject/code.dm
#	OpenDreamClient/Interface/DebugWindows/IconDebugWindow.xaml.cs
#	OpenDreamShared/Network/Messages/MsgAllAppearances.cs
And fix an error in OnIconSizeChanged
@github-actions github-actions bot added size/L and removed size/M labels Jan 23, 2025
@wixoaGit wixoaGit merged commit b8e919d into OpenDreamProject:master Jan 23, 2025
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Client Involves the OpenDream client Runtime Involves the OpenDream server/runtime size/L
Projects
None yet
Development

Successfully merging this pull request may close these issues.

thing.appearance = otherthing.appearance doesn't copy name and desc
3 participants