Merge branch 'master' into upstream-merge-26760

code/game/objects/items/weapons/grenades/plastic.dm

@@ -96,7 +96,7 @@
 
 	to_chat(user, "<span class='notice'>You start planting the [src]. The timer is set to [det_time]...</span>")
 
-	if(do_after(user, 50, target = AM))
+	if(do_after(user, 30, target = AM))
 		if(!user.temporarilyRemoveItemFromInventory(src))
 			return
 		src.target = AM
@@ -165,4 +165,4 @@
 	icon_state = "plasticx40"
 	item_state = "plasticx4"
 	directional = TRUE
-	boom_sizes = list(0, 2, 5)
+	boom_sizes = list(0, 2, 5)

code/game/objects/items/weapons/grenades/spawnergrenade.dm

@@ -1,5 +1,5 @@
 /obj/item/weapon/grenade/spawnergrenade
-	desc = "It will unleash unleash an unspecified anomaly into the vicinity."
+	desc = "It will unleash an unspecified anomaly into the vicinity."
 	name = "delivery grenade"
 	icon = 'icons/obj/grenade.dmi'
 	icon_state = "delivery"