lowercase ntos by request of mloc + updates to background.

This commit is contained in:
DJSnapshot
2014-06-22 03:46:36 -07:00
committed by ZomgPonies
parent 54b2e5f7a7
commit fbfecb0e99
11 changed files with 59 additions and 54 deletions
@@ -7,7 +7,7 @@
/datum/file/program/aifixer
name = "AI system integrity restorer"
desc = "Repairs and revives artificial intelligence cores."
image = 'icons/NTOS/airestore.png'
image = 'icons/ntos/airestore.png'
active_state = "ai-fixer-empty"
req_access = list(access_captain, access_robotics, access_heads)
@@ -65,7 +65,7 @@
prog.key = src
prog.camera_list = null
return
if(istype(source,/datum/file/program/NTOS))
if(istype(source,/datum/file/program/ntos))
for(var/obj/item/part/computer/storage/S in list(computer.hdd,computer.floppy))
for(var/datum/file/F in S.files)
if(istype(F,/datum/file/program/security))
@@ -175,7 +175,7 @@
/datum/file/program/security
name = "camera monitor"
desc = "Connets to the Nanotrasen Camera Network"
image = 'icons/NTOS/camera.png'
image = 'icons/ntos/camera.png'
active_state = "camera-static"
var/datum/file/camnet_key/key = null
@@ -13,7 +13,7 @@
/datum/file/program/card_comp
name = "identification card console"
desc = "Used to modify magnetic strip ID cards."
image = 'icons/NTOS/cardcomp.png'
image = 'icons/ntos/cardcomp.png'
active_state = "id"
var/obj/item/weapon/card/id/reader = null
@@ -14,12 +14,12 @@
return
scan()
var/t = ""
var/t = "<TT><B>Crew Monitoring</B><HR>"
t += "<BR><A href='?src=\ref[src];update=1'>Refresh</A> "
t += "<A href='?src=\ref[src];close=1'>Close</A><BR>"
t += "<table width='100%'><tr><td width='40%'><h3>Name</h3></td><td width='30%'><h3>Vitals</h3></td><td width='30%'><h3>Position</h3></td></tr>"
t += "<table><tr><td width='40%'>Name</td><td width='20%'>Vitals</td><td width='40%'>Position</td></tr>"
var/list/logs = list()
for(var/obj/item/clothing/under/C in tracked)
for(var/obj/item/clothing/under/C in src.tracked)
var/log = ""
var/turf/pos = get_turf(C)
if((C) && (C.has_sensor) && (pos) && (pos.z == computer.z) && C.sensor_mode)
@@ -32,7 +32,7 @@
var/dam3 = round(H.getFireLoss(),1)
var/dam4 = round(H.getBruteLoss(),1)
var/life_status = "[H.stat > 1 ? "<span class='bad'>Deceased</span>" : "<span class='good'>Living</span>"]"
var/life_status = "[H.stat > 1 ? "<font color=red>Deceased</font>" : "Living"]"
var/damage_report = "(<font color='blue'>[dam1]</font>/<font color='green'>[dam2]</font>/<font color='orange'>[dam3]</font>/<font color='red'>[dam4]</font>)"
if(H.wear_id)
@@ -42,17 +42,18 @@
switch(C.sensor_mode)
if(1)
log += "<td width='30%'>[life_status]</td><td width='30%'>Not Available</td></tr>"
log += "<td width='15%'>[life_status]</td><td width='40%'>Not Available</td></tr>"
if(2)
log += "<td width='30%'>[life_status] [damage_report]</td><td width='30%'>Not Available</td></tr>"
log += "<td width='20%'>[life_status] [damage_report]</td><td width='40%'>Not Available</td></tr>"
if(3)
var/area/player_area = get_area(H)
log += "<td width='30%'>[life_status] [damage_report]</td><td width='30%'>[format_text(player_area.name)] ([pos.x], [pos.y])</td></tr>"
log += "<td width='20%'>[life_status] [damage_report]</td><td width='40%'>[player_area.name] ([pos.x], [pos.y])</td></tr>"
logs += log
logs = sortList(logs)
for(var/log in logs)
t += log
t += "</table>"
t += "</FONT></PRE></TT>"
popup.set_content(t)
popup.open()
@@ -67,6 +68,11 @@
Topic(href, list/href_list)
if(!interactable() || !computer.cardslot || ..(href,href_list))
return
if("update" in href_list)
if( href_list["close"] )
usr << browse(null, "window=crewcomp")
usr.unset_machine()
return
if(href_list["update"])
interact()
return
//src.updateUsrDialog()
return
@@ -14,7 +14,7 @@
name = "Security Records"
desc = "Used to view and edit personnel's security records"
active_state = "security"
image = 'icons/NTOS/records.png'
image = 'icons/ntos/records.png'
req_one_access = list(access_security, access_forensics_lockers)