cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some fixes saycode cleanups

Browse Source 
Moved the verb check from hear to the speaker

Spellcheck on hulk so Dragor doesn't beat me up.
This commit is contained in:
Ccomp5950
2014-04-09 23:34:18 -05:00
parent 46704a436b
commit 6056b5dc3d
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,13 +11,6 @@
verb = language.speech_verb verb = language.speech_verb
style = language.colour style = language.colour
if(verb == "says")
var/ending = copytext(message, length(message))
if(ending=="!")
verb="exclaims"
if(ending=="?")
verb="asks"
var/speaker_name = speaker.name var/speaker_name = speaker.name
if(istype(speaker, /mob/living/carbon/human)) if(istype(speaker, /mob/living/carbon/human))
var/mob/living/carbon/human/H = speaker var/mob/living/carbon/human/H = speaker
@@ -58,13 +51,6 @@
if(hard_to_hear) if(hard_to_hear)
message = stars(message) message = stars(message)
if(verb == "says")
var/ending = copytext(message,length(message))
if(ending=="!")
verb="exclaims"
if(ending=="?")
verb="asks"
var/speaker_name = speaker.name var/speaker_name = speaker.name
if(istype(speaker, /mob/living/carbon/human)) if(istype(speaker, /mob/living/carbon/human))
var/mob/living/carbon/human/H = speaker var/mob/living/carbon/human/H = speaker

8
code/modules/mob/living/carbon/human/say.dm
View File

@@ -55,6 +55,12 @@
if(!message || stat) if(!message || stat)
return return
var/ending = copytext(message, length(message))
if(ending=="!")
verb=pick("exclaims","shouts","yells")
if(ending=="?")
verb="asks"
var/list/obj/item/used_radios = new var/list/obj/item/used_radios = new
switch (message_mode) switch (message_mode)
@@ -180,7 +186,7 @@
if((HULK in mutations) && health >= 25 && length(message)) if((HULK in mutations) && health >= 25 && length(message))
message = "[uppertext(message)]!!!" message = "[uppertext(message)]!!!"
verb = pick("yells","roars","hollars") verb = pick("yells","roars","hollers")
handled = 1 handled = 1
if(slurring) if(slurring)
message = slur(message) message = slur(message)