cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 22:19:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Megaphones fix

Browse Source 
Megaphones now use say() instead of a custom override.
say() verb for living mods now accept spans as a third argument.
This commit is contained in:
GunHog
2016-05-26 17:54:46 -05:00
parent 70380bc0d5
commit fc386b3b0c
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/megaphone.dm
+2 -2
View File
@@ -39,12 +39,12 @@
if ((src.loc == user && user.stat == 0))
if(emagged)
if(insults)
user.audible_message("<B>[user.GetVoice()]</B> broadcasts, <span class='[voicespan]'>\"[pick(insultmsg)]\"</span>")
user.say(pick(insultmsg),"machine", list(voicespan))
insults--
else
user << "<span class='warning'>*BZZZZzzzzzt*</span>"
else
user.audible_message("<B>[user.GetVoice()]</B> broadcasts, <span class='[voicespan]'>\"[message]\"</span>")
user.say(message,"machine", list(voicespan))
playsound(loc, 'sound/items/megaphone.ogg', 100, 0, 1)
spamcheck = world.time + 50
code/modules/mob/living/say.dm
+4 -5
View File
@@ -58,7 +58,7 @@ var/list/department_radio_keys = list(
var/list/crit_allowed_modes = list(MODE_WHISPER,MODE_CHANGELING,MODE_ALIEN)
/mob/living/say(message, bubble_type,)
/mob/living/say(message, bubble_type,var/list/spans = list())
message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
if(stat == DEAD)
@@ -92,7 +92,6 @@ var/list/crit_allowed_modes = list(MODE_WHISPER,MODE_CHANGELING,MODE_ALIEN)
if(message_mode != MODE_WHISPER) //whisper() calls treat_message(); double process results in "hisspering"
message = treat_message(message)
var/spans = list()
spans += get_spans()
if(!message)
@@ -219,7 +218,7 @@ var/list/crit_allowed_modes = list(MODE_WHISPER,MODE_CHANGELING,MODE_ALIEN)
if(1)
if(prob(40))
M << "<i><font color=#800080>We can faintly sense an outsider trying to communicate through the hivemind...</font></i>"
return 1
return 1
if(2)
var/msg = "<i><font color=#800080><b>[mind.changeling.changelingID]:</b> [message]</font></i>"
log_say("[mind.changeling.changelingID]/[src.key] : [message]")
@@ -229,7 +228,7 @@ var/list/crit_allowed_modes = list(MODE_WHISPER,MODE_CHANGELING,MODE_ALIEN)
else
switch(M.lingcheck())
if(3)
M << msg
M << msg
if(2)
M << msg
if(1)
@@ -289,7 +288,7 @@ var/list/crit_allowed_modes = list(MODE_WHISPER,MODE_CHANGELING,MODE_ALIEN)
return NOPASS
return 0
/mob/living/lingcheck() //1 is ling w/ no hivemind. 2 is ling w/hivemind. 3 is ling victim being linked into hivemind.
/mob/living/lingcheck() //1 is ling w/ no hivemind. 2 is ling w/hivemind. 3 is ling victim being linked into hivemind.
if(mind && mind.changeling)
if(mind.changeling.changeling_speak)
return 2