Merge remote-tracking branch 'upstream/master' into bombing-logging-and-co

code/modules/assembly/assembly.dm

@@ -1,3 +1,9 @@
+#define WIRE_RECEIVE		(1<<0)	//Allows pulse(0) to call Activate()
+#define WIRE_PULSE			(1<<1)	//Allows pulse(0) to act on the holder
+#define WIRE_PULSE_SPECIAL	(1<<2)	//Allows pulse(0) to act on the holders special assembly
+#define WIRE_RADIO_RECEIVE	(1<<3)	//Allows pulse(1) to call Activate()
+#define WIRE_RADIO_PULSE	(1<<4)	//Allows pulse(1) to send a radio message
+
 /obj/item/assembly
 	name = "assembly"
 	desc = "A small electronic device that should never exist."
@@ -22,21 +28,12 @@
 	var/wires = WIRE_RECEIVE | WIRE_PULSE
 	var/datum/wires/connected = null // currently only used by timer/signaler
 
-	var/const/WIRE_RECEIVE = 1			//Allows Pulsed(0) to call Activate()
-	var/const/WIRE_PULSE = 2				//Allows Pulse(0) to act on the holder
-	var/const/WIRE_PULSE_SPECIAL = 4		//Allows Pulse(0) to act on the holders special assembly
-	var/const/WIRE_RADIO_RECEIVE = 8		//Allows Pulsed(1) to call Activate()
-	var/const/WIRE_RADIO_PULSE = 16		//Allows Pulse(1) to send a radio message
-
 /obj/item/assembly/proc/activate()									//What the device does when turned on
 	return
 
 /obj/item/assembly/proc/pulsed(radio = FALSE)						//Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs
 	return
 
-/obj/item/assembly/proc/pulse(radio = FALSE)						//Called when this device attempts to act on another device, var/radio determines if it was sent via radio or direct
-	return
-
 /obj/item/assembly/proc/toggle_secure()								//Code that has to happen when the assembly is un\secured goes here
 	return
 
@@ -59,8 +56,7 @@
 	cooldown--
 	if(cooldown <= 0)
 		return FALSE
-	spawn(10)
-		process_cooldown()
+	addtimer(CALLBACK(src, .proc/process_cooldown), 10)
 	return TRUE
 
 /obj/item/assembly/Destroy()
@@ -80,7 +76,11 @@
 		activate()
 	return TRUE
 
-/obj/item/assembly/pulse(radio = FALSE)
+//Called when this device attempts to act on another device, var/radio determines if it was sent via radio or direct
+/obj/item/assembly/proc/pulse(radio = FALSE)
+	if(connected && wires)
+		connected.pulse_assembly(src)
+		return TRUE
 	if(holder && (wires & WIRE_PULSE))
 		holder.process_activation(src, 1, 0)
 	if(holder && (wires & WIRE_PULSE_SPECIAL))
@@ -94,8 +94,7 @@
 	if(!secured || cooldown > 0)
 		return FALSE
 	cooldown = 2
-	spawn(10)
-		process_cooldown()
+	addtimer(CALLBACK(src, .proc/process_cooldown), 10)
 	return TRUE
 
 /obj/item/assembly/toggle_secure()

code/modules/assembly/health.dm

@@ -55,7 +55,7 @@
 		health_scan = M.health
 		if(health_scan <= alarm_health)
 			pulse()
-			audible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*")
+			audible_message("[bicon(src)] *beep* *beep*")
 			toggle_scan()
 		return
 	return

code/modules/assembly/infrared.dm

@@ -127,13 +127,12 @@
 /obj/item/assembly/infra/proc/trigger_beam()
 	if(!secured || !on || cooldown > 0)
 		return FALSE
-	pulse(0)
-	audible_message("[bicon(src)] *beep* *beep*", null, 3)
+	cooldown = 2
+	pulse(FALSE)
+	audible_message("[bicon(src)] *beep* *beep*", hearing_distance = 3)
 	if(first)
 		qdel(first)
-	cooldown = 2
-	spawn(10)
-		process_cooldown()
+	addtimer(CALLBACK(src, .proc/process_cooldown), 10)
 
 /obj/item/assembly/infra/interact(mob/user)//TODO: change this this to the wire control panel
 	if(!secured)	return

code/modules/assembly/mousetrap.dm

@@ -63,6 +63,7 @@
 	else if(ismouse(target))
 		var/mob/living/simple_animal/mouse/M = target
 		visible_message("<span class='danger'>SPLAT!</span>")
+		M.death()
 		M.splat()
 	playsound(loc, 'sound/effects/snap.ogg', 50, 1)
 	layer = MOB_LAYER - 0.2

code/modules/assembly/proximity.dm

@@ -47,11 +47,10 @@
 /obj/item/assembly/prox_sensor/proc/sense()
 	if(!secured || !scanning || cooldown > 0)
 		return FALSE
-	pulse(0)
-	visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*")
 	cooldown = 2
-	spawn(10)
-		process_cooldown()
+	pulse(FALSE)
+	visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*")
+	addtimer(CALLBACK(src, .proc/process_cooldown), 10)
 
 /obj/item/assembly/prox_sensor/process()
 	if(timing && (time >= 0))

code/modules/assembly/signaler.dm

@@ -41,8 +41,7 @@
 	if(cooldown > 0)
 		return FALSE
 	cooldown = 2
-	spawn(10)
-		process_cooldown()
+	addtimer(CALLBACK(src, .proc/process_cooldown), 10)
 
 	signal()
 	return TRUE
@@ -129,12 +128,6 @@
 	if(usr)
 		GLOB.lastsignalers.Add("[time] <B>:</B> [usr.key] used [src] @ location ([T.x],[T.y],[T.z]) <B>:</B> [format_frequency(frequency)]/[code]")
 
-/obj/item/assembly/signaler/pulse(var/radio = FALSE)
-	if(connected && wires)
-		connected.Pulse(src)
-	else
-		return ..(radio)
-
 /obj/item/assembly/signaler/receive_signal(datum/signal/signal)
 	if(!receiving || !signal)
 		return FALSE

code/modules/assembly/timer.dm

@@ -39,12 +39,11 @@
 /obj/item/assembly/timer/proc/timer_end()
 	if(!secured || cooldown > 0)
 		return FALSE
-	pulse(0)
+	cooldown = 2
+	pulse(FALSE)
 	if(loc)
 		loc.visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*")
-	cooldown = 2
-	spawn(10)
-		process_cooldown()
+	addtimer(CALLBACK(src, .proc/process_cooldown), 10)
 
 /obj/item/assembly/timer/process()
 	if(timing && (time > 0))