From 12f9d205e8a513aa97f3f7385bf5d996289a0dad Mon Sep 17 00:00:00 2001
From: LatD <bluehillo@hotmail.com>
Date: Wed, 27 Apr 2016 00:28:01 +0300
Subject: [PATCH] Syndicate bomb delay wire changed to one time use (#16790)

* Syndicate bomb delay wire

* Fixes delay wires

* Add bomb delay variables

* Forgot to remove unused var

* Small fix
---
 code/datums/wires/syndicatebomb.dm   | 17 ++++++++++++-----
 code/game/machinery/syndicatebomb.dm |  4 ++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/code/datums/wires/syndicatebomb.dm b/code/datums/wires/syndicatebomb.dm
index a9ad735a92c..570e45ba7af 100644
--- a/code/datums/wires/syndicatebomb.dm
+++ b/code/datums/wires/syndicatebomb.dm
@@ -24,9 +24,13 @@
 		if(WIRE_UNBOLT)
 			holder.visible_message("<span class='notice'>\icon[B] The bolts spin in place for a moment.</span>")
 		if(WIRE_DELAY)
-			holder.visible_message("<span class='notice'>\icon[B] The bomb chirps.</span>")
-			playsound(B, 'sound/machines/chime.ogg', 30, 1)
-			B.timer += 10
+			if(B.delayedbig)
+				holder.visible_message("<span class='notice'>\icon[B] The bomb has already been delayed.</span>")
+			else
+				holder.visible_message("<span class='notice'>\icon[B] The bomb chirps.</span>")
+				playsound(B, 'sound/machines/chime.ogg', 30, 1)
+				B.timer += 30
+				B.delayedbig = TRUE
 		if(WIRE_PROCEED)
 			holder.visible_message("<span class='danger'>\icon[B] The bomb buzzes ominously!</span>")
 			playsound(B, 'sound/machines/buzz-sigh.ogg', 30, 1)
@@ -42,9 +46,12 @@
 				playsound(B, 'sound/machines/click.ogg', 30, 1)
 				B.active = TRUE
 				B.update_icon()
+			else if(B.delayedlittle)
+				holder.visible_message("<span class='notice'>\icon[B] Nothing happens.</span>")
 			else
 				holder.visible_message("<span class='notice'>\icon[B] The bomb seems to hesitate for a moment.</span>")
-				B.timer += 5
+				B.timer += 10
+				B.delayedlittle = TRUE
 
 /datum/wires/syndicatebomb/on_cut(wire, mend)
 	var/obj/machinery/syndicatebomb/B = holder
@@ -72,4 +79,4 @@
 				holder.visible_message("<span class='notice'>\icon[B] The timer stops! The bomb has been defused!</span>")
 				B.active = FALSE
 				B.defused = TRUE
-				B.update_icon()
\ No newline at end of file
+				B.update_icon()
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index 3e843a10ad0..23a44cd1be5 100644
--- a/code/game/machinery/syndicatebomb.dm
+++ b/code/game/machinery/syndicatebomb.dm
@@ -16,6 +16,8 @@
 	var/defused = FALSE		//is the bomb capable of exploding?
 	var/obj/item/weapon/bombcore/payload = /obj/item/weapon/bombcore
 	var/beepsound = 'sound/items/timer.ogg'
+	var/delayedbig = FALSE	//delay wire pulsed?
+	var/delayedlittle  = FALSE	//activation wire pulsed?
 
 /obj/machinery/syndicatebomb/process()
 	if(active && !defused && (timer > 0)) 	//Tick Tock
@@ -250,6 +252,8 @@
 			holder.wires.shuffle_wires()
 		holder.defused = 0
 		holder.open_panel = 0
+		holder.delayedbig = FALSE
+		holder.delayedlittle = FALSE
 		holder.update_icon()
 		holder.updateDialog()