Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit374

2020-01-12 17:19:57 +01:00
parent 110361f82b 8c50b578b4
commit 268146bb93
2355 changed files with 251666 additions and 220983 deletions
@@ -1,38 +1,38 @@
-// Radio Cartridge, essentially a remote signaler with limited spectrum.
-/obj/item/integrated_signaler
-	name = "\improper PDA radio module"
-	desc = "An electronic radio system of Nanotrasen origin."
-	icon = 'icons/obj/module.dmi'
-	icon_state = "power_mod"
-
-/obj/item/integrated_signaler
-	var/frequency = FREQ_SIGNALER
-	var/code = DEFAULT_SIGNALER_CODE
-	var/last_transmission
-	var/datum/radio_frequency/radio_connection
-
-/obj/item/integrated_signaler/Destroy()
-	radio_connection = null
-	return ..()
-
-/obj/item/integrated_signaler/Initialize()
-	. = ..()
-	if (frequency < MIN_FREE_FREQ || frequency > MAX_FREE_FREQ)
-		frequency = sanitize_frequency(frequency)
-	set_frequency(frequency)
-
-/obj/item/integrated_signaler/proc/set_frequency(new_frequency)
-	frequency = new_frequency
-	radio_connection = SSradio.return_frequency(frequency)
-
-/obj/item/integrated_signaler/proc/send_activation()
-	if(last_transmission && world.time < (last_transmission + 5))
-		return
-	last_transmission = world.time
-
-	var/time = time2text(world.realtime,"hh:mm:ss")
-	var/turf/T = get_turf(src)
-	GLOB.lastsignalers.Add("[time] <B>:</B> [usr.key] used [src] @ location [AREACOORD(T)] <B>:</B> [format_frequency(frequency)]/[code]")
-
-	var/datum/signal/signal = new(list("code" = code))
-	radio_connection.post_signal(src, signal, filter = RADIO_SIGNALER)
+// Radio Cartridge, essentially a remote signaler with limited spectrum.
+/obj/item/integrated_signaler
+	name = "\improper PDA radio module"
+	desc = "An electronic radio system of Nanotrasen origin."
+	icon = 'icons/obj/module.dmi'
+	icon_state = "power_mod"
+
+/obj/item/integrated_signaler
+	var/frequency = FREQ_SIGNALER
+	var/code = DEFAULT_SIGNALER_CODE
+	var/last_transmission
+	var/datum/radio_frequency/radio_connection
+
+/obj/item/integrated_signaler/Destroy()
+	radio_connection = null
+	return ..()
+
+/obj/item/integrated_signaler/Initialize()
+	. = ..()
+	if (frequency < MIN_FREE_FREQ || frequency > MAX_FREE_FREQ)
+		frequency = sanitize_frequency(frequency)
+	set_frequency(frequency)
+
+/obj/item/integrated_signaler/proc/set_frequency(new_frequency)
+	frequency = new_frequency
+	radio_connection = SSradio.return_frequency(frequency)
+
+/obj/item/integrated_signaler/proc/send_activation()
+	if(last_transmission && world.time < (last_transmission + 5))
+		return
+	last_transmission = world.time
+
+	var/time = time2text(world.realtime,"hh:mm:ss")
+	var/turf/T = get_turf(src)
+	GLOB.lastsignalers.Add("[time] <B>:</B> [usr.key] used [src] @ location [AREACOORD(T)] <B>:</B> [format_frequency(frequency)]/[code]")
+
+	var/datum/signal/signal = new(list("code" = code))
+	radio_connection.post_signal(src, signal, filter = RADIO_SIGNALER)
@@ -72,12 +72,12 @@
 				difficulty += 2
 		var/datum/component/uplink/hidden_uplink = target.GetComponent(/datum/component/uplink)
 		if(!target.detonatable || prob(difficulty * 15) || (hidden_uplink))
-			U.show_message("<span class='danger'>An error flashes on your [src].</span>", 1)
+			U.show_message("<span class='danger'>An error flashes on your [src].</span>", MSG_VISUAL)
 		else
 			message_admins("[!is_special_character(U) ? "Non-antag " : ""][ADMIN_LOOKUPFLW(U)] triggered a PDA explosion on [target.name] at [ADMIN_VERBOSEJMP(target)].")
 			var/message_log = "triggered a PDA explosion on [target.name] at [AREACOORD(target)]."
 			U.log_message(message_log, LOG_ATTACK)
-			U.show_message("<span class='notice'>Success!</span>", 1)
+			U.show_message("<span class='notice'>Success!</span>", MSG_VISUAL)
 			target.explode()
 	else
 		to_chat(U, "PDA not found.")