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

Fixes camera EMP sprites #5168

Merged
merged 1 commit into from
Dec 14, 2023
Merged

Conversation

SabreML
Copy link
Member

@SabreML SabreML commented Dec 8, 2023

About the pull request

Fixes the icon_state of cameras changing to the mapping helper sprite after being EMPed.
This was caused by the initial(icon_state) calls in /obj/structure/machinery/camera/emp_act(), which were setting its sprite to "autocam_editoremp" and "autocam_editor".

To fix it, I modified update_icon() so that it handles all of the camera's states, and made everything just use that. (Plus a tiny refactor of emp_act().)

Explain why it's good for the game

Mapping helpers shouldn't be visible in-game.

Testing Photographs and Procedure

Screenshots & Videos

I can't really do comparison videos since it takes 90 seconds for the EMP to wear off, but here's what was happening previously:

mapping helper

Changelog

🆑
fix: Fixed camera sprites changing to their mapping helper after being EMPed.
/:cl:

@github-actions github-actions bot added the Fix Fix one bug, make ten more label Dec 8, 2023
@Birdtalon Birdtalon added this pull request to the merge queue Dec 14, 2023
Merged via the queue into cmss13-devs:master with commit c7cc8e3 Dec 14, 2023
28 checks passed
cm13-github added a commit that referenced this pull request Dec 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants