From f995b2e94b3affbaaae4d7f887ae69c21d5c164e Mon Sep 17 00:00:00 2001 From: tkdrg Date: Fri, 31 Oct 2014 23:20:33 -0300 Subject: [PATCH] Adds cargo and secrecords to admin_investigate --- code/controllers/supply_shuttle.dm | 9 ++++++++- code/game/machinery/computer/security.dm | 2 ++ code/modules/admin/admin_investigate.dm | 4 ++-- code/modules/mob/living/carbon/human/human.dm | 3 ++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/code/controllers/supply_shuttle.dm b/code/controllers/supply_shuttle.dm index defa56ba515..c4ac2fa0986 100644 --- a/code/controllers/supply_shuttle.dm +++ b/code/controllers/supply_shuttle.dm @@ -141,6 +141,8 @@ var/global/datum/controller/supply_shuttle/supply_shuttle var/eta //shuttle loan var/datum/round_event/shuttle_loan/shuttle_loan + //for logging + var/sold_atoms = "" /datum/controller/supply_shuttle/New() ordernum = rand(1,9000) @@ -235,17 +237,20 @@ var/global/datum/controller/supply_shuttle/supply_shuttle centcom_message = "" for(var/atom/movable/MA in shuttle) + sold_atoms += " [MA.name]" if(MA.anchored) continue // Must be in a crate (or a critter crate)! if(istype(MA,/obj/structure/closet/crate) || istype(MA,/obj/structure/closet/critter)) + sold_atoms += ":" crate_count++ var/find_slip = 1 for(var/atom in MA) // Sell manifests var/atom/A = atom + sold_atoms += " [A.name]" if(find_slip && istype(A,/obj/item/weapon/paper/manifest)) var/obj/item/weapon/paper/manifest/slip = A // TODO: Check for a signature, too. @@ -310,6 +315,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle centcom_message += "+[S.rarity]: New species discovered: \"[capitalize(S.species)]\". Excellent work.
" points += S.rarity // That's right, no bonus for potency. Send a crappy sample first to "show improvement" later qdel(MA) + sold_atoms += "." if(plasma_count) centcom_message += "+[round(plasma_count/plasma_per_point)]: Received [plasma_count] unit(s) of exotic material.
" @@ -613,7 +619,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle supply_shuttle.moving = -1 supply_shuttle.sell() supply_shuttle.send() - + investigate_log("[usr.key] has sent the supply shuttle away. Remaining points: [supply_shuttle.points]. Shuttle contents:[supply_shuttle.sold_atoms].", "cargo") else if(href_list["loan"] && supply_shuttle.shuttle_loan) if(!supply_shuttle.shuttle_loan.dispatched) @@ -727,6 +733,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle supply_shuttle.points -= P.cost supply_shuttle.shoppinglist += O temp = "Thanks for your order." + investigate_log("[usr.key] has authorized an order for [P.name]. Remaining points: [supply_shuttle.points].", "cargo") else temp = "Not enough supply points." break diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index ad296e20065..91201d704ae 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -607,6 +607,7 @@ What a mess.*/ if ("Change Criminal Status") if (active2) + var/old_field = active2.fields["criminal"] switch(href_list["criminal2"]) if("none") active2.fields["criminal"] = "None" @@ -618,6 +619,7 @@ What a mess.*/ active2.fields["criminal"] = "Parolled" if("released") active2.fields["criminal"] = "Discharged" + investigate_log("[active1.fields["name"]] has been set from [old_field] to [active2.fields["criminal"]] by [usr.name] ([usr.key]).", "secrecords") if ("Delete Record (Security) Execute") if (active2) diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm index 5af2ebb0d14..fe23b66c296 100644 --- a/code/modules/admin/admin_investigate.dm +++ b/code/modules/admin/admin_investigate.dm @@ -22,12 +22,12 @@ F << "[time2text(world.timeofday,"hh:mm")] \ref[src] ([x],[y],[z]) || [src] [message]
" //ADMINVERBS -/client/proc/investigate_show( subject in list("hrefs","notes","ntsl","singulo","wires","telesci", "gravity") ) +/client/proc/investigate_show( subject in list("hrefs","notes","ntsl","singulo","wires","telesci", "gravity", "secrecords", "cargo") ) set name = "Investigate" set category = "Admin" if(!holder) return switch(subject) - if("singulo", "ntsl", "wires", "telesci", "gravity") //general one-round-only stuff + if("singulo", "ntsl", "wires", "telesci", "gravity", "secrecords", "cargo") //general one-round-only stuff var/F = investigate_subject2file(subject) if(!F) src << "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed." diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 84d3f094d59..a29a08dcdbd 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -497,6 +497,7 @@ if(R) if(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/hud/security/sunglasses)) if(setcriminal != "Cancel") + investigate_log("[src.key] has been set from [R.fields["criminal"]] to [setcriminal] by [usr.name] ([usr.key]).", "secrecords") R.fields["criminal"] = setcriminal spawn() @@ -716,4 +717,4 @@ gain = rand(-300, 300) investigate_log(" has consumed [key_name(src)].","singulo") //Oh that's where the clown ended up! gib() - return(gain) + return(gain)