From 2d44352d0fdefd62bc0227226d7f7782fb707730 Mon Sep 17 00:00:00 2001 From: SamCroswell Date: Sun, 4 May 2014 09:37:28 -0400 Subject: [PATCH] Misc. changes --- code/game/objects/items/weapons/explosives.dm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 680e7a44aed..ab9beb64800 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -55,19 +55,22 @@ /obj/item/weapon/plastique/attack_self(mob/user as mob) var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num - if(user.get_active_hand() == src) - newtime = Clamp(newtime, 10, 60000) - timer = newtime - user << "Timer set for [timer] seconds." + if(newtime > 60000) + newtime = 60000 + timer = newtime + user << "Timer set for [timer] seconds." + /obj/item/weapon/plastique/afterattack(atom/target as obj|turf, mob/user as mob, flag) if (!flag) return - if (istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage/)) + if (istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage/) || istype(target, /obj/machinery/door/airlock/hatch/gamma)) return user << "Planting explosives..." if(ismob(target)) - add_logs(user, target, "tried to plant explosives on", object="[name]") + user.attack_log += "\[[time_stamp()]\] [user.real_name] tried planting [name] on [target:real_name] ([target:ckey])" + msg_admin_attack("[user.real_name] ([user.ckey]) tried planting [name] on [target:real_name] ([target:ckey]) (JMP)") + user.visible_message("\red [user.name] is trying to plant some kind of explosive on [target.name]!")