diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index 5fd683fffb5..90ff796bb59 100644
--- a/code/game/machinery/syndicatebomb.dm
+++ b/code/game/machinery/syndicatebomb.dm
@@ -110,8 +110,9 @@
wires.Interact(user)
if(!open_panel)
if(!active)
- settings(user)
- return
+ spawn()
+ settings(user)
+ return
else if(anchored)
user << "The bomb is bolted to the floor!"
return
@@ -205,10 +206,10 @@
/obj/item/weapon/bombcore/training/proc/reset()
var/obj/machinery/syndicatebomb/holder = src.loc
if(istype(holder))
- holder.open_panel = 0
if(holder.wires)
holder.wires.Shuffle()
holder.defused = 0
+ holder.open_panel = 0
holder.update_icon()
holder.updateDialog()
@@ -226,8 +227,10 @@
if(istype(holder))
attempts++
defusals++
- holder.loc.visible_message("\icon[holder] Alert: Bomb has been defused. Your score is now [defusals] for [attempts]! Resetting wires...")
- reset()
+ holder.loc.visible_message("\icon[holder] Alert: Bomb has been defused. Your score is now [defusals] for [attempts]! Resetting wires in 5 seconds...")
+ sleep(50) //Just in case someone is trying to remove the bomb core this gives them a little window to crowbar it out
+ if(istype(holder))
+ reset()
/obj/item/weapon/bombcore/badmin
name = "badmin payload"