From dd63a1ce4f2c80b740ee4eea60fe057870febf6a Mon Sep 17 00:00:00 2001 From: "only.lurking@gmail.com" Date: Tue, 31 May 2011 06:37:57 +0000 Subject: [PATCH] Neglected to remove some debug text. Also general housekeeping. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1642 316c924e-a436-60f5-8080-3fe189b3f50e --- .../modules/mob/living/silicon/pai/recruit.dm | 2 - .../mob/living/silicon/pai/software2.dm | 236 ------------------ paigrid.png => icons/paigrid.png | Bin tgstation.dme | 2 +- 4 files changed, 1 insertion(+), 239 deletions(-) delete mode 100644 code/modules/mob/living/silicon/pai/software2.dm rename paigrid.png => icons/paigrid.png (100%) diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm index 10d6f97006b..383748404ed 100644 --- a/code/modules/mob/living/silicon/pai/recruit.dm +++ b/code/modules/mob/living/silicon/pai/recruit.dm @@ -48,10 +48,8 @@ var/datum/paiController/paiController // Global handler for pAI candidates candidate.comments = input("Enter any OOC comments", "pAI OOC Comments", candidate.comments) as message if("save") - world << "saving personality" candidate.savefile_save(usr) if("load") - world << "loading personality" candidate.savefile_load(usr) if("submit") diff --git a/code/modules/mob/living/silicon/pai/software2.dm b/code/modules/mob/living/silicon/pai/software2.dm deleted file mode 100644 index 5e1d51db02e..00000000000 --- a/code/modules/mob/living/silicon/pai/software2.dm +++ /dev/null @@ -1,236 +0,0 @@ -/mob/living/silicon/pai/var/list/available_software = list("crew manifest" = 5, "medical records" = 5, "security records" = 5, "camera" = 5, "atmosphere sensor" = 10, "heartbeat sensor" = 10, "security HUD" = 10, "medical HUD" = 10, "universal translator" = 10) - -/mob/living/silicon/pai/Topic(href, href_list) - ..() - if (href_list["switchcamera"]) - switchCamera(locate(href_list["switchcamera"])) - if (href_list["radio"]) - src.card.radio.attack_self(src) - if (href_list["software"]) - var/s = href_list["software"] - world << s - switch(s) - if("crew manifest") - src.softwareManifest() - if("medical records") - //blah - if("security records") - //blah - if("camera") - // blah - if("atmosphere sensor") - // blah - if("heartbeat sensor") - // blah - if("security HUD") - // blah - if("medical HUD") - //blah - if("universal translator") - src.universal_speak = !src.universal_speak - else - //blahblah - if(href_list["softFunction"]) - var/s = href_list["softFunction"] - if(s == "medical records") - var/medFunction = href_list["medFunction"] - if(medFunction == "view") - // Pretty much totally stolen from medical.dm in computers - var/datum/data/record/R = locate(href_list["med_rec"]) - var/datum/data/record/M = locate(href_list["med_rec"]) - if (!( data_core.general.Find(R) )) - src.temp = "Medical Records: 
Record Not Found.
" - return - for(var/datum/data/record/E in data_core.medical) - if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) - M = E - src.medicalActive1 = R - src.medicalActive2 = M - src.medScreen = 1 // Set screen to view a specific record - var/tempScreen = href_list["screen"] - if(tempScreen) - src.medScreen = tempScreen - if (href_list["buy"]) - var/s = href_list["buy"] - var/dat = "" - if(!src.available_software.Find(s)) - dat += "

Error


Requested software package not found.

" - src << browse(dat, "window=paibuy") - onclose(src, "paibuy") - else if(src.ram < src.available_software[s]) - dat += "

Error


Not enough Remaining Available Memory to complete requested task.

" - src << browse(dat, "window=paibuy") - onclose(src, "paibuy") - else - src.ram -= src.available_software[s] - switch(s) - if("crew manifest") - src.software.Add("crew manifest") - if("medical records") - src.software.Add("medical records") - if("security records") - src.software.Add("security records") - if("camera") - src.software.Add("camera") - if("atmosphere sensor") - src.software.Add("atmosphere sensor") - if("heartbeat sensor") - src.software.Add("heartbeat sensor") - if("security HUD") - src.software.Add("security HUD") - if("medical HUD") - src.software.Add("medical HUD") - if("universal translator") - src.universal_speak = 1 - src.software.Add("universal translator") - else - //blahblah - src.downloadSoftware() - return - -/* -/mob/living/silicon/pai/proc/ai_network_change() - set category = "pAI Commands" - set name = "Change Camera Network" -*/ - -// Basic Features: -// Crew Manifest -// Medical Records -// Security Records -// Camera Jack -// -// Advanced Features: -// Atmosphere Sensor -// Heartbeat sensor -// Security HUD -// Medical HUD (Also provides a health analyzer that will assess the user's health) -// Universal Translator -// -// Built-in Features: -// Radio -// PDA Messaging - - - -// Physical Upgrades: -// - Camera Uplink (Removes the need to be plugged in to a camera to access the network) - - -/mob/verb/makePAI(var/turf/t in view()) - var/obj/item/device/paicard/card = new(t) - var/mob/living/silicon/pai/pai = new(card) - pai.key = src.key - -/mob/living/silicon/pai/verb/paiInterface() - set category = "pAI Commands" - set name = "Software Interface" - - var/dat = "" - // Built-in - dat += "Radio Configuration
" - dat += "Text Messaging
" - dat += "
" - - // Basic - dat += "Basic
" - for(var/s in src.software) - if(s == "crew manifest") - dat += "Crew Manifest
" - if(s == "medical records") - dat += "Medical Records
" - if(s == "security records") - dat += "Security Records
" - if(s == "camera") - dat += "Camera Jack
" - dat += "
" - - // Advanced - dat += "Advanced
" - for(var/s in src.software) - if(s == "atmosphere sensor") - dat += "Atmospheric Sensor
" - if(s == "heartbeat sensor") - dat += "Heartbeat Sensor
" - if(s == "security HUD") - dat += "Facial Recognition Suite
" - if(s == "medical HUD") - dat += "Medical Analysis Suite
" - if(s == "universal translator") - dat += "Universal Translator[(src.universal_speak) ? "Enabled" : "Disabled"]
" - dat += "
" - dat += "
" - dat += "Download additional software" - - src << browse(dat, "window=pai") - onclose(src, "pai") - - -/mob/living/silicon/pai/proc/downloadSoftware() - var/dat = "" - - dat += "

