There's quite a bit in this revision.

Admin changes:
     Admin attack logs now have a timestamps. Basically, before each log entry there is something that displays [hour:minute:second]. I plan on expanding this functionality to all kinds of logs, as well as creating a global attack log, but this will do for now.


Gloves:
     You can still electrify any gloves with a power cell, however you have to use wires on non-insulated (yellow) gloves to create a "ghetto-insulation" system. I might make these gloves' stun effects more watered-down than normal insulated gloves, but that will probably be for later on.


Bugfixes:
     Fixed some miscellaneous runtime errors, and more importantly, the shotgun. You can dry-pump it by clicking on it, which will eject any used shots or just make that badass "chuck-chick" sound to let everyone know you mean business. Combat shotguns can now shoot twice without the need to pump.

     I also possibly fixed the issue with metroids' AI process locking up. Someone's going to have to PM me on the forums to tell me if this worked or not, because I have not been able to reproduce the bug (although I do know where it's happening in the code).


Chemistry:
     Alright, so this is where the meat of this update is. In a previous revision (r1905) I mentioned the addition of a new "color" variable. This variable now has a use. When you use a spray cleaner, or a chem sprayer which now is significantly more powerful, the color combination of all the reagents inside the sprayer will be displayed instead of the plain old blue-white color. This will allow for people to easily distinguish reagents and colors, for instance, if you see some chemist running around spraying orange or purple stuff chances are that's acid he's spraying, so you should probably subdue him! 

     In addition, you will now be able to see beakers (large ones too) fill up visually. The color of the reagents inside the beaker is overlayed on top of the beaker. The colors may be subject to change to make them brighter or more easily identifiable by "category". Currently, most pharmaceuticals have a light pinkish color. Polytrinic acid has a distinct purple color, etc. However, with due time I can picture chemists mixing other, benign-ish reagents with harmful reagents so passerbys think that a chemist is spraying someone with something harmless, but in reality is spraying them with a bunch of PAcid. There are some consequences, for instance, concentrated acid is more powerful than watered-down acid.


Have fun with that.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1922 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/objects/devices/PDA/PDA.dm

@@ -695,8 +695,11 @@
 						user.show_message(text("\red <b>Warning: [D.form] Detected</b>\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]"))
 
 			if(2)
-				if (!istype(C:dna, /datum/dna) || !isnull(C:gloves))
+				if (!istype(C:dna, /datum/dna))
 					user << "\blue No fingerprints found on [C]"
+				else if(!istype(C, /mob/living/carbon/monkey))
+					if(!isnull(C:gloves))
+						user << "\blue No fingerprints found on [C]"
 				else
 					user << text("\blue [C]'s Fingerprints: [md5(C:dna.uni_identity)]")
 				if ( !(C:blood_DNA) )

code/game/objects/devices/aicard.dm

@@ -13,8 +13,8 @@
 		if(!istype(M, /mob/living/silicon/ai))//If target is not an AI.
 			return ..()
 
-		M.attack_log += text("<font color='orange'>[world.time] - has been carded with [src.name] by [user.name] ([user.ckey])</font>")
-		user.attack_log += text("<font color='red'>[world.time] - has used the [src.name] to card [M.name] ([M.ckey])</font>")
+		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>")
 
 		transfer_ai("AICORE", "AICARD", M, user)
 		return

code/game/objects/devices/flash.dm

@@ -5,8 +5,8 @@
 		usr.drop_item()
 		return
 	if (src.shots > 0)
-		M.attack_log += text("<font color='orange'>[world.time] - has been flashed (attempt) with [src.name]  by [user.name] ([user.ckey])</font>")
-		user.attack_log += text("<font color='red'>[world.time] - has used the [src.name] to flash [M.name] ([M.ckey])</font>")
+		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>")
 
 		var/safety = null
 		if (istype(M, /mob/living/carbon/human))

code/game/objects/items.dm

@@ -34,8 +34,8 @@
 		usr << "\red You don't have the dexterity to do this!"
 		return
 	if (istype(M, /mob/living/carbon/human))
-		M.attack_log += text("<font color='orange'>[world.time] - has been handcuffed (attempt) by [user.name] ([user.ckey])</font>")
-		user.attack_log += text("<font color='red'>[world.time] - has attempted to handcuff [M.name] ([M.ckey])</font>")
+		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>")
 
 		var/obj/equip_e/human/O = new /obj/equip_e/human(  )
 		O.source = user
@@ -174,8 +174,8 @@
 		//	O.show_message(text("\red [] has been stabbed with [] by [].", M, src, user), 1)
 		user << "\red You stab [M] with the pen."
 		M << "\red You feel a tiny prick!"
-		M.attack_log += text("<font color='orange'>[world.time] - has been stabbed with [src.name]  by [user.name] ([user.ckey])</font>")
-		user.attack_log += text("<font color='red'>[world.time] - has used the [src.name] to stab [M.name] ([M.ckey])</font>")
+		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>")
 		if(M.reagents) reagents.trans_to(M, 50) //used to be 150
 	return
 
@@ -193,8 +193,8 @@
 	if (reagents.total_volume)
 		user << "\red You stab [M] with the penlight."
 		M << "\red You feel a tiny prick!"
-		M.attack_log += text("<font color='orange'>[world.time] - has been stabbed with [src.name]  by [user.name] ([user.ckey])</font>")
-		user.attack_log += text("<font color='red'>[world.time] - has used the [src.name] to stab [M.name] ([M.ckey])</font>")
+		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>")
 		if(M.reagents) reagents.trans_to(M, 15)
 	..()
 	return

code/game/objects/items/item.dm

@@ -207,8 +207,8 @@
 	user.lastattacked = M
 	M.lastattacker = user
 
-	user.attack_log += "<font color='red'> Attacked [M.name] ([M.ckey]) with [src.name]</font>"
-	M.attack_log += "<font color='orange'> Attacked by [user.name] ([user.ckey]) with [src.name]</font>"
+	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>"
 
 	//spawn(1800)            // this wont work right
 	//	M.lastattacker = null

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

@@ -10,7 +10,7 @@
 		return
 	user << "Planting explosives..."
 	if(ismob(target))
-		user.attack_log += "<font color='red'>[world.time] - [user.real_name] tried planting [name] on [target:real_name] ([target:ckey])</font>"
+		user.attack_log += "\[[time_stamp()]\] <font color='red'> [user.real_name] tried planting [name] on [target:real_name] ([target:ckey])</font>"
 		user.visible_message("\red [user.name] is trying to plant some kind of explosive on [target.name]!")
 	if(do_after(user, 50) && in_range(user, target))
 		user.drop_item()
@@ -20,7 +20,7 @@
 		if (isturf(target)) location = target
 		if (isobj(target)) location = target.loc
 		if (ismob(target))
-			target:attack_log += "<font color='orange'>[world.time] - had the [name] planted on them by [user.real_name] ([user.ckey])</font>"
+			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]!")
 		target.overlays += image('assemblies.dmi', "plastic-explosive2")
 		user << "Bomb has been planted. Timer counting down from [timer]."

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

