From cf45a23bb4cdbfd7a6cb00fb43cd7a49934e10ff Mon Sep 17 00:00:00 2001 From: shellspeed1 Date: Sat, 17 Sep 2022 00:59:27 -0700 Subject: [PATCH 1/6] adds bellows, mumbles, and crackles as speech verbs --- code/_globalvars/lists/flavor_misc.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index ff5829ff73..0741abc4b4 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -320,7 +320,7 @@ GLOBAL_LIST_INIT(redacted_strings, list("\[REDACTED\]", "\[CLASSIFIED\]", "\[ARC GLOBAL_LIST_INIT(wisdoms, world.file2list("strings/wisdoms.txt")) //LANGUAGE CHARACTER CUSTOMIZATION -GLOBAL_LIST_INIT(speech_verbs, list("default","says","gibbers", "states", "chitters", "chimpers", "declares", "bellows", "buzzes" ,"beeps", "chirps", "clicks", "hisses" ,"poofs" , "puffs", "rattles", "mewls" ,"barks", "blorbles", "squeaks", "squawks", "flutters", "warbles", "caws", "gekkers", "clucks")) +GLOBAL_LIST_INIT(speech_verbs, list("default","says","gibbers", "states", "chitters", "chimpers", "declares", "bellows", "buzzes" ,"beeps", "chirps", "clicks", "hisses" ,"poofs" , "puffs", "rattles", "mewls" ,"barks", "blorbles", "squeaks", "squawks", "flutters", "warbles", "caws", "gekkers", "clucks","mumbles","bellows","crackles")) GLOBAL_LIST_INIT(roundstart_tongues, list("default","human tongue" = /obj/item/organ/tongue, "lizard tongue" = /obj/item/organ/tongue/lizard, "skeleton tongue" = /obj/item/organ/tongue/bone, "fly tongue" = /obj/item/organ/tongue/fly, "ipc tongue" = /obj/item/organ/tongue/robot/ipc, "xeno tongue" = /obj/item/organ/tongue/alien)) /proc/get_roundstart_languages() From 4ddd0e76cc9dc667a108b8fffe0345751ce868fc Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Sat, 17 Sep 2022 19:57:26 -0700 Subject: [PATCH 2/6] Update flavor_misc.dm --- code/_globalvars/lists/flavor_misc.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 0741abc4b4..89813955ad 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -320,7 +320,7 @@ GLOBAL_LIST_INIT(redacted_strings, list("\[REDACTED\]", "\[CLASSIFIED\]", "\[ARC GLOBAL_LIST_INIT(wisdoms, world.file2list("strings/wisdoms.txt")) //LANGUAGE CHARACTER CUSTOMIZATION -GLOBAL_LIST_INIT(speech_verbs, list("default","says","gibbers", "states", "chitters", "chimpers", "declares", "bellows", "buzzes" ,"beeps", "chirps", "clicks", "hisses" ,"poofs" , "puffs", "rattles", "mewls" ,"barks", "blorbles", "squeaks", "squawks", "flutters", "warbles", "caws", "gekkers", "clucks","mumbles","bellows","crackles")) +GLOBAL_LIST_INIT(speech_verbs, list("default","says","gibbers", "states", "chitters", "chimpers", "declares", "bellows", "buzzes" ,"beeps", "chirps", "clicks", "hisses" ,"poofs" , "puffs", "rattles", "mewls" ,"barks", "blorbles", "squeaks", "squawks", "flutters", "warbles", "caws", "gekkers", "clucks","mumbles","crackles")) GLOBAL_LIST_INIT(roundstart_tongues, list("default","human tongue" = /obj/item/organ/tongue, "lizard tongue" = /obj/item/organ/tongue/lizard, "skeleton tongue" = /obj/item/organ/tongue/bone, "fly tongue" = /obj/item/organ/tongue/fly, "ipc tongue" = /obj/item/organ/tongue/robot/ipc, "xeno tongue" = /obj/item/organ/tongue/alien)) /proc/get_roundstart_languages() From e5c562b4bcc48a755252f65278b292435ecf72bf Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 19 Sep 2022 00:59:16 +0000 Subject: [PATCH 3/6] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-15826.yml | 4 ---- html/changelogs/archive/2022-09.yml | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15826.yml diff --git a/html/changelogs/AutoChangeLog-pr-15826.yml b/html/changelogs/AutoChangeLog-pr-15826.yml deleted file mode 100644 index 39769021e0..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15826.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - code_imp: "Auxmos updated to 2.0.0" diff --git a/html/changelogs/archive/2022-09.yml b/html/changelogs/archive/2022-09.yml index bb6e51dab2..b556ae0f7f 100644 --- a/html/changelogs/archive/2022-09.yml +++ b/html/changelogs/archive/2022-09.yml @@ -43,3 +43,6 @@ other langauges. - rscadd: Adds the RBMK reactor from NSV. Credit to Kmc2000 for originally making it. https://github.com/BeeStation/NSV13/pull/828 +2022-09-19: + Putnam3145: + - code_imp: Auxmos updated to 2.0.0 From 4bade2b1c6791af9a2a7fca570aebb00ba2366a1 Mon Sep 17 00:00:00 2001 From: shellspeed1 Date: Sun, 18 Sep 2022 23:10:00 -0700 Subject: [PATCH 4/6] merge conflict fix --- code/_globalvars/lists/flavor_misc.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 89813955ad..162eeffe78 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -321,7 +321,7 @@ GLOBAL_LIST_INIT(wisdoms, world.file2list("strings/wisdoms.txt")) //LANGUAGE CHARACTER CUSTOMIZATION GLOBAL_LIST_INIT(speech_verbs, list("default","says","gibbers", "states", "chitters", "chimpers", "declares", "bellows", "buzzes" ,"beeps", "chirps", "clicks", "hisses" ,"poofs" , "puffs", "rattles", "mewls" ,"barks", "blorbles", "squeaks", "squawks", "flutters", "warbles", "caws", "gekkers", "clucks","mumbles","crackles")) -GLOBAL_LIST_INIT(roundstart_tongues, list("default","human tongue" = /obj/item/organ/tongue, "lizard tongue" = /obj/item/organ/tongue/lizard, "skeleton tongue" = /obj/item/organ/tongue/bone, "fly tongue" = /obj/item/organ/tongue/fly, "ipc tongue" = /obj/item/organ/tongue/robot/ipc, "xeno tongue" = /obj/item/organ/tongue/alien)) +GLOBAL_LIST_INIT(roundstart_tongues, list("default","human tongue" = /obj/item/organ/tongue, "lizard tongue" = /obj/item/organ/tongue/lizard, "skeleton tongue" = /obj/item/organ/tongue/bone, "fly tongue" = /obj/item/organ/tongue/fly, "ipc tongue" = /obj/item/organ/tongue/robot/ipc, "xeno tongue" = /obj/item/organ/tongue/alien/hybrid)) /proc/get_roundstart_languages() var/list/languages = subtypesof(/datum/language) From c881767842f86c150e0b30c2bc53123ccd386278 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 21 Sep 2022 23:32:15 -0500 Subject: [PATCH 5/6] Automatic changelog generation for PR #15852 [ci skip] --- html/changelogs/AutoChangeLog-pr-15852.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15852.yml diff --git a/html/changelogs/AutoChangeLog-pr-15852.yml b/html/changelogs/AutoChangeLog-pr-15852.yml new file mode 100644 index 0000000000..71783c6edd --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15852.yml @@ -0,0 +1,4 @@ +author: "shellspeed1" +delete-after: True +changes: + - rscadd: "Massively buffs talking by adding 3 new speech verbs improving the ability of everyone to scream at each other." From e975d984424020ac52697ab94ec42f2b6545df36 Mon Sep 17 00:00:00 2001 From: Sandstorm Bot <85452301+Sandstorm-Bot@users.noreply.github.com> Date: Thu, 22 Sep 2022 05:09:42 +0000 Subject: [PATCH 6/6] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-15852.yml | 4 ---- html/changelogs/archive/2022-09.yml | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15852.yml diff --git a/html/changelogs/AutoChangeLog-pr-15852.yml b/html/changelogs/AutoChangeLog-pr-15852.yml deleted file mode 100644 index 71783c6edd..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15852.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "shellspeed1" -delete-after: True -changes: - - rscadd: "Massively buffs talking by adding 3 new speech verbs improving the ability of everyone to scream at each other." diff --git a/html/changelogs/archive/2022-09.yml b/html/changelogs/archive/2022-09.yml index b556ae0f7f..1cb1de1497 100644 --- a/html/changelogs/archive/2022-09.yml +++ b/html/changelogs/archive/2022-09.yml @@ -46,3 +46,7 @@ 2022-09-19: Putnam3145: - code_imp: Auxmos updated to 2.0.0 +2022-09-22: + shellspeed1: + - rscadd: Massively buffs talking by adding 3 new speech verbs improving the ability + of everyone to scream at each other.