From f6a8c3f368e172e9faa9a85c39af535823efd3c9 Mon Sep 17 00:00:00 2001 From: Crowbar764 <59719612+Crowbar764@users.noreply.github.com> Date: Thu, 28 Sep 2023 08:06:49 +0100 Subject: [PATCH] Bugfix: Camera sprites (#4512) # About the pull request Fixes: https://github.com/cmss13-devs/cmss13/issues/4426 Stops the camera sprites from breaking when wires were cut. Caused by the icon switch code using the 'initial' sprite value, which is an map-editor sprite. Before / after in the dropdown. # Testing Photographs and Procedure
Screenshots & Videos Before: https://github.com/cmss13-devs/cmss13/assets/59719612/9d7ee3e2-8d7e-4942-9dad-2e0bc488fa3f After: https://github.com/cmss13-devs/cmss13/assets/59719612/b87d9fbe-d691-4237-a3d7-074cda26087f
# Changelog :cl: Casper fix: fixed cameras going invisible on wire cut /:cl: --- code/game/machinery/camera/camera.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 4d17e4a08803..d416c561fcd3 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -187,9 +187,9 @@ else visible_message(SPAN_WARNING("[user] has deactivated [src]!")) if(status) - icon_state = initial(icon_state) + icon_state = "camera" else - icon_state = "[initial(icon_state)]1" + icon_state = "camera1" // now disconnect anyone using the camera //Apparently, this will disconnect anyone even if the camera was re-activated. //I guess that doesn't matter since they can't use it anyway?