@@ -187,6 +187,7 @@
 	freeze
 		name = "freeze beam"
 		icon_state = "ice_2"
+		damage = 0
 		var/temperature = 0
 
 		proc/Freeze(atom/A as mob|obj|turf|area)
@@ -198,6 +199,7 @@
 	plasma
 		name = "plasma blast"
 		icon_state = "plasma_2"
+		damage = 0
 		var/temperature = 800
 
 		proc/Heat(atom/A as mob|obj|turf|area)
@@ -232,10 +234,10 @@
 			else
 				M << "\red You've been shot!"
 			if(istype(firer, /mob))
-				M.attack_log += text("[] <b>[]/[]</b> shot <b>[]/[]</b> with a <b>[]</b>", world.time, firer, firer.ckey, M, M.ckey, src)
-				firer.attack_log += text("[] <b>[]/[]</b> shot <b>[]/[]</b> with a <b>[]</b>", world.time, firer, firer.ckey, M, M.ckey, src)
+				M.attack_log += text("\[[]\] <b>[]/[]</b> shot <b>[]/[]</b> with a <b>[]</b>", time_stamp(), firer, firer.ckey, M, M.ckey, src)
+				firer.attack_log += text("\[[]\] <b>[]/[]</b> shot <b>[]/[]</b> with a <b>[]</b>", time_stamp(), firer, firer.ckey, M, M.ckey, src)
 			else
-				M.attack_log += text("[] <b>UNKOWN SUBJECT (No longer exists)</b> shot <b>[]/[]</b> with a <b>[]</b>", world.time, M, M.ckey, src)
+				M.attack_log += text("\[[]\] <b>UNKOWN SUBJECT (No longer exists)</b> shot <b>[]/[]</b> with a <b>[]</b>", time_stamp(), M, M.ckey, src)
 		spawn(0)
 			if(A)
 
@@ -550,12 +552,19 @@
 			pumped = 0
 			maxpump = 1
 
-			list/Storedshots = list() // a list where "used" shots are stored to be dumped or something
+			list/Storedshots = list()
 
 		load_into_chamber()
 			if(!loaded.len)
