From ebf635853b714368d2cec2c5fb60f865d2ef9573 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Thu, 8 Nov 2012 13:59:35 -0700 Subject: [PATCH 1/2] Someone removed me as a Game Master, and this pisses me off both since I have to readd it and since I need it to debug. --- config/admins.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/admins.txt b/config/admins.txt index 45ae77e502..4467f45452 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -19,7 +19,7 @@ miniature - Game Master misterbook - Game Admin misterfox - Game Admin mloc - Game Master -skymarshal - Retired Admin +skymarshal - Game Master spaceman96 - Retired Admin strumpetplaya - Retired Admin tastyfish - Retired Admin From 9b3389145eec7247d6829d0d083448bd36885b1b Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Thu, 8 Nov 2012 14:49:01 -0700 Subject: [PATCH 2/2] Fixed some runtimes with mulebots, the security computer, and the medical computer, as well as readded the nice prompt the cloner gives to ghosts when they are being cloned. Fixed an odd compile error. --- code/datums/datacore.dm | 8 +++---- code/game/machinery/computer/cloning.dm | 22 +++++++++++-------- .../game/machinery/computer/communications.dm | 2 +- code/game/machinery/computer/medical.dm | 11 +++++----- code/game/machinery/computer/security.dm | 8 +++---- code/game/objects/items/devices/PDA/cart.dm | 2 +- 6 files changed, 29 insertions(+), 24 deletions(-) diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 2abd48068d..7358096104 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -18,10 +18,10 @@ if(foundrecord) foundrecord.fields["rank"] = assignment - if(alt_title) - foundrecord.fields["real_rank"] = alt_title - else - foundrecord.fields["real_rank"] = assignment + if(alt_title) + foundrecord.fields["real_rank"] = alt_title + else + foundrecord.fields["real_rank"] = assignment diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index a90d457c5a..f0cae16524 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -378,13 +378,17 @@ temp = "Error: Clonepod malfunction." else if(!config.revival_cloning) temp = "Error: Unable to initiate cloning cycle." - else if(pod1.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["interface"])) - temp = "Initiating cloning cycle..." - records.Remove(C) - del(C) - menu = 1 else - temp = "Initiating cloning cycle...
Error: Post-initialisation failed. Cloning cycle aborted." + var/mob/selected = find_dead_player("[C.fields["ckey"]]") + selected << 'chime.ogg' //probably not the best sound but I think it's reasonable + var/answer = alert(selected,"Do you want to return to life?","Cloning","Yes","No") + if(answer != "No" && pod1.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["interface"])) + temp = "Initiating cloning cycle..." + records.Remove(C) + del(C) + menu = 1 + else + temp = "Initiating cloning cycle...
Error: Post-initialisation failed. Cloning cycle aborted." else temp = "Error: Data corruption." @@ -406,9 +410,9 @@ if (subject.suiciding == 1) scantemp = "Error: Subject's brain is not responding to scanning stimuli." return - if ((!subject.ckey) || (!subject.client)) - scantemp = "Error: Mental interface failure." - return +// if ((!subject.ckey) || (!subject.client)) +// scantemp = "Error: Mental interface failure." +// return if (NOCLONE in subject.mutations) scantemp = "Error: Mental interface failure." return diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 805f8a404d..e2660ab4e8 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -541,7 +541,7 @@ status_signal.data["msg1"] = data1 status_signal.data["msg2"] = data2 log_admin("STATUS: [src.fingerprintslast] set status screen message with [src]: [data1] [data2]") - message_admins("STATUS: [user] set status screen with [PDA]. Message: [data1] [data2]") + //message_admins("STATUS: [user] set status screen with [PDA]. Message: [data1] [data2]") if("alert") status_signal.data["picture_state"] = data1 diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 97bc50aa90..28caed746b 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -98,11 +98,12 @@ if(!M) continue var/turf/bl = get_turf(M) - bdat += "[M.name] - \[[bl.x],[bl.y]\] - [M.on ? "Online" : "Offline"]
" - if((!isnull(M.reagent_glass)) && M.use_beaker) - bdat += "Reservoir: \[[M.reagent_glass.reagents.total_volume]/[M.reagent_glass.reagents.maximum_volume]\]
" - else - bdat += "Using Internal Synthesizer.
" + if(bl) + bdat += "[M.name] - \[[bl.x],[bl.y]\] - [M.on ? "Online" : "Offline"]
" + if((!isnull(M.reagent_glass)) && M.use_beaker) + bdat += "Reservoir: \[[M.reagent_glass.reagents.total_volume]/[M.reagent_glass.reagents.maximum_volume]\]
" + else + bdat += "Using Internal Synthesizer.
" if(!bdat) dat += "
None detected
" diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 68a0fd41ac..3aaab7de20 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -105,12 +105,12 @@ dat += "Records Maintenance
" dat += "
Delete All Records

Back" if(3.0) - var/icon/front = new(active1.fields["photo"], dir = SOUTH) - var/icon/side = new(active1.fields["photo"], dir = WEST) - user << browse_rsc(front, "front.png") - user << browse_rsc(side, "side.png") dat += "
Security Record

" if ((istype(active1, /datum/data/record) && data_core.general.Find(active1))) + var/icon/front = new(active1.fields["photo"], dir = SOUTH) + var/icon/side = new(active1.fields["photo"], dir = WEST) + user << browse_rsc(front, "front.png") + user << browse_rsc(side, "side.png") dat += text("
\ Name: [active1.fields["name"]]
\ ID: [active1.fields["id"]]
\n \ diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index c7226331a0..d0175e65cc 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -504,7 +504,7 @@ Code: else for(var/obj/machinery/bot/mulebot/B in QC.botlist) - if(B) + if(B && B.loc) menu += "[B] at [B.loc.loc]
" menu += "
Scan for active bots
"