From 7ead9885170240eaf5f760e5678b3de460a6d3d3 Mon Sep 17 00:00:00 2001 From: SvartaSvansen Date: Thu, 30 Jul 2015 17:14:42 -0400 Subject: [PATCH 1/4] Teach those lizards some manners! --- code/modules/mob/living/say.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index f7910fd9d77..3cef1e40525 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -90,7 +90,9 @@ var/list/crit_allowed_modes = list(MODE_WHISPER,MODE_CHANGELING,MODE_ALIEN) src << "You find yourself unable to speak!" return - message = treat_message(message) + if(message_mode != MODE_WHISPER) { //whisper() calls treat_message(); double process results in "hisspering" + message = treat_message(message) + } var/spans = list() spans += get_spans() From aed937c4c53825a24f08f1dbd0b8396559a82bcb Mon Sep 17 00:00:00 2001 From: SvartaSvansen Date: Thu, 30 Jul 2015 18:01:57 -0400 Subject: [PATCH 2/4] Oops! Almost forgot the changelog! --- html/changelogs/SvartaSvansen-hisspering.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/SvartaSvansen-hisspering.yml diff --git a/html/changelogs/SvartaSvansen-hisspering.yml b/html/changelogs/SvartaSvansen-hisspering.yml new file mode 100644 index 00000000000..21b0f87561a --- /dev/null +++ b/html/changelogs/SvartaSvansen-hisspering.yml @@ -0,0 +1,6 @@ +author: SvartaSvansen + +delete-after: True + +changes: + - bugfix: "Sent those unruly lizards to mandatory courses in whispering etiquette. Hisspering is now a thing of the past." \ No newline at end of file From decf5495cb22fbcbce4dbcfaaac4d835ce96d0b2 Mon Sep 17 00:00:00 2001 From: SvartaSvansen Date: Thu, 30 Jul 2015 18:09:33 -0400 Subject: [PATCH 3/4] Removed unnecessary braces. --- code/modules/mob/living/say.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 3cef1e40525..d9a69f3c25a 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -90,9 +90,8 @@ var/list/crit_allowed_modes = list(MODE_WHISPER,MODE_CHANGELING,MODE_ALIEN) src << "You find yourself unable to speak!" return - if(message_mode != MODE_WHISPER) { //whisper() calls treat_message(); double process results in "hisspering" + if(message_mode != MODE_WHISPER) //whisper() calls treat_message(); double process results in "hisspering" message = treat_message(message) - } var/spans = list() spans += get_spans() From b5e1b06619f77240ebb1517f3553893789224e80 Mon Sep 17 00:00:00 2001 From: SvartaSvansen Date: Thu, 30 Jul 2015 18:12:56 -0400 Subject: [PATCH 4/4] Must appease the maintainers! --- html/changelogs/SvartaSvansen-hisspering.yml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 html/changelogs/SvartaSvansen-hisspering.yml diff --git a/html/changelogs/SvartaSvansen-hisspering.yml b/html/changelogs/SvartaSvansen-hisspering.yml deleted file mode 100644 index 21b0f87561a..00000000000 --- a/html/changelogs/SvartaSvansen-hisspering.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: SvartaSvansen - -delete-after: True - -changes: - - bugfix: "Sent those unruly lizards to mandatory courses in whispering etiquette. Hisspering is now a thing of the past." \ No newline at end of file