diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm
index c739ffbf85..4b5d8f28a7 100644
--- a/code/defines/procs/announce.dm
+++ b/code/defines/procs/announce.dm
@@ -32,7 +32,7 @@
title = "Security Announcement"
announcement_type = "Security Announcement"
-/datum/announcement/proc/Announce(var/message as text, var/new_title = "", var/new_sound = null, var/do_newscast = newscast, var/msg_sanitized = 0, zlevel)
+/datum/announcement/proc/Announce(var/message as text, var/new_title = "", var/new_sound = null, var/do_newscast = newscast, var/msg_sanitized = 0, var/zlevel)
if(!message)
return
var/message_title = new_title ? new_title : title
@@ -52,11 +52,38 @@
Sound(message_sound, zlevels)
Log(message, message_title)
-datum/announcement/proc/Message(var/message as text, var/message_title as text, var/list/zlevels)
- global_announcer.autosay("[message_title]: [message]", announcer ? announcer : ANNOUNCER_NAME, zlevels)
+datum/announcement/proc/Message(message as text, message_title as text, var/list/zlevels)
+ for(var/mob/M in player_list)
+ if(!istype(M,/mob/new_player) && !isdeaf(M))
+ to_chat(M, "[title]
")
+ to_chat(M, "[message]")
+ if (announcer)
+ to_chat(M, " -[html_encode(announcer)]")
-datum/announcement/minor/Message(var/message as text, var/message_title as text, var/list/zlevels)
- global_announcer.autosay(message, announcer ? announcer : ANNOUNCER_NAME, zlevels)
+// You'll need to update these to_world usages if you want to make these z-level specific ~Aro
+datum/announcement/minor/Message(message as text, message_title as text)
+ to_world("[message]")
+
+datum/announcement/priority/Message(message as text, message_title as text)
+ to_world("[message_title]
")
+ to_world("[message]")
+ if(announcer)
+ to_world(" -[html_encode(announcer)]")
+ to_world("
")
+
+datum/announcement/priority/command/Message(message as text, message_title as text, var/list/zlevels)
+ var/command
+ command += "[command_name()] Update
"
+ if (message_title)
+ command += "
[message_title]
"
+
+ command += "
[message]
"
+ command += "
"
+ for(var/mob/M in player_list)
+ if(zlevels && !(get_z(M) in zlevels))
+ continue
+ if(!istype(M,/mob/new_player) && !isdeaf(M))
+ to_chat(M, command)
datum/announcement/priority/Message(var/message as text, var/message_title as text, var/list/zlevels)
global_announcer.autosay("[message_title]: [message]", announcer ? announcer : ANNOUNCER_NAME, zlevels)
diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm
index 9a9ec69278..165df28298 100644
--- a/code/game/machinery/telecomms/broadcaster.dm
+++ b/code/game/machinery/telecomms/broadcaster.dm
@@ -88,7 +88,6 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
signal.data["compression"], signal.data["level"], signal.frequency,
signal.data["verb"], forced_radios)
-
/** #### - Simple Broadcast - #### **/
if(signal.data["type"] == SIGNAL_SIMPLE)
@@ -346,7 +345,6 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
var/data, var/compression, var/list/level, var/freq, var/verbage = "says",
var/list/forced_radios)
-
/* ###### Prepare the radio connection ###### */
var/display_freq = freq
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 65ab5023c7..b3840d313f 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -287,7 +287,7 @@ var/global/list/default_medbay_channels = list(
/obj/item/device/radio/proc/autosay(var/message, var/from, var/channel, var/list/zlevels) //BS12 EDIT
var/datum/radio_frequency/connection = null
if(channel && channels && channels.len > 0)
- if (channel == "department")
+ if(channel == "department")
channel = channels[1]
connection = secure_radio_connections[channel]
else
@@ -304,7 +304,7 @@ var/global/list/default_medbay_channels = list(
Broadcast_Message(connection, A,
0, "*garbled automated announcement*", src,
message_to_multilingual(message), from, "Automated Announcement", from, "synthesized voice",
- 4, 0, zlevels, connection.frequency, "states")
+ DATA_FAKE, 0, zlevels, connection.frequency, "states")
// Interprets the message mode when talking into a radio, possibly returning a connection datum
/obj/item/device/radio/proc/handle_message_mode(mob/living/M as mob, list/message_pieces, message_mode)
@@ -363,8 +363,8 @@ var/global/list/default_medbay_channels = list(
if(!istype(message_mode, /datum/radio_frequency))
return FALSE
- var/datum/radio_frequency/connection = message_mode
var/pos_z = get_z(src)
+ var/datum/radio_frequency/connection = message_mode
//#### Tagging the signal with all appropriate identity values ####//
@@ -479,7 +479,6 @@ var/global/list/default_medbay_channels = list(
signal.transmission_method = TRANSMISSION_SUBSPACE
//#### Sending the signal to all subspace receivers ####//
-
for(var/obj/machinery/telecomms/receiver/R in telecomms_list)
R.receive_signal(signal)
@@ -494,7 +493,7 @@ var/global/list/default_medbay_channels = list(
else if(adhoc_fallback) //Less huzzah, we have to fallback
to_chat(loc, "\The [src] pings as it falls back to local radio transmission.")
subspace_transmission = FALSE
-
+
else //Oh well
return FALSE
@@ -536,8 +535,6 @@ var/global/list/default_medbay_channels = list(
if(get_dist(src, M) <= canhear_range)
talk_into(M, message_pieces, null, verb)
-
-
/obj/item/device/radio/proc/receive_range(freq, level)
// check if this radio can receive on the given frequency, and if so,
// what the range is in which mobs will hear the radio
diff --git a/code/modules/alarm/atmosphere_alarm.dm b/code/modules/alarm/atmosphere_alarm.dm
index f19044a6b7..be97493afd 100644
--- a/code/modules/alarm/atmosphere_alarm.dm
+++ b/code/modules/alarm/atmosphere_alarm.dm
@@ -5,7 +5,7 @@
var/list/major_alarms = new()
var/list/map_levels = using_map.get_map_levels(z)
for(var/datum/alarm/A in visible_alarms())
- if(z && (z && !(A.origin?.z in map_levels)))
+ if(z && !(A.origin?.z in map_levels))
continue
if(A.max_severity() > 1)
major_alarms.Add(A)
@@ -15,7 +15,7 @@
var/list/minor_alarms = new()
var/list/map_levels = using_map.get_map_levels(z)
for(var/datum/alarm/A in visible_alarms())
- if(z && (z && !(A.origin?.z in map_levels)))
+ if(z && !(A.origin?.z in map_levels))
continue
if(A.max_severity() == 1)
minor_alarms.Add(A)
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 8677e8f880..e98522ac00 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -377,7 +377,7 @@
var/turf/T = join_props["turf"]
var/join_message = join_props["msg"]
- var/announce_channel = join_props["channel"] || "Common" // VOREStation Add
+ var/announce_channel = join_props["channel"] || "Common"
if(!T || !join_message)
return 0
diff --git a/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm b/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm
index 2b25951926..894173ec72 100644
--- a/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm
+++ b/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm
@@ -46,7 +46,7 @@
to_chat(user, "The crew monitor doesn't seem like it'll work here.")
if(program)
program.kill_program()
- else if(ui)
+ if(ui)
ui.close()
return
diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi
index 99f3f4fd4c..5555d0e1ad 100644
Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