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 Fire Alarm item_interaction() #28136

Merged

Conversation

Fordoxia
Copy link
Contributor

@Fordoxia Fordoxia commented Jan 26, 2025

What Does This PR Do

Refactors /obj/machinery/firealarm/item_interaction() for readability.

Also fixes the following bugs:

  • The sprite doesn't change to its unwired state when wires are cut.
  • Borg grippers cannot add circuitry to the alarm.

Why It's Good For The Game

Better more readable code. Enabling more better code down the line.

Testing

Assembled a fire alarm from 0 to completion.


Declaration

  • I confirm that I either do not require pre-approval for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.

Changelog

🆑
fix: Fire alarm now changes to unwired sprite when wires are removed.
fix: Borg grippers can add fire alarm electronics to fire alarms.
/:cl:

@ParadiseSS13-Bot ParadiseSS13-Bot added the -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally label Jan 26, 2025
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Jan 27, 2025
@1080pCat 1080pCat added the Code Improvement This PR will improve the code quality of the codebase label Jan 28, 2025
code/game/machinery/firealarm.dm Outdated Show resolved Hide resolved
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
@Burzah Burzah added this pull request to the merge queue Feb 10, 2025
@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 Feb 10, 2025
Merged via the queue into ParadiseSS13:master with commit 0e55808 Feb 10, 2025
19 checks passed
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 Code Improvement This PR will improve the code quality of the codebase
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants