Merge pull request #38553 from AutomaticFrenzy/patch/aghost-saymode

Allow admin ghosts to use .p and .d say prefixes
This commit is contained in:
Jordan Brown
2018-06-18 14:15:54 -04:00
committed by letterjay
parent 389e9584a3
commit 684ceb2125
3 changed files with 22 additions and 11 deletions
+12 -1
View File
@@ -1,9 +1,20 @@
/mob/dead/observer/say(message)
message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
if (!message)
return
var/message_mode = get_message_mode(message)
if(client && (message_mode == "admin" || message_mode == "deadmin"))
message = copytext(message, 3)
if(findtext(message, " ", 1, 2))
message = copytext(message, 2)
if(message_mode == "admin")
client.cmd_admin_say(message)
else if(message_mode == "deadmin")
client.dsay(message)
return
log_talk(src,"Ghost/[src.key] : [message]", LOGSAY)
if(check_emote(message))
-10
View File
@@ -316,16 +316,6 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
return 1
/mob/living/proc/get_message_mode(message)
var/key = copytext(message, 1, 2)
if(key == "#")
return MODE_WHISPER
else if(key == ";")
return MODE_HEADSET
else if(length(message) > 2 && (key in GLOB.department_radio_prefixes))
var/key_symbol = lowertext(copytext(message, 2, 3))
return GLOB.department_radio_keys[key_symbol]
/mob/living/proc/get_key(message)
var/key = copytext(message, 1, 2)
if(key in GLOB.department_radio_prefixes)
+10
View File
@@ -83,3 +83,13 @@
/mob/proc/lingcheck()
return LINGHIVE_NONE
/mob/proc/get_message_mode(message)
var/key = copytext(message, 1, 2)
if(key == "#")
return MODE_WHISPER
else if(key == ";")
return MODE_HEADSET
else if(length(message) > 2 && (key in GLOB.department_radio_prefixes))
var/key_symbol = lowertext(copytext(message, 2, 3))
return GLOB.department_radio_keys[key_symbol]