Merge pull request #8897 from PsiOmegaDelta/LaptopsAreTheWorst

Fixes #8895.
This commit is contained in:
Chinsky
2015-04-19 14:59:25 +03:00
2 changed files with 7 additions and 2 deletions

View File

@@ -238,7 +238,7 @@
camera_list = "Network Key: [key.title] [topic_link(src,"keyselect","\[ Select key \]")]<hr>"
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")]<br>"
else
camera_list += "[C.c_tag] - <b>DEACTIVATED</b><br>"
@@ -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()

View File

@@ -0,0 +1,5 @@
author: PsiOmegaDelta
delete-after: True
changes:
- bugfix: "Laptops now use the proper proc for checking camera status."