From 725e3335d246ce2c219a07598edf8ca872390550 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sat, 18 Apr 2015 17:49:40 +0200 Subject: [PATCH 1/2] Fixes #8895. Laptops now use the proper proc for checking camera status. --- code/game/machinery/computer3/computers/camera.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/computer3/computers/camera.dm b/code/game/machinery/computer3/computers/camera.dm index 17f14e0cbfe..f90b0526ee5 100644 --- a/code/game/machinery/computer3/computers/camera.dm +++ b/code/game/machinery/computer3/computers/camera.dm @@ -238,7 +238,7 @@ camera_list = "Network Key: [key.title] [topic_link(src,"keyselect","\[ Select key \]")]
" for(var/obj/machinery/camera/C in temp_list) - if(C.status) + if(C.can_use()) camera_list += "[C.c_tag] - [topic_link(src,"show=\ref[C]","Show")]
" else camera_list += "[C.c_tag] - DEACTIVATED
" @@ -264,7 +264,7 @@ if("show" in href_list) var/obj/machinery/camera/C = locate(href_list["show"]) - if(istype(C) && C.status) + if(istype(C) && C.can_use()) set_current(C) usr.reset_view(C) interact() From ea6569b515ab521018b97a055739b77057947385 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sat, 18 Apr 2015 20:04:07 +0200 Subject: [PATCH 2/2] Adds changelog. --- html/changelogs/PsiOmegaDelta-PR-8897.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/PsiOmegaDelta-PR-8897.yml diff --git a/html/changelogs/PsiOmegaDelta-PR-8897.yml b/html/changelogs/PsiOmegaDelta-PR-8897.yml new file mode 100644 index 00000000000..5832ffb8d44 --- /dev/null +++ b/html/changelogs/PsiOmegaDelta-PR-8897.yml @@ -0,0 +1,5 @@ +author: PsiOmegaDelta +delete-after: True + +changes: + - bugfix: "Laptops now use the proper proc for checking camera status."