diff --git a/code/WorkInProgress/computer3/NTOS.dm b/code/WorkInProgress/computer3/NTOS.dm index 54fad87ce0..ee68971083 100644 --- a/code/WorkInProgress/computer3/NTOS.dm +++ b/code/WorkInProgress/computer3/NTOS.dm @@ -2,10 +2,10 @@ The Big Bad NT Operating System */ -/datum/file/program/NTOS +/datum/file/program/ntos name = "Nanotrasen Operating System" extension = "prog" - active_state = "ntos" + active_state = "NTOS" var/obj/item/part/computer/storage/current // the drive being viewed, null for desktop/computer var/fileop = "runfile" @@ -13,12 +13,12 @@ Generate a basic list of files in the selected scope */ -/datum/file/program/NTOS/proc/list_files() +/datum/file/program/ntos/proc/list_files() if(!computer || !current) return null return current.files -/datum/file/program/NTOS/proc/filegrid(var/list/filelist) +/datum/file/program/ntos/proc/filegrid(var/list/filelist) var/dat = "" var/i = 0 for(var/datum/file/F in filelist) @@ -44,7 +44,7 @@ // I am separating this from filegrid so that I don't have to // make metadata peripheral files // -/datum/file/program/NTOS/proc/desktop(var/peripheralop = "viewperipheral") +/datum/file/program/ntos/proc/desktop(var/peripheralop = "viewperipheral") var/dat = "
" var/i = 0 var/list/peripherals = list(computer.hdd,computer.floppy,computer.cardslot) @@ -69,20 +69,20 @@ return dat -/datum/file/program/NTOS/proc/window(var/title,var/buttonbar,var/content) +/datum/file/program/ntos/proc/window(var/title,var/buttonbar,var/content) return {"
-
[title]
+
[title]
[buttonbar]
[content]
"} -/datum/file/program/NTOS/proc/buttonbar(var/type = 0) +/datum/file/program/ntos/proc/buttonbar(var/type = 0) switch(type) if(0) // FILE OPERATIONS return {""} -/datum/file/program/NTOS/interact() +/datum/file/program/ntos/interact() if(!interactable()) return var/dat = {" @@ -162,7 +162,7 @@ -
"} +
"} var/list/files = list_files() if(current) @@ -175,7 +175,7 @@ usr << browse(dat, "window=\ref[computer];size=670x510") onclose(usr, "\ref[computer]") -/datum/file/program/NTOS/Topic(href, list/href_list) +/datum/file/program/ntos/Topic(href, list/href_list) if(!interactable() || ..(href,href_list)) return diff --git a/code/WorkInProgress/computer3/buildandrepair.dm b/code/WorkInProgress/computer3/buildandrepair.dm index 2cb9139f2e..0b1f2d8fd0 100644 --- a/code/WorkInProgress/computer3/buildandrepair.dm +++ b/code/WorkInProgress/computer3/buildandrepair.dm @@ -17,7 +17,7 @@ var/list/records = null var/frame_desc = null - var/datum/file/program/OS = new/datum/file/program/NTOS + var/datum/file/program/OS = new/datum/file/program/ntos /obj/machinery/computer3/proc/disassemble(mob/user as mob) // todo return diff --git a/code/WorkInProgress/computer3/computer3_notes.dm b/code/WorkInProgress/computer3/computer3_notes.dm index f0d0bd5028..c27410e637 100644 --- a/code/WorkInProgress/computer3/computer3_notes.dm +++ b/code/WorkInProgress/computer3/computer3_notes.dm @@ -27,7 +27,7 @@ * Communications terminal printing - move it to a printer of some sort? Make a printer peripheral--but then which ones print the comms? * Remove the partially transparent border on program screens, as it clashes with some frames * Chop the corners on program screens now that screen sizes are standard - * NTOS: + * ntos: * Needs a text editor/viewer * Needs file copy and file move - I think I know how I'm gonna do it * Needs a peripheral view (eject disks and cards, network actions, ???) diff --git a/code/WorkInProgress/computer3/computers/aifixer.dm b/code/WorkInProgress/computer3/computers/aifixer.dm index 45790c50a7..a52e40a0d5 100644 --- a/code/WorkInProgress/computer3/computers/aifixer.dm +++ b/code/WorkInProgress/computer3/computers/aifixer.dm @@ -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) diff --git a/code/WorkInProgress/computer3/computers/camera.dm b/code/WorkInProgress/computer3/computers/camera.dm index 17e639166d..4da54340c1 100644 --- a/code/WorkInProgress/computer3/computers/camera.dm +++ b/code/WorkInProgress/computer3/computers/camera.dm @@ -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 diff --git a/code/WorkInProgress/computer3/computers/card.dm b/code/WorkInProgress/computer3/computers/card.dm index 7b62612398..660e25a67c 100644 --- a/code/WorkInProgress/computer3/computers/card.dm +++ b/code/WorkInProgress/computer3/computers/card.dm @@ -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 diff --git a/code/WorkInProgress/computer3/computers/crew.dm b/code/WorkInProgress/computer3/computers/crew.dm index 22a8b3425f..2d89b336f8 100644 --- a/code/WorkInProgress/computer3/computers/crew.dm +++ b/code/WorkInProgress/computer3/computers/crew.dm @@ -14,12 +14,12 @@ return scan() - var/t = "" + var/t = "Crew Monitoring
" t += "
Refresh " t += "Close
" - t += "
" + t += "

