cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-06 15:32:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into say_code_fix

Browse Source 
Conflicts:
	code/modules/mob/hear_say.dm
This commit is contained in:
Ccomp5950
2014-04-22 18:25:03 -05:00
parent 186e78d2cf dc715a4560
commit 9f3e58cfe9
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/mob/hear_say.dm
View File

@@ -42,7 +42,7 @@
else
src << "<span class='name'>[speaker_name]</span>[alt_name] talks but you cannot hear them."
else
src << "<span class='game say'><span class='name'>[speaker_name]</span>[alt_name] [track]<span class='[style]'>[verb], <span class='message'>\"[message]\"</span></span></span>"
src << "<span class='game say'><span class='name'>[speaker_name]</span>[alt_name] [track][verb], <span class='message'><span class='[style]'>\"[message]\"</span></span></span>"
@@ -110,11 +110,12 @@
if(prob(20))
src << "<span class='warning'>You feel your headset vibrate but can hear nothing from it!</span>"
else if(track)
src << "[part_a][track][part_b]<span class=\"[style]\"> [verb], \"[message]\"</span></span></span>"
src << "[part_a][track][part_b][verb], <span class=\"[style]\">\"[message]\"</span></span></span>"
else
src << "[part_a][speaker_name][part_b]<span class=\"[style]\"> [verb], \"[message]\"</span></span></span>"
src << "[part_a][speaker_name][part_b][verb], <span class=\"[style]\">\"[message]\"</span></span></span>"
/mob/proc/hear_sleep(var/message)
var/heard = ""
if(prob(15))
var/list/punctuation = list(",", "!", ".", ";", "?")
var/list/messages = text2list(message, " ")
@@ -126,12 +127,7 @@
heardword = copytext(heardword,1,lentext(heardword))
var/heard = "<span class = 'game_say'>...You hear something about...[heardword]</span>"
src << heard
else
var/heard = "<span class = 'game_say'>...<i>You almost hear someone talking</i>...</span>"
src << heard
src << heard