From d24cd192bfcfbd71fcd201ce7e5ea334c04da70e Mon Sep 17 00:00:00 2001
From: "quartz235@gmail.com"
 <quartz235@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Tue, 29 Jan 2013 02:27:24 +0000
Subject: [PATCH] Logging update - Added logging for prayers - Added
 logging/admin messages for law uploads

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5624 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/__HELPERS/logging.dm                     | 8 ++++++++
 code/controllers/configuration.dm             | 8 ++++++++
 code/game/objects/items/weapons/AI_modules.dm | 7 +++++--
 code/modules/admin/verbs/pray.dm              | 2 +-
 config/config.txt                             | 6 ++++++
 5 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/code/__HELPERS/logging.dm b/code/__HELPERS/logging.dm
index 2daf3690d8b..a7f6a6ee7e1 100644
--- a/code/__HELPERS/logging.dm
+++ b/code/__HELPERS/logging.dm
@@ -31,6 +31,14 @@
 	if (config.log_say)
 		diary << "\[[time_stamp()]]SAY: [text]"
 
+/proc/log_prayer(text)
+	if (config.log_prayer)
+		diary << "\[[time_stamp()]]PRAY: [text]"
+
+/proc/log_law(text)
+	if (config.log_law)
+		diary << "\[[time_stamp()]]LAW: [text]"
+
 /proc/log_ooc(text)
 	if (config.log_ooc)
 		diary << "\[[time_stamp()]]OOC: [text]"
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 1a948f59e2a..af56730988e 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -9,6 +9,8 @@
 	var/log_game = 0					// log game events
 	var/log_vote = 0					// log voting
 	var/log_whisper = 0					// log client whisper
+	var/log_prayer = 0					// log prayers
+	var/log_law = 0						// log lawchanges
 	var/log_emote = 0					// log emotes
 	var/log_attack = 0					// log attack messages
 	var/log_adminchat = 0				// log admin chat messages
@@ -179,6 +181,12 @@
 				if ("log_admin")
 					config.log_admin = 1
 
+				if ("log_prayer")
+					config.log_prayer = 1
+
+				if ("log_law")
+					config.log_law = 1
+
 				if ("log_game")
 					config.log_game = 1
 
diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm
index 9ff2138fe21..a1708555a2b 100644
--- a/code/game/objects/items/weapons/AI_modules.dm
+++ b/code/game/objects/items/weapons/AI_modules.dm
@@ -52,7 +52,6 @@ AI MODULES
 					R.show_laws()
 			usr << "Upload complete. The AI's laws have been modified."
 
-
 	else if (istype(C, /obj/machinery/computer/borgupload))
 		var/obj/machinery/computer/borgupload/comp = C
 		if(comp.stat & NOPOWER)
@@ -80,7 +79,9 @@ AI MODULES
 	target << "[sender] has uploaded a change to the laws you must follow, using a [name]. From now on: "
 	var/time = time2text(world.realtime,"hh:mm:ss")
 	lawchanges.Add("[time] <B>:</B> [sender.name]([sender.key]) used [src.name] on [target.name]([target.key])")
-
+	if(!istype(src, /obj/item/weapon/aiModule/freeform))
+		log_law("[sender.key]/[sender.name] uploaded [src.name] to [target.key]/([target.name])")
+		message_admins("[key_name_admin(sender)] used [src.name] on [key_name_admin(target)]")
 
 /******************** Modules ********************/
 
@@ -274,6 +275,8 @@ AI MODULES
 		lawpos = 15
 	target.add_supplied_law(lawpos, law)
 	lawchanges.Add("The law was '[newFreeFormLaw]'")
+	message_admins("[key_name_admin(sender)] used freeform module on [key_name_admin(target)]. The law was '[newFreeFormLaw].'")
+	log_law("[sender.key]/([sender.name]) used freeform module on [sender.key]/([sender.name]): '[newFreeFormLaw].'")
 
 /obj/item/weapon/aiModule/freeform/install(var/obj/machinery/computer/C)
 	if(!newFreeFormLaw)
diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm
index 906ec8a5ac4..840799f9467 100644
--- a/code/modules/admin/verbs/pray.dm
+++ b/code/modules/admin/verbs/pray.dm
@@ -8,7 +8,7 @@
 
 	msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
 	if(!msg)	return
-
+	log_prayer("[src.key]/([src.name]): [msg]")
 	if(usr.client)
 		if(usr.client.prefs.muted & MUTE_PRAY)
 			usr << "\red You cannot pray (muted)."
diff --git a/config/config.txt b/config/config.txt
index a07c23387f3..8adf6ed9e04 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -58,6 +58,12 @@ LOG_ATTACK
 ## log pda messages
 LOG_PDA
 
+## log prayers
+LOG_PRAYER
+
+## log lawchanges
+LOG_LAW
+
 ## log all Topic() calls (for use by coders in tracking down Topic issues)
 # LOG_HREFS