Merge pull request #10617 from Citadel-Station-13/kevinz000-patch-16

Grenades can now actually have their timers adjusted
2020-01-20 20:02:06 +01:00
parent 06e23144a8 b1cd0f4ede
commit 4c6af66050
1 changed files with 2 additions and 3 deletions
@@ -93,9 +93,8 @@
 		var/obj/item/I = loc
 		I.grenade_prime_react(src)

-
-/obj/item/grenade/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/screwdriver))
+/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