From 3e90118b635224fe53869aa98d2f4d0f2f17ae55 Mon Sep 17 00:00:00 2001 From: Duck- Date: Sun, 19 Oct 2014 00:20:53 -0400 Subject: [PATCH] i got GRENADE i got GRENADE-- grenade timers are now adjustable because someone put the det time in "quotes" and that broke it. fixed. --- code/game/objects/items/weapons/grenades/grenade.dm | 8 ++++---- data/investigate/gravity.html | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 23fe230f..41c4a460 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -90,16 +90,16 @@ /obj/item/weapon/grenade/attackby(obj/item/weapon/W as obj, mob/user as mob) if(isscrewdriver(W)) switch(det_time) - if ("1") + if (1) det_time = 10 user << "You set the [name] for 1 second detonation time." - if ("10") + if (10) det_time = 30 user << "You set the [name] for 3 second detonation time." - if ("30") + if (30) det_time = 50 user << "You set the [name] for 5 second detonation time." - if ("50") + if (50) det_time = 1 user << "You set the [name] for instant detonation." add_fingerprint(user) diff --git a/data/investigate/gravity.html b/data/investigate/gravity.html index 5ec7d4b2..4864ca62 100644 --- a/data/investigate/gravity.html +++ b/data/investigate/gravity.html @@ -1,2 +1,2 @@ -13:12 [0x20077cd] (92,152,1) || the gravitational generator has regained power.
-13:12 [0x20077cd] (92,152,1) || the gravitational generator is now charging.
+00:14 [0x20077d3] (92,152,1) || the gravitational generator has regained power.
+00:14 [0x20077d3] (92,152,1) || the gravitational generator is now charging.