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

Planetary Lighting Colors #3419

Merged
merged 27 commits into from
Oct 29, 2024
Merged

Conversation

Erikafox
Copy link
Contributor

About The Pull Request

screencaps

dreamseeker_4Gp6mnCDNE
dreamseeker_ESzoX9zGLQ
dreamseeker_0ew77loMC0
dreamseeker_bZA16gvMeA
dreamseeker_V7WYCRWN4v
dreamseeker_iTCBsMqMuL
dreamseeker_FGH6nwSdCk

Adds some planetary lighting defines and applies them to relevant planets. I had noticed I had an old pr that did this (among other things) so I ripped this out.
Values are entirely subject to change I don't remember where I got them from and I'm not a so called 'colour theorist'

As a coincidence planetary turf files are cleaned up a little by this.

Why It's Good For The Game

A little bit of atmosphere fluff.

Changelog

🆑
add: Some planets now have new lighting values. Please report back on if they are "Pleasant"
/:cl:

Copy link
Contributor

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

@github-actions github-actions bot added Merge Conflict Use Git Hooks, you're welcome. DME Edit Code change Watch something violently break. labels Sep 23, 2024
@Erikafox
Copy link
Contributor Author

guh??

@Erikafox Erikafox marked this pull request as draft September 23, 2024 22:33
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Sep 23, 2024
@Erikafox Erikafox marked this pull request as ready for review September 23, 2024 22:37
@Erikafox Erikafox requested a review from a team as a code owner September 23, 2024 22:50
@github-actions github-actions bot added the Map Change Tile placing is hard. Thank you for your service. label Sep 23, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Sep 29, 2024
Copy link
Contributor

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Sep 29, 2024
Copy link
Member

@FalloutFalcon FalloutFalcon left a comment

Choose a reason for hiding this comment

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

looks very pretty but has some linters to sort out

@FalloutFalcon FalloutFalcon added the Test Merge Required They'll have to do it for free. label Oct 7, 2024
@FalloutFalcon FalloutFalcon removed the Test Merge Required They'll have to do it for free. label Oct 17, 2024
Copy link
Member

@FalloutFalcon FalloutFalcon left a comment

Choose a reason for hiding this comment

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

otherwise looks good

code/game/objects/effects/glowshroom.dm Outdated Show resolved Hide resolved
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Oct 26, 2024
Sun-Soaked
Sun-Soaked previously approved these changes Oct 26, 2024
Copy link
Member

@Sun-Soaked Sun-Soaked left a comment

Choose a reason for hiding this comment

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

code looks fine. I'd ask spriters about doing this, though.

@Sun-Soaked Sun-Soaked dismissed their stale review October 26, 2024 19:45

I want more input from our spritetainers before approving this pr.

Copy link
Contributor

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

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Oct 28, 2024
@Erikafox
Copy link
Contributor Author

fuck it

@Erikafox Erikafox closed this Oct 28, 2024
@Erikafox
Copy link
Contributor Author

ill fix it later.

@Erikafox Erikafox reopened this Oct 28, 2024
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Oct 28, 2024
Copy link
Member

@Sun-Soaked Sun-Soaked left a comment

Choose a reason for hiding this comment

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

we'll give it a try! may end up needing to tweak some of the stronger ones, but for now it's good

@Sun-Soaked Sun-Soaked enabled auto-merge October 28, 2024 18:51
auto-merge was automatically disabled October 29, 2024 20:33

Head branch was pushed to by a user without write access

@Sun-Soaked Sun-Soaked added this pull request to the merge queue Oct 29, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Oct 29, 2024
@Sun-Soaked Sun-Soaked added this pull request to the merge queue Oct 29, 2024
Merged via the queue into shiptest-ss13:master with commit d9c3621 Oct 29, 2024
16 checks passed
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Dec 27, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
<details><summary>screencaps</summary>
<p>


![dreamseeker_4Gp6mnCDNE](https://github.com/user-attachments/assets/3eab1069-e47f-4a09-8c6d-20c26d4d16dd)

![dreamseeker_ESzoX9zGLQ](https://github.com/user-attachments/assets/0ded8c90-a417-40b7-aaeb-22f09b3d0aec)

![dreamseeker_0ew77loMC0](https://github.com/user-attachments/assets/c2da8723-ddd3-4239-bd5a-1086aa8bde75)

![dreamseeker_bZA16gvMeA](https://github.com/user-attachments/assets/6fc1ca33-fffc-4191-a6e5-f6278fb8e5fc)

![dreamseeker_V7WYCRWN4v](https://github.com/user-attachments/assets/7fdd1da3-ad20-437f-9ef8-917c5f6cf6db)

![dreamseeker_iTCBsMqMuL](https://github.com/user-attachments/assets/c07ff65c-65d7-49ad-ad56-212f85105123)

![dreamseeker_FGH6nwSdCk](https://github.com/user-attachments/assets/52fcdcfd-e0cf-4265-a8d5-d04e9e11e00e)

</p>
</details> 

Adds some planetary lighting defines and applies them to relevant
planets. I had noticed I had an old pr that did this (among other
things) so I ripped this out.
Values are entirely subject to change I don't remember where I got them
from and I'm not a so called 'colour theorist'

As a coincidence planetary turf files are cleaned up a little by this.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
A little bit of atmosphere fluff.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: Some planets now have new lighting values. Please report back on if
they are "Pleasant"
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: Erika Fox <[email protected]>
Signed-off-by: FalloutFalcon <[email protected]>
Signed-off-by: Erika Fox <[email protected]>
Co-authored-by: Bjarl <[email protected]>
Co-authored-by: FalloutFalcon <[email protected]>
Co-authored-by: rye-rice <[email protected]>
Co-authored-by: Sun-Soaked <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Map Change Tile placing is hard. Thank you for your service. Ruin Ruin successfully tested. Ship Ship successfully tested.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants