cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Comitting for Giacom!

Browse Source 
In short:
AI messaging
Time of death for health scanners
Most lists are sorted alphabetically

See http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=9220 for detailed information.

I wasn't able to test this as thoroughly as I'd like, but what I could test seems fine.
I don't forsee any issues popping up with this stuff.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3993 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-07-05 22:47:30 +00:00
parent 937a499108
commit 84b9929282
25 changed files with 281 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/chemical/Chemistry-Reagents.dm
+1
View File
@@ -1481,6 +1481,7 @@ datum
M.adjustToxLoss(0.5)
M.Weaken(10)
M.silent = max(M.silent, 10)
M.tod = worldtime2text()
..()
return
code/modules/mob/dead/observer/observer.dm
+1 -1
View File
@@ -181,7 +181,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
var/target = null //Chosen target.
dest += getmobs() //Fill list, prompt user with list
target = input("Please, select a player!", "Jump to Mob", null, null) as null|anything in dest
target = input("Please, select a player!", "Jump to Mob", null, null) as null|anything in sortList(dest)
if (!target)//Make sure we actually have a target
return
code/modules/mob/living/carbon/alien/humanoid/death.dm
+1 -1
View File
@@ -27,7 +27,7 @@
if(src.key && src.stat == 2)
src.verbs += /mob/proc/ghost
var/tod = time2text(world.realtime,"hh:mm:ss") //weasellos time of death patch
tod = worldtime2text() //weasellos time of death patch
if (mind) mind.store_memory("Time of death: [tod]", 0)
else src << "We seem to have misplaced your mind datum, so we can't add this to your memory, but you died at [tod]"
code/modules/mob/living/carbon/alien/larva/death.dm
+1 -1
View File
@@ -26,7 +26,7 @@
src.verbs += /mob/proc/ghost
if(mind) // Skie - Added check that there's someone controlling the alien
var/tod = time2text(world.realtime,"hh:mm:ss") //weasellos time of death patch
tod = worldtime2text() //weasellos time of death patch
mind.store_memory("Time of death: [tod]", 0)
return ..(gibbed)
code/modules/mob/living/carbon/brain/death.dm
+1 -1
View File
@@ -14,7 +14,7 @@
see_in_dark = 8
see_invisible = 2
var/tod = time2text(world.realtime,"hh:mm:ss") //weasellos time of death patch
tod = worldtime2text() //weasellos time of death patch
store_memory("Time of death: [tod]", 0)
if (key)
code/modules/mob/living/carbon/human/death.dm
+1 -1
View File
@@ -83,7 +83,7 @@
if(client && src.stat == 2)
verbs += /mob/proc/ghost
var/tod = time2text(world.realtime,"hh:mm:ss") //weasellos time of death patch
tod = worldtime2text() //weasellos time of death patch
if(mind)
mind.store_memory("Time of death: [tod]", 0)
sql_report_death(src)
code/modules/mob/living/silicon/ai/ai.dm
+12 -3
View File
@@ -27,6 +27,11 @@
verbs += /mob/living/silicon/ai/proc/show_laws_verb
aiPDA = new/obj/item/device/pda/ai(src)
aiPDA.owner = name
aiPDA.ownjob = "AI"
aiPDA.name = name + " (" + aiPDA.ownjob + ")"
if (istype(loc, /turf))
verbs.Add(/mob/living/silicon/ai/proc/ai_call_shuttle,/mob/living/silicon/ai/proc/ai_camera_track, \
/mob/living/silicon/ai/proc/ai_camera_list, /mob/living/silicon/ai/proc/ai_network_change, \
@@ -147,12 +152,14 @@
/mob/living/silicon/ai/proc/ai_roster()
set category = "AI Commands"
set name = "Show Crew Manifest"
var/dat = "<html><head><title>Crew Roster</title></head><body><b>Crew Roster:</b><br><br>"
var/list/L = list()
for (var/datum/data/record/t in data_core.general)
dat += "[t.fields["name"]] - [t.fields["rank"]]<br>"
var/R = t.fields["name"] + " - " + t.fields["rank"]
L += R
for(var/R in sortList(L))
dat += "[R]<br>"
dat += "</body></html>"
src << browse(dat, "window=airoster")
@@ -454,6 +461,8 @@
cameralist[C.network] = C.network
network = input(usr, "Which network would you like to view?") as null|anything in cameralist
if(isnull(network))
network = initial(network) // If nothing is selected, default to SS13 (or the initial network)
src << "\blue Switched to [network] camera network."
//End of code by Mord_Sith
code/modules/mob/living/silicon/ai/death.dm
+1 -1
View File
@@ -47,7 +47,7 @@
if (istype(loc, /obj/item/device/aicard))
loc.icon_state = "aicard-404"
var/tod = time2text(world.realtime,"hh:mm:ss") //weasellos time of death patch
tod = worldtime2text() //weasellos time of death patch
if(mind) mind.store_memory("Time of death: [tod]", 0)
if (key)
code/modules/mob/living/silicon/ai/life.dm
+4
View File
@@ -14,6 +14,10 @@
src.update_mind()
if(aiPDA && aiPDA.name != name)
aiPDA.owner = name
aiPDA.name = name + " (" + aiPDA.ownjob + ")"
if (src.malfhack)
if (src.malfhack.aidisabled)
src << "\red ERROR: APC access disabled, hack attempt canceled."
code/modules/mob/living/silicon/pai/software.dm
+9 -5
View File
@@ -238,7 +238,6 @@
if(!AnsweringMS)
return alert("ERROR: No response from server!")
tnote += "<i><b>&rarr; To [P]:</b></i><br>[t]<br>"
P.tnote += "<i><b>&larr; From <a href='byond://?src=\ref[P];soft=pdamessage;target=\ref[src]'>[src]</a>:</b></i><br>[t]<br>"
@@ -443,8 +442,13 @@
/mob/living/silicon/pai/proc/softwareManifest()
var/dat = ""
dat += "<h2>Crew Manifest</h2><br><br>"
for (var/datum/data/record/t in data_core.general)
dat += "[t.fields["name"]] - [t.fields["rank"]]<br>"
var/list/L = list()
for (var/datum/data/record/t in sortRecord(data_core.general))
var/R = t.fields["name"] + " - " + t.fields["rank"]
L += R
for(var/R in sortList(L))
dat += "[R]<br>"
dat += "</body></html>"
return dat
// Medical Records
@@ -452,7 +456,7 @@
var/dat = ""
if(src.subscreen == 0)
dat += "<h3>Medical Records</h3><HR>"
for(var/datum/data/record/R in data_core.general)
for(var/datum/data/record/R in sortRecord(data_core.general))
dat += text("<A href='?src=\ref[];med_rec=\ref[];software=medicalrecord;sub=1'>[]: []<BR>", src, R, R.fields["id"], R.fields["name"])
//dat += text("<HR><A href='?src=\ref[];screen=0;softFunction=medical records'>Back</A>", src)
if(src.subscreen == 1)
@@ -474,7 +478,7 @@
var/dat = ""
if(src.subscreen == 0)
dat += "<h3>Security Records</h3><HR>"
for(var/datum/data/record/R in data_core.general)
for(var/datum/data/record/R in sortRecord(data_core.general))
dat += text("<A href='?src=\ref[];sec_rec=\ref[];software=securityrecord;sub=1'>[]: []<BR>", src, R, R.fields["id"], R.fields["name"])
if(src.subscreen == 1)
dat += "<h3>Security Record</h3>"
code/modules/mob/living/silicon/robot/death.dm
+1 -1
View File
@@ -64,7 +64,7 @@
src.see_invisible = 2
src.updateicon()
var/tod = time2text(world.realtime,"hh:mm:ss") //weasellos time of death patch
tod = worldtime2text() //weasellos time of death patch
store_memory("Time of death: [tod]", 0)
sql_report_cyborg_death(src)