Name

Vitals

Position

" 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 ? "Deceased" : "Living"]" + var/life_status = "[H.stat > 1 ? "Deceased" : "Living"]" var/damage_report = "([dam1]/[dam2]/[dam3]/[dam4])" if(H.wear_id) @@ -42,17 +42,18 @@ switch(C.sensor_mode) if(1) - log += "" + log += "" if(2) - log += "" + log += "" if(3) var/area/player_area = get_area(H) - log += "" + log += "" logs += log logs = sortList(logs) for(var/log in logs) t += log t += "
NameVitalsPosition
[life_status]Not Available
[life_status]Not Available
[life_status] [damage_report]Not Available
[life_status] [damage_report]Not Available
[life_status] [damage_report][format_text(player_area.name)] ([pos.x], [pos.y])
[life_status] [damage_report][player_area.name] ([pos.x], [pos.y])
" + t += "" 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 \ No newline at end of file + //src.updateUsrDialog() + return \ No newline at end of file diff --git a/code/WorkInProgress/computer3/computers/security.dm b/code/WorkInProgress/computer3/computers/security.dm index 17903477fb..77161bb247 100644 --- a/code/WorkInProgress/computer3/computers/security.dm +++ b/code/WorkInProgress/computer3/computers/security.dm @@ -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) diff --git a/code/WorkInProgress/computer3/file.dm b/code/WorkInProgress/computer3/file.dm index cd959a7ea0..3693579067 100644 --- a/code/WorkInProgress/computer3/file.dm +++ b/code/WorkInProgress/computer3/file.dm @@ -10,7 +10,7 @@ var/name = "File" var/extension = "dat" var/volume = 10 // in KB - var/image = 'icons/NTOS/file.png' // determines the icon to use, found in icons/NTOS + var/image = 'icons/ntos/file.png' // determines the icon to use, found in icons/ntos var/obj/machinery/computer3/computer // the parent computer, if fixed var/obj/item/part/computer/storage/device // the device that is containing this file @@ -108,7 +108,7 @@ /datum/file/data/text name = "Text File" extension = "txt" - image = 'icons/NTOS/file.png' + image = 'icons/ntos/file.png' content = "" file_increment = 0.002 // 0.002 kilobytes per character (1024 characters per KB) diff --git a/code/WorkInProgress/computer3/program.dm b/code/WorkInProgress/computer3/program.dm index e16afe4939..985ed74d35 100644 --- a/code/WorkInProgress/computer3/program.dm +++ b/code/WorkInProgress/computer3/program.dm @@ -6,7 +6,7 @@ Programs are a file that can be executed /datum/file/program name = "Untitled" extension = "prog" - image = 'icons/NTOS/program.png' + image = 'icons/ntos/program.png' var/desc = "An unidentifiable program." var/image/overlay = null // Icon to be put on top of the computer frame. @@ -154,8 +154,7 @@ Programs are a file that can be executed if(!popup) popup = new(user, "\ref[computer]", name, nref=src) popup.set_title_image(usr.browse_rsc_icon(overlay.icon, overlay.icon_state)) - popup.set_title_buttons(topic_link(src,"quit","")) - // popup.set_title_buttons("") + popup.set_title_buttons(topic_link(src,"quit","")) if(popup.user != user) popup.user = user popup.set_title_image(usr.browse_rsc_icon(overlay.icon, overlay.icon_state)) @@ -254,7 +253,7 @@ Programs are a file that can be executed // if("quit" in href_list) computer.program = null - usr << browse(null,"window=\ref[computer]") // NTOS will need to resize the window + usr << browse(null,"window=\ref[computer]") // ntos will need to resize the window computer.update_icon() computer.updateDialog() return 1 @@ -263,85 +262,85 @@ Programs are a file that can be executed /datum/file/program/RD name = "R&D Manager" - image = 'icons/NTOS/research.png' + image = 'icons/ntos/research.png' desc = "A software suit for generic research and development machinery interaction. Comes pre-packaged with extensive cryptographic databanks for secure connections with external devices." active_state = "rdcomp" volume = 11000 /datum/file/program/RDserv name = "R&D Server" - image = 'icons/NTOS/server.png' + image = 'icons/ntos/server.png' active_state = "rdcomp" volume = 9000 /datum/file/program/SuitSensors name = "Crew Monitoring" - image = 'icons/NTOS/monitoring.png' + image = 'icons/ntos/monitoring.png' active_state = "crew" volume = 3400 /datum/file/program/Genetics name = "Genetics Suite" - image = 'icons/NTOS/genetics.png' + image = 'icons/nots/genetics.png' desc = "A sophisticated software suite containing read-only genetics hardware specifications and a highly compressed genome databank." active_state = "dna" volume = 8000 /datum/file/program/Cloning name = "Cloning Platform" - image = 'icons/NTOS/cloning.png' + image = 'icons/ntos/cloning.png' desc = "A software platform for accessing external cloning apparatus." active_state = "dna" volume = 7000 /datum/file/program/TCOMmonitor name = "TComm Monitor" - image = 'icons/NTOS/tcomms.png' + image = 'icons/ntos/tcomms.png' active_state = "comm_monitor" volume = 5500 /datum/file/program/TCOMlogs name = "TComm Log View" - image = 'icons/NTOS/tcomms.png' + image = 'icons/ntos/tcomms.png' active_state = "comm_logs" volume = 5230 /datum/file/program/TCOMtraffic name = "TComm Traffic" - image = 'icons/NTOS/tcomms.png' + image = 'icons/ntos/tcomms.png' active_state = "generic" volume = 8080 /datum/file/program/securitycam name = "Sec-Cam Viewport" - image = 'icons/NTOS/camera.png' + image = 'icons/ntos/camera.png' drm = 1 active_state = "cameras" volume = 2190 /datum/file/program/securityrecords name = "Security Records" - image = 'icons/NTOS/records.png' + image = 'icons/ntos/records.png' drm = 1 active_state = "security" volume = 2520 /datum/file/program/medicalrecords name = "Medical Records" - image = 'icons/NTOS/medical.png' + image = 'icons/ntos/medical.png' drm = 1 active_state = "medcomp" volume = 5000 /datum/file/program/SMSmonitor name = "Messaging Monitor" - image = 'icons/NTOS/pda.png' + image = 'icons/ntos/pda.png' active_state = "comm_monitor" volume = 3070 /datum/file/program/OperationMonitor name = "OR Monitor" - image = 'icons/NTOS/operating.png' + image = 'icons/ntos/operating.png' active_state = "operating" volume = 4750 @@ -352,38 +351,38 @@ Programs are a file that can be executed /datum/file/program/PowerMonitor name = "Power Grid" - image = 'icons/NTOS/power.png' + image = 'icons/ntos/power.png' active_state = "power" volume = 7200 /datum/file/program/PrisonerManagement name = "Prisoner Control" - image = 'icons/NTOS/prison.png' + image = 'icons/ntos/prison.png' drm = 1 active_state = "power" volume = 5000 /datum/file/program/Roboticscontrol name = "Cyborg Maint" - image = 'icons/NTOS/borgcontrol.png' + image = 'icons/ntos/borgcontrol.png' active_state = "robot" volume = 9050 /datum/file/program/AIupload name = "AI Upload" - image = 'icons/NTOS/aiupload.png' + image = 'icons/ntos/aiupload.png' active_state = "command" volume = 5000 /datum/file/program/Cyborgupload name = "Cyborg Upload" - image = 'icons/NTOS/borgupload.png' + image = 'icons/ntos/borgupload.png' active_state = "command" volume = 5000 /datum/file/program/Exosuit name = "Exosuit Monitor" - image = 'icons/NTOS/exocontrol.png' + image = 'icons/ntos/exocontrol.png' active_state = "mecha" volume = 7000 @@ -394,7 +393,7 @@ Programs are a file that can be executed /datum/file/program/Stationalert name = "Alert Monitor" - image = 'icons/NTOS/alerts.png' + image = 'icons/ntos/alerts.png' active_state = "computer_generic" volume = 10150 diff --git a/code/WorkInProgress/computer3/upload/lawfile.dm b/code/WorkInProgress/computer3/upload/lawfile.dm index e3b21f537e..7fcbac0066 100644 --- a/code/WorkInProgress/computer3/upload/lawfile.dm +++ b/code/WorkInProgress/computer3/upload/lawfile.dm @@ -22,7 +22,7 @@ execute(var/datum/file/program/source) if(istype(usr,/mob/living/silicon)) return - if(istype(source,/datum/file/program/NTOS)) + if(istype(source,/datum/file/program/ntos)) if(configurable) configure() return