Merge pull request #20498 from phil235/RewriteMegaphone

Megaphones no longer have special say code to handle their effect.
This commit is contained in:
Joan Lung
2016-09-14 16:35:01 -04:00
committed by GitHub
5 changed files with 18 additions and 39 deletions
+4
View File
@@ -24,3 +24,7 @@
var/obj/item/organ/tongue/T = getorganslot("tongue")
if(T)
. |= T.get_spans()
var/obj/item/I = get_active_held_item()
if(I)
. |= I.get_held_item_speechspans(src)
+2 -1
View File
@@ -92,11 +92,12 @@ 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)
spans += get_spans()
if(!message)
return
spans += get_spans()
//Log of what we've said, plain message, no spans or junk
say_log += message