Skip to content

Commit

Permalink
Fixes crates being pitch black on ASRS animation (#7028)
Browse files Browse the repository at this point in the history
# About the pull request
Emissive layering shenanigans
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
Fixes bug
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

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

</details>


# Changelog
:cl:
fix: Fixes crates showing up pitch black while the ASRS platform is
moving
/:cl:
  • Loading branch information
Git-Nivrak authored Aug 30, 2024
1 parent 7d99ccf commit ca509aa
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions code/modules/shuttles/shuttle_supply.dm
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,11 @@
for(var/turf/T in away_area)
elevator_animation.vis_contents += T

for(var/turf/vis_turf in elevator_animation.vis_contents)
for(var/atom/movable/vis_content in vis_turf.contents)
vis_content.blocks_emissive = FALSE
vis_content.update_emissive_block()

//If we are at the away_area then we are just pretending to move, otherwise actually do the move
if (origin != away_area)
playsound(locate(Elevator_x,Elevator_y,Elevator_z), 'sound/machines/asrs_lowering.ogg', 50, 0)
Expand Down Expand Up @@ -126,6 +131,12 @@

moving_status = SHUTTLE_IDLE
stop_gears()

for(var/turf/vis_turf in elevator_animation.vis_contents)
for(var/atom/movable/vis_content in vis_turf.contents)
vis_content.blocks_emissive = initial(vis_content.blocks_emissive)
vis_content.update_emissive_block()

elevator_animation.vis_contents.Cut()

if (!at_station()) //at centcom
Expand Down

0 comments on commit ca509aa

Please sign in to comment.