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

Big Fat Emission PR #18124

Merged
merged 28 commits into from
Jul 23, 2022
Merged

Big Fat Emission PR #18124

merged 28 commits into from
Jul 23, 2022

Conversation

kugamo
Copy link
Contributor

@kugamo kugamo commented Jun 28, 2022

What Does This PR Do

This PR adds emission effects to a plethora of objects in the game.

  • Light tubes, and light bulbs. They were being shaded like the rest of the objects in the game and as a result, looked especially weird in low light conditions. I added states for normal and nightshift lighting settings, so they look appropriately luminescent according to their setting.
  • Airlocks. This was tedious. All airlocks' closed/closing/opening/locked/deny/sparking states are now emissive. I believe it looks really good in maint and low light, now their buttons glow! Really adds to the visual flair of the game.
  • Fire alarms. They were emissive when alarming, but I also added it for their default state. I also altered the light bar that shows the alert level for delta/epsilon (before they shared sprites with gamma [red/yellow] ) making delta [white/yellow] and epsilon full white. Also changed how the fire-alarm-effect works on lights, now they go into emergency mode. (looks alot better, otherwise the emissive effects layered weirdly on the red-toned lights.)
  • Air alarms. Now the small square is emissive, for all alert levels.
  • Intercoms.
  • Newscasters. Also fixed the wanted icon alert overlay that was in the icon folder but not implamented for some reason.
  • Entertainment Screens.
  • AI displays. Also refactored their code a bit, putting everything in update_icon() (it was messy, sorry for bloat)
  • Status displays.
  • Request Consoles.
  • ATMs.
  • Light switches.
  • APCs.
  • Holoprojectors.
  • Mounted Flashes.
  • Teleporter hub and station.
  • Rechargers. Wall mounted and the desktop one.
  • Bar sign.
  • Mr chang's and Barber signs.
  • Morgue trays.
  • Disposal Bins.
  • Keycard Authenticators
  • Nuclear Bomb
  • Dance Machine
  • Crematorium

SPECIAL NOTE: I had to add light sources to all these devices while their emissive effects are displaying so that byond didnt cull them from the clients screen when the atoms are in complete darkness. The light is so weak it doesnt illuminate anything, and only serves this purpose. THESE LIGHT SOURCES DO DISPLAY THE TURF AND 4 SURROUNDING TURFS TO THE RIGHT CLICK MENU, so there are balance concerns with the PR as is. I will attempt to find a solution to this in the following days

graph

Aseprite_XxJ1SEZcHz

This is the result of the testmerge. I had concerns about performance, but after viewing this graph I judge its impact is minimal. (not enough for me to significantly rework or close the PR at least) I'd direct inquiry about it at AA, but god knows he has enough on his plate already.

Why It's Good For The Game

Alot of stuff's icons had lights and bobbles that look like they should be illuminated but got shaded into darkness with everything else (even light sources like bulbs and tubes to some degree). You should be able to see everything like this in a room in complete darkness, due to how our lighting works they would get completely darkened or disappeared completely. Now you can see them, and it looks great! Green is during TM, pink round before.

Images of changes

Gifs and videos probably aren't the best way to experience the benefits of this PR, I encourage reviewers to download the branch and playtest it. Kind of an ask, but I think its warranted.

BEFORE:

dreamseeker_JueVRUQgE4.mp4

AFTER

dreamseeker_kPBkWmpn7R.mp4

BEFORE:
dreamseeker_t6abv2GNWJ

AFTER:
dreamseeker_yyHLRiKNhn


BEFORE:
dreamseeker_v2ss8GmtNW

AFTER:
dreamseeker_w2jgS2uafo


BEFORE:
dreamseeker_uMcH354ngz

AFTER:
dreamseeker_an3LEjUiHm


BEFORE:
dreamseeker_5NdLSalZdn

AFTER:
dreamseeker_VZY18cLm95


BEFORE:
image

AFTER:
image

Changelog

🆑
imageadd: Added emissive effects to lights, airlocks, and a large amount of other station devices.
/:cl:

@kugamo kugamo requested a review from Fox-McCloud as a code owner June 28, 2022 12:11
@ParadiseSS13-Bot ParadiseSS13-Bot added Testmerge Requested This PR has a pending testmerge request -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Jun 28, 2022
@AffectedArc07
Copy link
Member

Im going to testmerge this and keep an eye on the maptick usage, as I fear this could add a lot to it.

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting approval This PR is waiting for approval internally and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Jun 28, 2022
@ParadiseSS13-Bot ParadiseSS13-Bot added the Testmerge Active This PR is currently testmerged on production label Jun 28, 2022
@AffectedArc07
Copy link
Member

image

I have a CSV of the data that ill run more numbers on

@ParadiseSS13-Bot ParadiseSS13-Bot removed Testmerge Active This PR is currently testmerged on production Testmerge Requested This PR has a pending testmerge request labels Jun 28, 2022
@AffectedArc07 AffectedArc07 added the Tweak This PR tweaks something ingame label Jun 28, 2022
@github-actions github-actions bot added Merge Conflict This PR is merge conflicted and removed Merge Conflict This PR is merge conflicted labels Jun 29, 2022
@ParadiseSS13-Bot ParadiseSS13-Bot added the Testmerge Requested This PR has a pending testmerge request label Jun 30, 2022
@github-actions github-actions bot added Merge Conflict This PR is merge conflicted and removed Merge Conflict This PR is merge conflicted labels Jun 30, 2022
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting approval This PR is waiting for approval internally labels Jul 1, 2022
@github-actions github-actions bot added Merge Conflict This PR is merge conflicted and removed Merge Conflict This PR is merge conflicted labels Jul 1, 2022
@ParadiseSS13-Bot ParadiseSS13-Bot removed the Testmerge Requested This PR has a pending testmerge request label Jul 7, 2022
@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Jul 7, 2022
@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Jul 10, 2022
kugamo added 2 commits July 10, 2022 10:06
kugamo added 5 commits July 15, 2022 08:04
readded process in status_display, idk why I removed it, it broke some functionality
Talked with the contributor who added emissive appearances to the codebase. As of now they wont block them unless they spawn as closed, but with future PR merges this code will work.
@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Jul 15, 2022
@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Jul 21, 2022
@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Jul 22, 2022
Copy link
Member

@farie82 farie82 left a comment

Choose a reason for hiding this comment

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

I saw a lot of set_light(X, 0.1). Might it be an idea to make a define for the 0.1? Like LOW_LIGHT_POWER or whatever.
Also, be sure to go over each case of update_icon where you do it twice in a row. You can and should combine the flags together.

kugamo and others added 4 commits July 22, 2022 11:35
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
pog champ ers 2000
Copy link
Member

@farie82 farie82 left a comment

Choose a reason for hiding this comment

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

Few last small things

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Copy link
Member

@farie82 farie82 left a comment

Choose a reason for hiding this comment

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

Nice job on the PR. It's really neat looking

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting merge This PR is ready for merge and removed -Status: Awaiting review This PR is awaiting review from the review team labels Jul 23, 2022
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
@SteelSlayer SteelSlayer merged commit 38f335e into ParadiseSS13:master Jul 23, 2022
@kugamo kugamo deleted the EmitEverything branch October 27, 2022 21:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
-Status: Awaiting merge This PR is ready for merge Tweak This PR tweaks something ingame
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants