From 2716083dc3e885af981c664dfa2870f03ad3e54e Mon Sep 17 00:00:00 2001 From: Markolie Date: Wed, 1 Feb 2017 18:39:36 +0100 Subject: [PATCH 1/3] Fix security record time and mecha attackby cooldown --- code/game/machinery/computer/security.dm | 2 +- code/game/mecha/mecha.dm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 1634ebdc4a0..5c0ef5b4fd7 100644 --- a/code/game/machinery/computer/security.dm +++ b/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
[t1]") + active2.fields[text("com_[counter]")] = text("Made by [authenticated] ([rank]) on [worldtime2text()], 2557
[t1]") if("Delete Record (ALL)") if(active1) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index b5fcb46b39c..8ae1715fb8c 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -831,6 +831,7 @@ /obj/mecha/proc/attacked_by(obj/item/I, mob/user) log_message("Attacked by [I]. Attacker - [user]") + user.changeNext_move(CLICK_CD_MELEE) var/deflection = deflect_chance var/dam_coeff = 1 for(var/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/B in equipment) From d83c28fb54dcaba8f9351196ff1b25ffd542518f Mon Sep 17 00:00:00 2001 From: Markolie Date: Wed, 1 Feb 2017 18:44:21 +0100 Subject: [PATCH 2/3] Removes year from security computer --- code/game/machinery/computer/security.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 5c0ef5b4fd7..2a11b4a8836 100644 --- a/code/game/machinery/computer/security.dm +++ b/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 [worldtime2text()], 2557
[t1]") + active2.fields[text("com_[counter]")] = text("Made by [authenticated] ([rank]) on [worldtime2text()]
[t1]") if("Delete Record (ALL)") if(active1) From 1a44f3b3d4a6041d821834617cfe720853a09bd6 Mon Sep 17 00:00:00 2001 From: Markolie Date: Wed, 1 Feb 2017 18:47:10 +0100 Subject: [PATCH 3/3] Add attack animation to mecha attackby --- code/game/mecha/mecha.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 8ae1715fb8c..e5192e7603c 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -832,6 +832,7 @@ /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)