shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33041 from MrStonedOne/patch-452

Browse Source 
Lowers the stress the dna console puts on the string tree
This commit is contained in:
Jordan Brown
2017-11-23 13:06:33 -05:00
committed by CitadelStationBot
parent c76cacdf77
commit 8943bf0184
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/game/machinery/computer/dna_console.dm
View File

@@ -75,9 +75,9 @@
popup.add_stylesheet("scannernew", 'html/browser/scannernew.css')
var/mob/living/carbon/viable_occupant
var/occupant_status = "<div class='line'><div class='statusLabel'>Subject Status:</div><div class='statusValue'>"
var/list/occupant_status = list("<div class='line'><div class='statusLabel'>Subject Status:</div><div class='statusValue'>")
var/scanner_status
var/temp_html
var/list/temp_html = list()
if(connected && connected.is_operational())
if(connected.occupant) //set occupant_status message
viable_occupant = connected.occupant
@@ -117,9 +117,9 @@
occupant_status += "<span class='bad'>----</span></div></div>"
scanner_status += "<span class='bad'>Error: No scanner detected</span>"
var/status = "<div class='statusDisplay'>"
var/list/status = list("<div class='statusDisplay'>")
status += "<div class='line'><div class='statusLabel'>Scanner:</div><div class='statusValue'>[scanner_status]</div></div>"
status += "[occupant_status]"
status += occupant_status
status += "<div class='line'><h3>Radiation Emitter Status</h3></div>"
@@ -143,7 +143,7 @@
status += "<div class='line'><div class='statusLabel'>Pulse Duration:</div><div class='statusValue'>[radduration]</div></div>"
status += "<div class='line'><div class='statusLabel'>&nbsp;&nbsp;\> Accuracy:</div><div class='statusValue'>[chance_to_hit]</div></div>"
status += "<br></div>" // Close statusDisplay div
var/buttons = "<a href='?src=[REF(src)];'>Scan</a> "
var/list/buttons = list("<a href='?src=[REF(src)];'>Scan</a> ")
if(connected)
buttons += " <a href='?src=[REF(src)];task=toggleopen;'>[connected.state_open ? "Close" : "Open"] Scanner</a> "
if (connected.state_open)
@@ -304,7 +304,7 @@
temp_html += "----"
temp_html += "</div></div></div>"
popup.set_content(temp_html)
popup.set_content(temp_html.Join())
popup.open()