Merge remote-tracking branch 'Upstream/master' into Map-Development

# Conflicts:
#	maps/exodus-2.dmm

code/defines/obj/weapon.dm

@@ -186,6 +186,20 @@
 	throw_range = 5
 	w_class = 2.0
 	attack_verb = list("warned", "cautioned", "smashed")
+/obj/item/weapon/caution/attack_self(mob/user as mob)
+    if(src.icon_state == "caution")
+        src.icon_state = "caution_blinking"
+        user << "You turn the sign on."
+    else
+        src.icon_state = "caution"
+        user << "You turn the sign off."
+/obj/item/weapon/caution/AltClick()
+    if(src.icon_state == "caution")
+        src.icon_state = "caution_blinking"
+        usr << "You turn the sign on."
+    else
+        src.icon_state = "caution"
+        usr << "You turn the sign off."
 
 /obj/item/weapon/caution/cone
 	desc = "This cone is trying to warn you of something!"

code/defines/procs/radio.dm

@@ -1,7 +1,7 @@
-#define TELECOMMS_RECEPTION_NONE 0
-#define TELECOMMS_RECEPTION_SENDER 1
-#define TELECOMMS_RECEPTION_RECEIVER 2
-#define TELECOMMS_RECEPTION_BOTH 3
+#define TELECOMMS_RECEPTION_NONE 1
+#define TELECOMMS_RECEPTION_SENDER 2
+#define TELECOMMS_RECEPTION_RECEIVER 4
+#define TELECOMMS_RECEPTION_BOTH 8
 
 /proc/register_radio(source, old_frequency, new_frequency, radio_filter)
 	if(old_frequency)
@@ -44,7 +44,7 @@
 /proc/get_message_server()
 	if(message_servers)
 		for (var/obj/machinery/message_server/MS in message_servers)
-			if(MS.active)
+			if(MS.active && !within_jamming_range(MS))
 				return MS
 	return null
 
@@ -52,10 +52,12 @@
 	return signal && signal.data["done"]
 
 /proc/get_sender_reception(var/atom/sender, var/datum/signal/signal)
-	return check_signal(signal) ? TELECOMMS_RECEPTION_SENDER : TELECOMMS_RECEPTION_NONE
+	if (check_signal(signal) && !within_jamming_range(sender))
+		return TELECOMMS_RECEPTION_SENDER
+	return TELECOMMS_RECEPTION_NONE
 
 /proc/get_receiver_reception(var/receiver, var/datum/signal/signal)
-	if(receiver && check_signal(signal))
+	if(receiver && check_signal(signal) && !within_jamming_range(receiver))
 		var/turf/pos = get_turf(receiver)
 		if(pos && (pos.z in signal.data["level"]))
 			return TELECOMMS_RECEPTION_RECEIVER

code/defines/procs/statistics.dm

@@ -1,5 +1,5 @@
 proc/sql_poll_population()
-	if(!config.sql_enabled)
+	if(!config.sql_enabled || !config.sql_stats)
 		return
 	var/admincount = admins.len
 	var/playercount = 0
@@ -26,7 +26,7 @@ proc/sql_report_round_end()
 		return
 
 proc/sql_report_death(var/mob/living/carbon/human/H)
-	if(!config.sql_enabled)
+	if(!config.sql_enabled || !config.sql_stats)
 		return
 	if(!H)
 		return
@@ -60,7 +60,7 @@ proc/sql_report_death(var/mob/living/carbon/human/H)
 
 
 proc/sql_report_cyborg_death(var/mob/living/silicon/robot/H)
-	if(!config.sql_enabled)
+	if(!config.sql_enabled || !config.sql_stats)
 		return
 	if(!H)
 		return
@@ -94,7 +94,7 @@ proc/sql_report_cyborg_death(var/mob/living/silicon/robot/H)
 
 
 proc/statistic_cycle()
-	if(!config.sql_enabled)
+	if(!config.sql_enabled || !config.sql_stats)
 		return
 	while(1)
 		sql_poll_population()
@@ -102,6 +102,9 @@ proc/statistic_cycle()
 
 //This proc is used for feedback. It is executed at round end.
 proc/sql_commit_feedback()
+	if(!config.sql_enabled || !config.sql_stats)
+		return
+
 	if(!blackbox)
 		log_game("Round ended without a blackbox recorder. No feedback was sent to the database.")
 		return