Merge pull request #634 from Miniature/master

Attack logging (finally)

code/game/objects/devices/aicard.dm

@@ -15,6 +15,8 @@
 
 		M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been carded with [src.name] by [user.name] ([user.ckey])</font>")
 		user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to card [M.name] ([M.ckey])</font>")
+		log_admin("ATTACK: [user] ([user.ckey]) carded [M] ([M.ckey]) with [src].")
+		message_admins("ATTACK: [user] ([user.ckey]) carded [M] ([M.ckey]) with [src].")
 
 		transfer_ai("AICORE", "AICARD", M, user)
 		return

code/game/objects/devices/flash.dm

@@ -25,6 +25,8 @@
 	attack(mob/living/M as mob, mob/user as mob)
 		M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been flashed (attempt) with [src.name]  by [user.name] ([user.ckey])</font>")
 		user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to flash [M.name] ([M.ckey])</font>")
+		log_admin("ATTACK: [user] ([user.ckey]) flashed [M] ([M.ckey]) with [src].")
+		message_admins("ATTACK: [user] ([user.ckey]) flashed [M] ([M.ckey]) with [src].")
 		if(!clown_check(user))	return
 		if(broken)
 			user.show_message("\red The [src.name] is broken", 2)

code/game/objects/devices/flashlight.dm

@@ -94,6 +94,8 @@
 //	M << "\red You feel a tiny prick!"
 	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been stabbed with [src.name]  by [user.name] ([user.ckey])</font>")
 	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to stab [M.name] ([M.ckey])</font>")
+	log_admin("ATTACK: [user] ([user.ckey]) stabbed [M] ([M.ckey]) with [src].")
+	message_admins("ATTACK: [user] ([user.ckey]) stabbed [M] ([M.ckey]) with [src].")
 	..()
 	return
 

code/game/objects/items.dm

@@ -50,6 +50,7 @@
 			if(!M.handcuffed)
 				M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been handcuffed (attempt) by [user.name] ([user.ckey])</font>")
 				user.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to handcuff [M.name] ([M.ckey])</font>")
+				log_admin("ATTACK: [user] ([user.ckey]) handcuffed [M] ([M.ckey]).")
 				var/obj/effect/equip_e/human/O = new /obj/effect/equip_e/human(  )
 				O.source = user
 				O.target = M
@@ -172,6 +173,8 @@
 //	M << "\red You feel a tiny prick!" //Removed to make tritor pens stealthier
 	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been stabbed with [src.name]  by [user.name] ([user.ckey])</font>")
 	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to stab [M.name] ([M.ckey])</font>")
+	log_admin("ATTACK: [user] ([user.ckey]) used [src] on [M] ([M.ckey]).")
+	message_admins("ATTACK: [user] ([user.ckey]) used [src] on [M] ([M.ckey]).")
 	return
 
 /obj/item/weapon/pen/sleepypen
@@ -500,4 +503,4 @@
 	if(exposed_temperature >= 373.15)
 		for(var/mob/M in viewers(5, src))
 			M << "\red \the [src] burns up."
-		del(src)
+		del(src)

code/game/objects/items/item.dm

@@ -261,6 +261,8 @@ mob/proc/flash_weak_pain()
 
 	user.attack_log += "\[[time_stamp()]\]<font color='red'> Attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>"
 	M.attack_log += "\[[time_stamp()]\]<font color='orange'> Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>"
+	log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
+	message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
 
 	//spawn(1800)            // this wont work right
 	//	M.lastattacker = null
@@ -396,6 +398,8 @@ mob/proc/flash_weak_pain()
 
 	user.attack_log += "\[[time_stamp()]\]<font color='red'> Attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>"
 	M.attack_log += "\[[time_stamp()]\]<font color='orange'> Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>"
+	log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
+	message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
 
 	src.add_fingerprint(user)
 	//if((user.mutations & CLUMSY) && prob(50))

code/game/objects/items/robot_items.dm

@@ -10,6 +10,8 @@
 	attack(mob/M as mob, mob/living/silicon/robot/user as mob)
 		M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been attacked with [src.name] by [user.name] ([user.ckey])</font>")
 		user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to attack [M.name] ([M.ckey])</font>")
+		log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
+		message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
 		user.cell.charge -= 30
 
 		M.Weaken(5)

code/game/objects/items/weapons/explosives.dm

@@ -22,6 +22,8 @@
 		if (ismob(target))
 			target:attack_log += "\[[time_stamp()]\]<font color='orange'> Had the [name] planted on them by [user.real_name] ([user.ckey])</font>"
 			user.visible_message("\red [user.name] finished planting an explosive on [target.name]!")
+			log_admin("ATTACK: [user] ([user.ckey]) planted [src] on [target] ([target:ckey]).")
+			message_admins("ATTACK: [user] ([user.ckey]) planted [src] on [target] ([target:ckey]).")
 		target.overlays += image('assemblies.dmi', "plastic-explosive2")
 		user << "Bomb has been planted. Timer counting down from [timer]."
 		spawn(timer*10)

code/game/objects/items/weapons/hydroponics.dm