+				if(Storedshots.len > 0)
+					if(istype(src, /obj/item/weapon/gun/projectile/shotgun))
+						var/obj/item/weapon/gun/projectile/shotgun/S = src
+						S.pump(loc)
 				return 0
 
+			if(istype(src, /obj/item/weapon/gun/projectile/shotgun) && pumped >= maxpump)
+				return 1
+
 			var/obj/item/ammo_casing/AC = loaded[1] //load next casing.
 			loaded -= AC //Remove casing from loaded list.
 			if(!istype(src, /obj/item/weapon/gun/projectile/shotgun))
@@ -657,6 +666,7 @@
 			flags =  FPRINT | TABLEPASS | CONDUCT | USEDELAY | ONBACK
 			caliber = "shotgun"
 			origin_tech = "combat=2;materials=2"
+			var/recentpump = 0 // to prevent spammage
 
 			New()
 				for(var/i = 1, i <= max_shells, i++)
@@ -664,7 +674,11 @@
 				update_icon()
 
 			attack_self(mob/living/user as mob)
+				if(recentpump) return
 				pump()
+				recentpump = 1
+				sleep(10)
+				recentpump = 0
 				return
 
 			combat
@@ -758,6 +772,11 @@
 			mode = 0 //0 = stun, 1 = kill
 			charge_cost = 100 //How much energy is needed to fire.
 
+		emp_act(severity)
+			power_supply.use(round(power_supply.maxcharge / severity))
+			update_icon()
+			..()
+
 		New()
 			power_supply = new(src)
 			power_supply.give(power_supply.maxcharge)
@@ -1497,7 +1516,10 @@
 
 		update_icon()
 
-		playsound(user, fire_sound, 50, 1)
+		if(silenced)
+			playsound(user, fire_sound, 10, 1)
+		else
+			playsound(user, fire_sound, 50, 1)
 
 		if(!in_chamber)
 			return

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

@@ -109,8 +109,8 @@ Deathnettle
 	if(!..()) return
 	if(istype(M, /mob/living))
 		M << "\red You are stunned by the powerful acid of the Deathnettle!"
-		M.attack_log += text("<font color='orange'>[world.time] - has had the [src.name] used on them by [user.name] ([user.ckey])</font>")
-		user.attack_log += text("<font color='red'>[world.time] - has used the [src.name] on [M.name] ([M.ckey])</font>")
+		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>")
 
 		M.eye_blurry += force/7
 		if(prob(20))

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

@@ -301,8 +301,8 @@ the implant may become unstable and either pre-maturely inject the subject or si
 	if (user && src.imp)
 		for (var/mob/O in viewers(M, null))
 			O.show_message("\red [M] has been implanted by [user].", 1)
-		M.attack_log += text("<font color='orange'>[world.time] - has been implanted with [src.name] ([src.imp.name])  by [user.name] ([user.ckey])</font>")
-		user.attack_log += text("<font color='red'>[world.time] - has used the [src.name] ([src.imp.name]) to implant [M.name] ([M.ckey])</font>")
+		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>")
 		src.imp.loc = M
 		src.imp.imp_in = M
 		src.imp.implanted = 1

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

@@ -52,8 +52,8 @@ KNIFE
 		user.take_organ_damage(10)
 		user.paralysis += 2
 		return
-	M.attack_log += text("<font color='orange'>[world.time] - has been attacked with [src.name] by [user.name] ([user.ckey])</font>")
-	user.attack_log += text("<font color='red'>[world.time] - has used the [src.name] to attack [M.name] ([M.ckey])</font>")
+	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>")
 
 	if (M.stat < 2 && M.health < 50 && prob(90))
 		var/mob/H = M
@@ -114,8 +114,8 @@ KNIFE
 			if (istype(location, /turf/simulated))
 				location.add_blood(H)     ///Plik plik, the sound of blood
 
-		M.attack_log += text("<font color='orange'>[world.time] - has been attacked with [src.name] by [user.name] ([user.ckey])</font>")
-		user.attack_log += text("<font color='red'>[world.time] - has used the [src.name] to attack [M.name] ([M.ckey])</font>")
+		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>")
 
 		if(prob(15))
 			M.weakened += 3

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

@@ -138,8 +138,8 @@ var/global/list/cached_icons = list()
 	if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
 		user << "\red You don't have the dexterity to do this!"
 		return
-	M.attack_log += text("<font color='orange'>[world.time] - has been injected with [name] by [user.name] ([user.ckey])</font>")
-	user.attack_log += text("<font color='red'>[world.time] - has used the [name] to inject [M.name] ([M.ckey])</font>")
+	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>")
 
 	if (user)
 		if (istype(M, /mob/living/carbon/human))

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

