cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8897 from PsiOmegaDelta/LaptopsAreTheWorst

Browse Source 
Fixes #8895.
This commit is contained in:
Chinsky
2015-04-19 14:59:25 +03:00
parent 8aa22ddb38 ea6569b515
commit 109aed4fcf
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/machinery/computer3/computers/camera.dm
View File

@@ -238,7 +238,7 @@
camera_list = "Network Key: [key.title] [topic_link(src,"keyselect","\[ Select key \]")]<hr>" camera_list = "Network Key: [key.title] [topic_link(src,"keyselect","\[ Select key \]")]<hr>"
for(var/obj/machinery/camera/C in temp_list) 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>" camera_list += "[C.c_tag] - [topic_link(src,"show=\ref[C]","Show")]<br>"
else else
camera_list += "[C.c_tag] - <b>DEACTIVATED</b><br>" camera_list += "[C.c_tag] - <b>DEACTIVATED</b><br>"
@@ -264,7 +264,7 @@
if("show" in href_list) if("show" in href_list)
var/obj/machinery/camera/C = locate(href_list["show"]) var/obj/machinery/camera/C = locate(href_list["show"])
if(istype(C) && C.status) if(istype(C) && C.can_use())
set_current(C) set_current(C)
usr.reset_view(C) usr.reset_view(C)
interact() interact()

5
html/changelogs/PsiOmegaDelta-PR-8897.yml Normal file
View File

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