@@ -117,6 +117,8 @@ Deathnettle
 		M << "\red You are stunned by the powerful acid of the Deathnettle!"
 		M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Had the [src.name] used on them by [user.name] ([user.ckey])</font>")
 		user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] on [M.name] ([M.ckey])</font>")
+		log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
+		message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
 
 		M.eye_blurry += force/7
 		if(prob(20))

code/game/objects/items/weapons/implants/implanter.dm

@@ -52,6 +52,8 @@
 					O.show_message("\red [user] implants themself with [src.name]!", 1)
 			M.attack_log += text("\[[time_stamp()]\] <font color='orange'> Implanted with [src.name] ([src.imp.name])  by [user.name] ([user.ckey])</font>")
 			user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] ([src.imp.name]) to implant [M.name] ([M.ckey])</font>")
+			log_admin("ATTACK: [user] ([user.ckey]) implanted [M] ([M.ckey]) with [src].")
+			message_admins("ATTACK: [user] ([user.ckey]) implanted [M] ([M.ckey]) with [src].")
 			src.imp.loc = M
 			src.imp.imp_in = M
 			src.imp.implanted = 1

code/game/objects/items/weapons/kitchen.dm

@@ -97,6 +97,8 @@ KNIFE
 		return
 	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been attacked with [src.name] by [user.name] ([user.ckey])</font>")
 	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to attack [M.name] ([M.ckey])</font>")
+	log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
+	message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
 
 	if (M.stat < 2 && M.health < 50 && prob(90))
 		var/mob/H = M
@@ -171,6 +173,8 @@ KNIFE
 
 		M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been attacked with [src.name] by [user.name] ([user.ckey])</font>")
 		user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to attack [M.name] ([M.ckey])</font>")
+		log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
+		message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
 
 		if(prob(15))
 			M.Weaken(3)

code/game/objects/items/weapons/papers_bins.dm

@@ -430,6 +430,8 @@ NOTEBOOK
 			target:loc = present
 			target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been wrapped with [src.name]  by [user.name] ([user.ckey])</font>")
 			user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to wrap [target.name] ([target.ckey])</font>")
+			log_admin("ATTACK: [user] ([user.ckey]) wrapped up [target] ([target.ckey]) with [src].")
+			message_admins("ATTACK: [user] ([user.ckey]) wrapped up [target] ([target.ckey]) with [src].")
 
 		else
 			user << "/blue You need more paper."

code/game/objects/items/weapons/surgery_tools.dm

@@ -1046,6 +1046,8 @@ CIRCULAR SAW
 
 				user.attack_log += "\[[time_stamp()]\]<font color='red'> Debrained [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>"
 				M.attack_log += "\[[time_stamp()]\]<font color='orange'> Debrained by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>"
+				log_admin("ATTACK: [user] ([user.ckey]) debrained [M] ([M.ckey]) with [src].")
+				message_admins("ATTACK: [user] ([user.ckey]) debrained [M] ([M.ckey]) with [src].")
 
 				var/obj/item/brain/B = new(M.loc)
 				B.transfer_identity(M)
@@ -1266,6 +1268,7 @@ CIRCULAR SAW
 		return
 	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been injected with [name] by [user.name] ([user.ckey])</font>")
 	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [name] to inject [M.name] ([M.ckey])</font>")
+	log_admin("ATTACK: [user] ([user.ckey]) injected [M] ([M.ckey]) with [src].")
 
 	if (user)
 		for(var/mob/O in viewers(M, null))

code/game/objects/items/weapons/swords_axes_etc.dm

@@ -129,6 +129,8 @@ STUN BATON
 
 	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been attacked with [src.name] by [user.name] ([user.ckey]) (INTENT: [uppertext(user.a_intent)])</font>")
 	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to attack [M.name] ([M.ckey]) (INTENT: [uppertext(user.a_intent)])</font>")
+	log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
+	message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
 
 	if(isrobot(M))
 		..()
@@ -200,6 +202,8 @@ STUN BATON
 
 	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been attacked with [src.name] by [user.name] ([user.ckey])</font>")
 	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to attack [M.name] ([M.ckey])</font>")
+	log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
+	message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
 
 	if (user.a_intent == "hurt")
 		if(!..()) return

code/game/objects/secstorage/sbriefcase.dm

@@ -25,6 +25,8 @@
 
 	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been attacked with [src.name] by [user.name] ([user.ckey])</font>")
 	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to attack [M.name] ([M.ckey])</font>")
+	log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
+	message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
 
 	var/t = user:zone_sel.selecting
 	if (t == "head")

code/game/objects/storage/bible.dm

@@ -25,6 +25,8 @@
 
 	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been attacked with [src.name] by [user.name] ([user.ckey])</font>")
 	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to attack [M.name] ([M.ckey])</font>")
+	log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
+	message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
 
 	if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
 		user << "\red You don't have the dexterity to do this!"

code/game/objects/storage/briefcase.dm

@@ -20,6 +20,8 @@
 
 	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been attacked with [src.name] by [user.name] ([user.ckey])</font>")
 	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to attack [M.name] ([M.ckey])</font>")
+	log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
+	message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
 
 	if (M.stat < 2 && M.health < 50 && prob(90))
 		var/mob/H = M