Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268

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

@@ -48,23 +48,27 @@
 /obj/item/weapon/grenade/attack_self(mob/user)
 	if(!active)
 		if(clown_check(user))
-			to_chat(user, "<span class='warning'>You prime the [name]! [det_time/10] seconds!</span>")
-			playsound(user.loc, 'sound/weapons/armbomb.ogg', 60, 1)
-			active = 1
-			icon_state = initial(icon_state) + "_active"
-			add_fingerprint(user)
-			var/turf/bombturf = get_turf(src)
-			var/area/A = get_area(bombturf)
-			var/message = "[ADMIN_LOOKUPFLW(user)]) has primed a [name] for detonation at [ADMIN_COORDJMP(bombturf)]"
-			GLOB.bombers += message
-			message_admins(message)
-			log_game("[key_name(usr)] has primed a [name] for detonation at [A.name] [COORD(bombturf)].")
+			preprime(user)
 			if(iscarbon(user))
 				var/mob/living/carbon/C = user
 				C.throw_mode_on()
-			spawn(det_time)
-				prime()
 
+/obj/item/weapon/grenade/proc/preprime(mob/user)
+	if(user)
+		to_chat(user, "<span class='warning'>You prime the [name]! [det_time/10] seconds!</span>")
+	playsound(loc, 'sound/weapons/armbomb.ogg', 60, 1)
+	active = TRUE
+	icon_state = initial(icon_state) + "_active"
+	add_fingerprint(user)
+	var/turf/bombturf = get_turf(src)
+	var/area/A = get_area(bombturf)
+	if(user)
+		var/message = "[ADMIN_LOOKUPFLW(user)]) has primed a [name] for detonation at [ADMIN_COORDJMP(bombturf)]"
+		GLOB.bombers += message
+		message_admins(message)
+		log_game("[key_name(usr)] has primed a [name] for detonation at [A.name] [COORD(bombturf)].")
+
+	addtimer(CALLBACK(src, .proc/prime), det_time)
 
 /obj/item/weapon/grenade/proc/prime()
 
@@ -104,4 +108,4 @@
 	if(damage && attack_type == PROJECTILE_ATTACK && prob(15))
 		owner.visible_message("<span class='danger'>[attack_text] hits [owner]'s [src], setting it off! What a shot!</span>")
 		prime()
-		return 1 //It hit the grenade, not them
+		return 1 //It hit the grenade, not them

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

@@ -18,6 +18,10 @@
 	plastic_overlay = mutable_appearance(icon, "[item_state]2")
 	..()
 
+/obj/item/weapon/grenade/plastic/Initialize(mapload)
+	. = ..()
+	SET_SECONDARY_FLAG(src, NO_EMP_WIRES)
+
 /obj/item/weapon/grenade/plastic/Destroy()
 	qdel(nadeassembly)
 	nadeassembly = null