CentComm pAI Module Subversion Network


" - dat += "
Remaining Available Memory: [src.ram]

" - dat += "

Trunks available for checkout
" - - for(var/s in available_software) - if(!software.Find(s)) - var/cost = src.available_software[s] - var/displayName = uppertext(s) - dat += "[displayName] ([cost])
" - else - var/displayName = lowertext(s) - dat += "[displayName] 

(Download Complete)

" - dat += "

" - //src << browse(dat, "window=paibuy") - //onclose(src, "paibuy") - return dat - - - -/mob/living/silicon/pai/proc/softwareManifest() - var/dat = "" - dat += "

Crew Manifest



" - for (var/datum/data/record/t in data_core.general) - dat += "[t.fields["name"]] - [t.fields["rank"]]
" - //src << browse(dat, "window=paimanifest") - //onclose(src, "paimanifest") - return dat - -/mob/living/silicon/pai/proc/softwareMedicalRecords() - world << "softwareMedicalRecords() got called" - var/dat = "" - - if(medScreen == 0) - dat += "Record List:
" - for(var/datum/data/record/R in data_core.general) - dat += text("[]: []
", src, R, R.fields["id"], R.fields["name"]) - //Foreach goto(132) - dat += text("
Back", src) - if(medScreen == 1) - dat += "
Medical Record

" - if ((istype(src.medicalActive1, /datum/data/record) && data_core.general.Find(src.medicalActive1))) - dat += text("Name: [] ID: []
\nSex: []
\nAge: []
\nFingerprint: []
\nPhysical Status: []
\nMental Status: []
", - src.medicalActive1.fields["name"], src.medicalActive1.fields["id"], src, src.medicalActive1.fields["sex"], src, src.medicalActive1.fields["age"], src, src.medicalActive1.fields["fingerprint"], src, src.medicalActive1.fields["p_stat"], src, src.medicalActive1.fields["m_stat"]) - else - dat += "
Requested medical record not found.

" - if ((istype(src.medicalActive2, /datum/data/record) && data_core.medical.Find(src.medicalActive2))) - dat += text("
\n
Medical Data

\nBlood Type: []
\nDNA: []
\n
\nMinor Disabilities: []
\nDetails: []
\n
\nMajor Disabilities: []
\nDetails: []
\n
\nAllergies: []
\nDetails: []
\n
\nCurrent Diseases: [] (per disease info placed in log/comment section)
\nDetails: []
\n
\nImportant Notes:
\n\t[]
\n
\n
Comments/Log

", src, src.medicalActive2.fields["b_type"], src, src.medicalActive2.fields["b_dna"], src, src.medicalActive2.fields["mi_dis"], src, src.medicalActive2.fields["mi_dis_d"], src, src.medicalActive2.fields["ma_dis"], src, src.medicalActive2.fields["ma_dis_d"], src, src.medicalActive2.fields["alg"], src, src.medicalActive2.fields["alg_d"], src, src.medicalActive2.fields["cdi"], src, src.medicalActive2.fields["cdi_d"], src, src.medicalActive2.fields["notes"]) - /* - var/counter = 1 - while(src.medicalActive2.fields[text("com_[]", counter)]) - dat += text("[]
Delete Entry

", src.medicalActive2.fields[text("com_[]", counter)], src, counter) - counter++ - */ - else - dat += "
Requested medical record not found.

" - dat += text("
\nBack
", src) - //src << browse(dat, "window=paiMedical") - return dat - - -// ****** THIS IS WHERE YOU LEFT OFF. LOOK IN TO FIGURING OUT WHAT medicalActive1 IS AND HOW TO APPROPRIATE IT TO THE PAI ******* -// ALSO CONSIDER ADDING A POWER MONITOR PACKAGE. HEARTBEAT SENSOR MIGHT BE COOL IF IT PULSED AN OVERLAY WITH A ROUGH LOCATION OF WHERE A MOB IS STANDING. -// REMEMBER THAT YOU STILL NEED TO DO LOGIN AND LOGOUT.DM -// MAYBE ADD A CORRUPTION (HEALTH) VAR FOR CYBERSPACE STUFF. AND SOME LAWS THAT CAN GET HACKED -// YOU STILL HAVEN'T ADDED A WAY TO TRACK WHO THE PAI IS BOUND TO, EITHER. GET ON THAT \ No newline at end of file diff --git a/paigrid.png b/icons/paigrid.png similarity index 100% rename from paigrid.png rename to icons/paigrid.png diff --git a/tgstation.dme b/tgstation.dme index 89a696d3a94..2f405705b7e 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -809,5 +809,5 @@ #include "code\WorkInProgress\recycling\scrap.dm" #include "code\WorkInProgress\recycling\sortingmachinery.dm" #include "interface\skin.dmf" -#include "maps\testmap.dmm" +#include "maps\tgstation.2.0.7.dmm" // END_INCLUDE