@@ -21,11 +21,36 @@ MOP
 		return
 
 	var/obj/decal/D = new/obj/decal(get_turf(src))
-	D.name = "chemicals"
-	D.icon = 'chemical.dmi'
-	D.icon_state = "chempuff"
 	D.create_reagents(5)
 	src.reagents.trans_to(D, 5)
+
+	var/list/rgbcolor = list(0,0,0)
+	var/finalcolor
+	for(var/datum/reagent/re in D.reagents.reagent_list) // natural color mixing bullshit/algorithm
+		if(!finalcolor)
+			rgbcolor = GetColors(re.color)
+			finalcolor = re.color
+		else
+			var/newcolor[3]
+			var/prergbcolor[3]
+			prergbcolor = rgbcolor
+			newcolor = GetColors(re.color)
+
+			rgbcolor[1] = (prergbcolor[1]+newcolor[1])/2
+			rgbcolor[2] = (prergbcolor[2]+newcolor[2])/2
+			rgbcolor[3] = (prergbcolor[3]+newcolor[3])/2
+
+			finalcolor = rgb(rgbcolor[1], rgbcolor[2], rgbcolor[3])
+			// This isn't a perfect color mixing system, the more reagents that are inside,
+			// the darker it gets until it becomes absolutely pitch black! I dunno, maybe
+			// that's pretty realistic? I don't do a whole lot of color-mixing anyway.
+			// If you add brighter colors to it it'll eventually get lighter, though.
+
+	D.name = "chemicals"
+	D.icon = 'chempuff.dmi'
+
+	D.icon += finalcolor
+
 	playsound(src.loc, 'spray2.ogg', 50, 1, -6)
 
 	spawn(0)
@@ -48,7 +73,9 @@ MOP
 
 /obj/item/weapon/cleaner/examine()
 	set src in usr
-	usr << text("\icon[] [] units of cleaner left!", src, src.reagents.total_volume)
+	for(var/datum/reagent/R in reagents.reagent_list)
+		usr << text("\icon[] [] units of [] left!", src, round(R.volume), R.name)
+	//usr << text("\icon[] [] units of cleaner left!", src, src.reagents.total_volume)
 	..()
 	return
 
@@ -68,22 +95,62 @@ MOP
 		user << "\blue Add more cleaner!"
 		return
 
-	var/obj/decal/D = new/obj/decal(get_turf(src))
-	D.name = "chemicals"
-	D.icon = 'chemical.dmi'
-	D.icon_state = "chempuff"
-	D.create_reagents(10)
-	src.reagents.trans_to(D, 10)
 	playsound(src.loc, 'spray2.ogg', 50, 1, -6)
 
-	spawn(0)
-		for(var/i=0, i<6, i++)
-			step_towards(D,A)
-			D.reagents.reaction(get_turf(D))
-			for(var/atom/T in get_turf(D))
-				D.reagents.reaction(T)
-			sleep(6)
-		del(D)
+	var/Sprays[3]
+	for(var/i=1, i<=3, i++) // intialize sprays
+		if(src.reagents.total_volume < 1) break
+		var/obj/decal/D = new/obj/decal(get_turf(src))
+		D.name = "chemicals"
+		D.icon = 'chempuff.dmi'
+		D.create_reagents(5)
+		src.reagents.trans_to(D, 5)
+
+		var/rgbcolor[3]
+		var/finalcolor
+		for(var/datum/reagent/re in D.reagents.reagent_list)
+			if(!finalcolor)
+				rgbcolor = GetColors(re.color)
+				finalcolor = re.color
+			else
+				var/newcolor[3]
+				var/prergbcolor[3]
+				prergbcolor = rgbcolor
+				newcolor = GetColors(re.color)
+
+				rgbcolor[1] = (prergbcolor[1]+newcolor[1])/2
+				rgbcolor[2] = (prergbcolor[2]+newcolor[2])/2
+				rgbcolor[3] = (prergbcolor[3]+newcolor[3])/2
+
+				finalcolor = rgb(rgbcolor[1], rgbcolor[2], rgbcolor[3])
+
+		D.icon += finalcolor
+
+		Sprays[i] = D
+
+	var/direction = get_dir(src, A)
+	var/turf/T = get_turf(A)
+	var/turf/T1 = get_step(T,turn(direction, 90))
+	var/turf/T2 = get_step(T,turn(direction, -90))
+	var/list/the_targets = list(T,T1,T2)
+
+	for(var/i=1, i<=Sprays.len, i++)
+		spawn()
+			var/obj/decal/D = Sprays[i]
+			if(!D) continue
+
+			// Spreads the sprays a little bit
+			var/turf/my_target = pick(the_targets)
+			the_targets -= my_target
+
+			for(var/j=1, j<=rand(6,8), j++)
+				step_towards(D, my_target)
+				D.reagents.reaction(get_turf(D))
+				for(var/atom/t in get_turf(D))
+					D.reagents.reaction(t)
+				sleep(2)
+			del(D)
+	sleep(1)
 
 	if(isrobot(user)) //Cyborgs can clean forever if they keep charged
 		var/mob/living/silicon/robot/janitor = user
