From 9545b180c67428b48553684376e7b6c8896899d8 Mon Sep 17 00:00:00 2001 From: Chayse Ramsay Date: Sun, 21 Nov 2021 06:08:20 +0000 Subject: [PATCH 1/2] Update grenade.dm --- code/game/objects/items/grenades/grenade.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/grenades/grenade.dm b/code/game/objects/items/grenades/grenade.dm index 7a6157bf65..fb98e86ae1 100644 --- a/code/game/objects/items/grenades/grenade.dm +++ b/code/game/objects/items/grenades/grenade.dm @@ -135,16 +135,16 @@ /obj/item/grenade/tool_act(mob/living/user, obj/item/I, tool_behaviour) if(tool_behaviour == TOOL_SCREWDRIVER) switch(det_time) - if ("1") - det_time = 10 + if(1) + det_time = 1 SECONDS to_chat(user, "You set the [name] for 1 second detonation time.") - if ("10") - det_time = 30 + if(1 SECONDS) + det_time = 3 SECONDS to_chat(user, "You set the [name] for 3 second detonation time.") - if ("30") - det_time = 50 + if(3 SECONDS) + det_time = 5 SECONDS to_chat(user, "You set the [name] for 5 second detonation time.") - if ("50") + if(5 SECONDS) det_time = 1 to_chat(user, "You set the [name] for instant detonation.") add_fingerprint(user) From 31a0de04d51f927c96b645096ec951b014ff18b3 Mon Sep 17 00:00:00 2001 From: Chayse Ramsay Date: Sun, 21 Nov 2021 06:24:55 +0000 Subject: [PATCH 2/2] Fixes chem nades too, since fixing grenades as a whole broke them changing timer --- code/game/objects/items/grenades/chem_grenade.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm index b67b7ae587..2032758624 100644 --- a/code/game/objects/items/grenades/chem_grenade.dm +++ b/code/game/objects/items/grenades/chem_grenade.dm @@ -59,9 +59,6 @@ I.play_tool_sound(src, 25) else to_chat(user, "You need to add at least one beaker before locking the [initial(name)] assembly!") - else if(stage == READY && !nadeassembly) - det_time = det_time == 50 ? 30 : 50 //toggle between 30 and 50 - to_chat(user, "You modify the time delay. It's set for [DisplayTimeText(det_time)].") else if(stage == EMPTY) to_chat(user, "You need to add an activation mechanism!")