From 9fdde1eec7d08bd5b3d58c78e1ee9d2f4bfaf0a6 Mon Sep 17 00:00:00 2001
From: Rob Nelson <nexisentertainment@gmail.com>
Date: Thu, 9 Jan 2014 14:23:49 -0800
Subject: [PATCH] Fix #388: Incorrect C4 timing checks.

Conflicts:
	code/game/objects/items/weapons/explosives.dm
---
 code/game/objects/items/weapons/explosives.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm
index 3e34d0c57f1..664bce55ef1 100644
--- a/code/game/objects/items/weapons/explosives.dm
+++ b/code/game/objects/items/weapons/explosives.dm
@@ -1,7 +1,7 @@
 /obj/item/weapon/plastique/attack_self(mob/user as mob)
 	var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num
-	if(newtime < 10)
-		newtime = 10
+	if(newtime > 60000)
+		newtime = 60000
 	timer = newtime
 	user << "Timer set for [timer] seconds."