@@ -141,3 +208,31 @@ MOP
 			mopcount = 0
 
 	return
+
+
+
+/*
+ *  Hope it's okay to stick this shit here: it basically just turns a hexadecimal color into rgb
+ */
+
+proc/GetColors(hex)
+    hex = uppertext(hex)
+    var
+        hi1 = text2ascii(hex, 2)
+        lo1 = text2ascii(hex, 3)
+        hi2 = text2ascii(hex, 4)
+        lo2 = text2ascii(hex, 5)
+        hi3 = text2ascii(hex, 6)
+        lo3 = text2ascii(hex, 7)
+    return list(((hi1>= 65 ? hi1-55 : hi1-48)<<4) | (lo1 >= 65 ? lo1-55 : lo1-48),
+        ((hi2 >= 65 ? hi2-55 : hi2-48)<<4) | (lo2 >= 65 ? lo2-55 : lo2-48),
+        ((hi3 >= 65 ? hi3-55 : hi3-48)<<4) | (lo3 >= 65 ? lo3-55 : lo3-48))
+
+
+
+
+
+
+
+
+

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

@@ -475,8 +475,8 @@ CLIPBOARDS
 				target:client:eye = present
 
 			target:loc = present
-			target.attack_log += text("<font color='orange'>[world.time] - has been wrapped with [src.name]  by [user.name] ([user.ckey])</font>")
-			user.attack_log += text("<font color='red'>[world.time] - has used the [src.name] to wrap [target.name] ([target.ckey])</font>")
+			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>")
 
 		else
 			user << "/blue You need more paper."

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

@@ -121,8 +121,8 @@ STUN BATON
 	src.add_fingerprint(user)
 	var/mob/living/carbon/human/H = M
 
-	M.attack_log += text("<font color='orange'>[world.time] - has been attacked with [src.name] by [user.name] ([user.ckey])</font>")
-	user.attack_log += text("<font color='red'>[world.time] - has used the [src.name] to attack [M.name] ([M.ckey])</font>")
+	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>")
 
 
 	if (status == 0 || (status == 1 && charges ==0))
@@ -218,8 +218,8 @@ STUN BATON
 		return
 	src.add_fingerprint(user)
 
-	M.attack_log += text("<font color='orange'>[world.time] - has been attacked with [src.name] by [user.name] ([user.ckey])</font>")
-	user.attack_log += text("<font color='red'>[world.time] - has used the [src.name] to attack [M.name] ([M.ckey])</font>")
+	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>")
 
 	if (user.a_intent == "hurt")
 		if(!..()) return

code/game/objects/secstorage/sbriefcase.dm

@@ -23,8 +23,8 @@
 		return
 
 
-	M.attack_log += text("<font color='orange'>[world.time] - has been attacked with [src.name] by [user.name] ([user.ckey])</font>")
-	user.attack_log += text("<font color='red'>[world.time] - has used the [src.name] to attack [M.name] ([M.ckey])</font>")
+	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>")
 
 	var/t = user:zone_sel.selecting
 	if (t == "head")

code/game/objects/storage/bible.dm

@@ -27,8 +27,8 @@
 		chaplain = 1
 
 
-	M.attack_log += text("<font color='orange'>[world.time] - has been attacked with [src.name] by [user.name] ([user.ckey])</font>")
-	user.attack_log += text("<font color='red'>[world.time] - has used the [src.name] to attack [M.name] ([M.ckey])</font>")
+	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>")
 
 	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

@@ -18,8 +18,8 @@
 		return
 
 
-	M.attack_log += text("<font color='orange'>[world.time] - has been attacked with [src.name] by [user.name] ([user.ckey])</font>")
-	user.attack_log += text("<font color='red'>[world.time] - has used the [src.name] to attack [M.name] ([M.ckey])</font>")
+	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>")
 
 	if (M.stat < 2 && M.health < 50 && prob(90))
 		var/mob/H = M