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

refactor part1 change define in coulours.dm from COULOUR to COLOR #5361

Merged
merged 4 commits into from
Jan 4, 2024

Conversation

Huffie56
Copy link
Contributor

@Huffie56 Huffie56 commented Jan 1, 2024

About the pull request

So the idea is to standartize and remove as much as possible the use of colour.
in this first PR i wanted to start with define using colour in them.

i also stole define in _math.dm because they add a bunch of define that would have been in conflict. and i didn't really understand why some color where define there...

can understand for blood and pipe but why math would need colors defines??

Explain why it's good for the game

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
refactor: for the file coulours.dm and other files change define in it from COULOUR to COLOR
/:cl:

Julien added 2 commits January 1, 2024 19:03
add CL_ in front of all the define in it for short to COLOUR so they don't mess thing up with conflicts
or should i change _math here let's a maintainer decide...
@github-actions github-actions bot added the Refactor Make the code harder to read label Jan 1, 2024
@Huffie56 Huffie56 marked this pull request as ready for review January 1, 2024 19:40
Copy link
Member

@realforest2001 realforest2001 left a comment

Choose a reason for hiding this comment

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

Looks like a majority of these defines aren't used anywhere so are safe to remove. A fair portion are also duplicate results of existing COLOR defines, so you can swap them out entirely.

code/__DEFINES/colours.dm Outdated Show resolved Hide resolved
code/__DEFINES/colours.dm Outdated Show resolved Hide resolved
code/__DEFINES/colours.dm Outdated Show resolved Hide resolved
code/__DEFINES/colours.dm Outdated Show resolved Hide resolved
code/__DEFINES/colours.dm Outdated Show resolved Hide resolved
code/__DEFINES/colours.dm Outdated Show resolved Hide resolved
code/__DEFINES/colours.dm Outdated Show resolved Hide resolved
code/__DEFINES/colours.dm Outdated Show resolved Hide resolved
code/__DEFINES/colours.dm Outdated Show resolved Hide resolved
code/__DEFINES/colours.dm Outdated Show resolved Hide resolved
@realforest2001 realforest2001 marked this pull request as draft January 2, 2024 10:36
@Huffie56
Copy link
Contributor Author

Huffie56 commented Jan 2, 2024

Looks like a majority of these defines aren't used anywhere so are safe to remove. A fair portion are also duplicate results of existing COLOR defines, so you can swap them out entirely.

so i can safely move every color define into colours.dm file?
i think it doesn't matter where define are made but i am not sure.... (didn't wanted to cause any issues...)

Julien added 2 commits January 2, 2024 15:25
remove the CL_ stupid thing
integretated _math.dm colors define
deleted duplicates define...
lIGHT COLOR WHITE WAS JUST WHITE... duplicate for no reason...
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@Huffie56 Huffie56 marked this pull request as ready for review January 2, 2024 14:52
Copy link
Contributor

@Birdtalon Birdtalon left a comment

Choose a reason for hiding this comment

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

Fine.

@Birdtalon Birdtalon added this pull request to the merge queue Jan 4, 2024
Merged via the queue into cmss13-devs:master with commit 723e9bd Jan 4, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Jan 4, 2024
@Huffie56 Huffie56 deleted the colourtocolor branch January 4, 2024 14:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Refactor Make the code harder to read
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants