diff --git a/code/__defines/span_vr.dm b/code/__defines/span_vr.dm
index 1a3bc78b37..2793d0546f 100644
--- a/code/__defines/span_vr.dm
+++ b/code/__defines/span_vr.dm
@@ -10,7 +10,7 @@
#define span_comradio(str) ("" + str + "")
#define span_syndradio(str) ("" + str + "")
-#define span_centradio(str) ("" + str + ""
+#define span_centradio(str) ("" + str + "")
#define span_airadio(str) ("" + str + "")
#define span_entradio(str) ("" + str + "")
@@ -18,7 +18,7 @@
#define span_engradio(str) ("" + str + "")
#define span_medradio(str) ("" + str + "")
#define span_sciradio(str) ("" + str + "")
-#define span_supradio(str) ("" + str + ""
+#define span_supradio(str) ("" + str + "")
#define span_srvradio(str) ("" + str + "")
#define span_expradio(str) ("" + str + "")
diff --git a/code/modules/admin/verbs/modify_robot.dm b/code/modules/admin/verbs/modify_robot.dm
index 619da6ebcb..567a0d2d18 100644
--- a/code/modules/admin/verbs/modify_robot.dm
+++ b/code/modules/admin/verbs/modify_robot.dm
@@ -3,7 +3,7 @@
set name = "Modify Robot Module"
set desc = "Allows to add or remove modules to/from robots."
set category = "Admin"
- if(!check_rights(R_ADMIN))
+ if(!check_rights(R_ADMIN|R_FUN|R_VAREDIT))
return
if(!istype(target) || !target.module)
diff --git a/code/modules/admin/verbs/resize.dm b/code/modules/admin/verbs/resize.dm
index bc65d31b66..d8bc5be57c 100644
--- a/code/modules/admin/verbs/resize.dm
+++ b/code/modules/admin/verbs/resize.dm
@@ -2,7 +2,7 @@
set name = "Resize"
set desc = "Resizes any living mob without any restrictions on size."
set category = "Fun"
- if(!check_rights(R_ADMIN, R_FUN, R_VAREDIT))
+ if(!check_rights(R_ADMIN|R_FUN|R_VAREDIT))
return
var/size_multiplier = tgui_input_number(usr, "Input size multiplier.", "Resize", 1)
diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm
index 991ba97fcf..9603bee838 100644
--- a/code/modules/mob/hear_say.dm
+++ b/code/modules/mob/hear_say.dm
@@ -218,37 +218,47 @@
return "\[[time2text(world.timeofday, "hh:mm")]\]"
/mob/proc/on_hear_radio(part_a, part_b, speaker_name, track, part_c, formatted, part_d, part_e)
+ var/time = ""
+ if(client.prefs.chat_timestamp)
+ time = say_timestamp()
var/final_message = "[part_b][speaker_name][part_c][formatted][part_d]"
if(check_mentioned(formatted) && is_preference_enabled(/datum/client_preference/check_mention))
- final_message = "[part_a][final_message][part_e]"
+ final_message = "[time][part_a][final_message][part_e]"
else
- final_message = "[part_a][final_message][part_e]"
+ final_message = "[time][part_a][final_message][part_e]"
to_chat(src, final_message)
/mob/observer/dead/on_hear_radio(part_a, part_b, speaker_name, track, part_c, formatted, part_d, part_e)
+ var/time = ""
+ if(client.prefs.chat_timestamp)
+ time = say_timestamp()
var/final_message = "[part_b][track][part_c][formatted][part_d]"
if(check_mentioned(formatted) && is_preference_enabled(/datum/client_preference/check_mention))
- final_message = "[part_a][final_message][part_e]"
+ final_message = "[time][part_a][final_message][part_e]"
else
- final_message = "[part_a][final_message][part_e]"
+ final_message = "[time][part_a][final_message][part_e]"
to_chat(src, final_message)
/mob/living/silicon/on_hear_radio(part_a, part_b, speaker_name, track, part_c, formatted, part_d, part_e)
- var/time = say_timestamp()
+ var/time = ""
+ if(client.prefs.chat_timestamp)
+ time = say_timestamp()
var/final_message = "[part_b][speaker_name][part_c][formatted][part_d]"
if(check_mentioned(formatted) && is_preference_enabled(/datum/client_preference/check_mention))
- final_message = "[part_a][time][final_message][part_e]"
+ final_message = "[time][part_a][final_message][part_e]"
else
- final_message = "[part_a][time][final_message][part_e]"
+ final_message = "[time][part_a][final_message][part_e]"
to_chat(src, final_message)
/mob/living/silicon/ai/on_hear_radio(part_a, part_b, speaker_name, track, part_c, formatted, part_d, part_e)
- var/time = say_timestamp()
+ var/time = ""
+ if(client.prefs.chat_timestamp)
+ time = say_timestamp()
var/final_message = "[part_b][track][part_c][formatted][part_d]"
if(check_mentioned(formatted) && is_preference_enabled(/datum/client_preference/check_mention))
- final_message = "[part_a][time][final_message][part_e]"
+ final_message = "[time][part_a][final_message][part_e]"
else
- final_message = "[part_a][time][final_message][part_e]"
+ final_message = "[time][part_a][final_message][part_e]"
to_chat(src, final_message)
/mob/proc/hear_signlang(var/message, var/verb = "gestures", var/verb_understood = "gestures", var/datum/language/language, var/mob/speaker = null, var/speech_type = 1)
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
index 50b1568898..a1f658d236 100644
--- a/interface/stylesheet.dm
+++ b/interface/stylesheet.dm
@@ -133,9 +133,8 @@ h1.alert, h2.alert {color: #000000;}
.say_quote {font-family: Georgia, Verdana, sans-serif;}
.say_quote_italics {font-style: italic; font-family: Georgia, Verdana, sans-serif;}
.terminus {font-family: "Times New Roman", Times, serif, sans-serif}
-.interface {color: #330033;}
-.psionic {color: #993399;} /*YWedit*/
-.spacer {color: #9c660b;} /* VOREStation Add */
+.psionic {color: #993399;}
+.spacer {color: #9c660b;}
.blob {color: #ff950d; font-weight: bold; font-style: italic;}
.teppi {color: #816540; word-spacing:4pt; font-family: "Segoe Script Bold","Segoe Script",sans-serif,Verdana;}
.shadekin {color: #be3cc5; font-size: 150%; font-weight: bold; font-family: "Gabriola", cursive, sans-serif;}