Merge pull request #6307 from Markolie/fixxxxx

Fix security record time and mecha attackby cooldown

code/game/machinery/computer/security.dm

@@ -369,7 +369,7 @@ What a mess.*/
 				var/counter = 1
 				while(active2.fields[text("com_[]", counter)])
 					counter++
-				active2.fields[text("com_[counter]")] = text("Made by [authenticated] ([rank]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], 2557<BR>[t1]")
+				active2.fields[text("com_[counter]")] = text("Made by [authenticated] ([rank]) on [worldtime2text()]<BR>[t1]")
 
 			if("Delete Record (ALL)")
 				if(active1)

code/game/mecha/mecha.dm

@@ -831,6 +831,8 @@
 
 /obj/mecha/proc/attacked_by(obj/item/I, mob/user)
 	log_message("Attacked by [I]. Attacker - [user]")
+	user.changeNext_move(CLICK_CD_MELEE)
+	user.do_attack_animation(src)
 	var/deflection = deflect_chance
 	var/dam_coeff = 1
 	for(var/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/B in equipment)