From c05c74734e18cabed3242a3377b13bd747e04abb Mon Sep 17 00:00:00 2001 From: Return <110273561+ReturnToZender@users.noreply.github.com> Date: Wed, 3 Sep 2025 14:28:50 -0500 Subject: [PATCH] Merges Spinwarder+Interslavic, Chitinclick+Buzzwords (#4527) ## About The Pull Request Merges Chitinclick and Buzzwords into one language, as well as Interslavic and Spinwarder, as they overlap with each other. ## Why It's Good For The Game These languages are effectively the same, and we want players taking these languages to be able to communicate with each other, to form comraderie amongst themselves ## Proof Of Testing
Screenshots/Videos
## Changelog :cl: ReturnToZender qol: Merges Interslavic and Spinwarder into one language qol: Merges Chitinclick and Buzzwords into one bug language /:cl: --- .../antagonists/fugitive/hunters/hunter.dm | 6 ++--- .../surgery/organs/internal/tongue/_tongue.dm | 2 +- .../code/modules/language/language_holder.dm | 8 +++---- .../ancient_milsim/ghost_spawner.dm | 2 +- .../modules/black_mesa/code/ghost_spawners.dm | 2 +- .../modules/language/chitinclick.dm | 2 +- .../modules/language/panslavic.dm | 23 ------------------ .../modules/encounters/code/nri_raiders.dm | 8 +++---- modular_skyrat/modules/novaya_ert/code/ert.dm | 2 +- .../modules/languages/_language_holder.dm | 12 +++++----- .../code/modules/languages/panslavic.dm | 24 +++++++++++++++++-- tgstation.dme | 1 - 12 files changed, 44 insertions(+), 48 deletions(-) delete mode 100644 modular_skyrat/modules/customization/modules/language/panslavic.dm diff --git a/code/modules/antagonists/fugitive/hunters/hunter.dm b/code/modules/antagonists/fugitive/hunters/hunter.dm index 362d81e2540..988abcddabb 100644 --- a/code/modules/antagonists/fugitive/hunters/hunter.dm +++ b/code/modules/antagonists/fugitive/hunters/hunter.dm @@ -73,14 +73,14 @@ if(backstory == HUNTER_PACK_RUSSIAN) var/mob/living/owner_mob = mob_override || owner.current //bubber edit; spinwarder removed - owner_mob.grant_language(/datum/language/panslavic, source = LANGUAGE_BOUNTYHUNTER) - owner_mob.set_active_language(/datum/language/panslavic) + owner_mob.grant_language(/datum/language/spinwarder, source = LANGUAGE_BOUNTYHUNTER) + owner_mob.set_active_language(/datum/language/spinwarder) //edit end /datum/antagonist/fugitive_hunter/remove_innate_effects(mob/living/mob_override) var/mob/living/owner_mob = mob_override || owner.current // BUBBER EDIT CHANGE BEGIN: spinwarder removed - owner_mob.remove_language(/datum/language/panslavic, source = LANGUAGE_BOUNTYHUNTER) + owner_mob.remove_language(/datum/language/spinwarder, source = LANGUAGE_BOUNTYHUNTER) // BUBBER EDIT CHANGE END /datum/team/fugitive_hunters diff --git a/code/modules/surgery/organs/internal/tongue/_tongue.dm b/code/modules/surgery/organs/internal/tongue/_tongue.dm index 058c6c1f932..324d215d36e 100644 --- a/code/modules/surgery/organs/internal/tongue/_tongue.dm +++ b/code/modules/surgery/organs/internal/tongue/_tongue.dm @@ -77,7 +77,7 @@ return list( /datum/language/common, /datum/language/uncommon, - /datum/language/panslavic, //bubber edit; spinwarder removed + /datum/language/spinwarder, //bubber edit; spinwarder removed /datum/language/draconic, /datum/language/codespeak, /datum/language/monkey, diff --git a/modular_skyrat/master_files/code/modules/language/language_holder.dm b/modular_skyrat/master_files/code/modules/language/language_holder.dm index 7106f678a87..272abfba058 100644 --- a/modular_skyrat/master_files/code/modules/language/language_holder.dm +++ b/modular_skyrat/master_files/code/modules/language/language_holder.dm @@ -75,7 +75,7 @@ GLOBAL_DATUM_INIT(language_holder_adjustor, /datum/language_holder_adjustor, new /datum/language/voltaic = list(LANGUAGE_ATOM), /datum/language/nekomimetic = list(LANGUAGE_ATOM), /datum/language/gutter = list(LANGUAGE_ATOM), - /datum/language/panslavic = list(LANGUAGE_ATOM), + /datum/language/spinwarder = list(LANGUAGE_ATOM), /datum/language/skrell = list(LANGUAGE_ATOM), /datum/language/spacer = list(LANGUAGE_ATOM), /datum/language/xerxian = list(LANGUAGE_ATOM), @@ -95,7 +95,7 @@ GLOBAL_DATUM_INIT(language_holder_adjustor, /datum/language_holder_adjustor, new /datum/language/akulan = list(LANGUAGE_ATOM), /datum/language/marish = list(LANGUAGE_ATOM), /datum/language/carptongue = list(LANGUAGE_ATOM), - /datum/language/chitinclick = list(LANGUAGE_ATOM), + /datum/language/buzzwords = list(LANGUAGE_ATOM), ) spoken_languages = list( /datum/language/common = list(LANGUAGE_ATOM), @@ -107,7 +107,7 @@ GLOBAL_DATUM_INIT(language_holder_adjustor, /datum/language_holder_adjustor, new /datum/language/voltaic = list(LANGUAGE_ATOM), /datum/language/nekomimetic = list(LANGUAGE_ATOM), /datum/language/gutter = list(LANGUAGE_ATOM), - /datum/language/panslavic = list(LANGUAGE_ATOM), + /datum/language/spinwarder = list(LANGUAGE_ATOM), /datum/language/skrell = list(LANGUAGE_ATOM), /datum/language/spacer = list(LANGUAGE_ATOM), /datum/language/xerxian = list(LANGUAGE_ATOM), @@ -127,5 +127,5 @@ GLOBAL_DATUM_INIT(language_holder_adjustor, /datum/language_holder_adjustor, new /datum/language/akulan = list(LANGUAGE_ATOM), /datum/language/marish = list(LANGUAGE_ATOM), /datum/language/carptongue = list(LANGUAGE_ATOM), - /datum/language/chitinclick = list(LANGUAGE_ATOM), + /datum/language/buzzwords = list(LANGUAGE_ATOM), ) diff --git a/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/ghost_spawner.dm b/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/ghost_spawner.dm index 7d7a001f100..d6cc82130b4 100644 --- a/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/ghost_spawner.dm +++ b/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/ghost_spawner.dm @@ -17,7 +17,7 @@ /obj/effect/mob_spawn/ghost_role/human/ancient_milsim/special(mob/living/carbon/human/spawned_human) . = ..() - spawned_human.grant_language(/datum/language/panslavic, source = LANGUAGE_SPAWNER) + spawned_human.grant_language(/datum/language/spinwarder, source = LANGUAGE_SPAWNER) apply_codename(spawned_human) /obj/effect/mob_spawn/ghost_role/human/ancient_milsim/post_transfer_prefs(mob/living/carbon/human/spawned_human) diff --git a/modular_skyrat/modules/black_mesa/code/ghost_spawners.dm b/modular_skyrat/modules/black_mesa/code/ghost_spawners.dm index 416def1973a..e856f22eb57 100644 --- a/modular_skyrat/modules/black_mesa/code/ghost_spawners.dm +++ b/modular_skyrat/modules/black_mesa/code/ghost_spawners.dm @@ -182,7 +182,7 @@ /obj/effect/mob_spawn/ghost_role/human/black_mesa/hecu/leader/special(mob/living/carbon/human/spawned_human) . = ..() spawned_human.grant_language(/datum/language/uncommon, source = LANGUAGE_SPAWNER) - spawned_human.grant_language(/datum/language/panslavic, source = LANGUAGE_SPAWNER) + spawned_human.grant_language(/datum/language/spinwarder, source = LANGUAGE_SPAWNER) spawned_human.grant_language(/datum/language/yangyu, source = LANGUAGE_SPAWNER) /datum/outfit/hecu/leader diff --git a/modular_skyrat/modules/customization/modules/language/chitinclick.dm b/modular_skyrat/modules/customization/modules/language/chitinclick.dm index c8eba66ba8c..dd24d62ca73 100644 --- a/modular_skyrat/modules/customization/modules/language/chitinclick.dm +++ b/modular_skyrat/modules/customization/modules/language/chitinclick.dm @@ -1,4 +1,4 @@ -/datum/language/chitinclick +/datum/language/buzzwords name = "Chitinclick" desc = "A popular non-Human language that finds extensive use by various types of anthropomorphic invertebrates. It consists of complex flutters, chittering, antenna movements, and sparse guttural syllables." key = "C" diff --git a/modular_skyrat/modules/customization/modules/language/panslavic.dm b/modular_skyrat/modules/customization/modules/language/panslavic.dm deleted file mode 100644 index 14066777278..00000000000 --- a/modular_skyrat/modules/customization/modules/language/panslavic.dm +++ /dev/null @@ -1,23 +0,0 @@ -/datum/language/panslavic - name = "Pan-Slavic" - desc = "An elaborate mix of various Slavic languages with similar properties that has long since become the official language of the NRI, with a steady amount of relevance in TerraGov colonies with Slavic descendants and various types of trading posts and spaceports across Human space - it even managed to find a niche in communication with other species." - key = "P" - flags = TONGUELESS_SPEECH - syllables = list( - "do", "ber", "sve", "tel", "po", "ča", "sen", "jag", "nje", "sla", "do", - "led", "klo", "ba", "sa", "pa", "ra", "diž", "nik", "vol", "ko", "vi", "ži", - "ra", "fa", "zob", "na", "ščet", "ka", "zgo", "do", "vi", "na", "zah", "ra", - "da", "tam", "ten", "led", "nič", "ka", "zá", "pis", "ník", "krá", "va", - "ku", "ku", "ři", "ce", "ve", "přo", "vé", "ma", "so", "mo", "cný", "pi", - "kan", "tní", "o", "ran", "žo", "vý", "vlast", "nos", "ti", "hvi", "li", "na", - "mіs", "ce", "vij", "snі", "da", "nok", "kva", "so", "lja", "char", "ka", "mіs", - "jacj", "gar", "na", "ne", "pra", "vil", "niy", "min", "dal", "io", "lam", "pa", - "i", "zo", "bra", "ze", "ni", "e", "is", "kus", "stvo", "bi", "bli", "o", "te", - "ka", "bas", "se", "in", "fut", "bol", "o", "fis", "po", "che", "mu", "ru", - "bash", "ka", "kuh", "nia", "rech", "nik", "gor", "ko", "pi", "le", "ti", "na", - "ko", "ni", "spa", "va", "ha", "so", "ba", "sve", "ska", "nov", "cha", "nik", - "zem", "lya", "kan", "ce", "la", "ri", "јa", "snezh", "ne", "pa", "da", "vi", "ne" - ) - icon_state = "panslavic" - icon = 'modular_skyrat/master_files/icons/misc/language.dmi' - default_priority = 95 diff --git a/modular_skyrat/modules/encounters/code/nri_raiders.dm b/modular_skyrat/modules/encounters/code/nri_raiders.dm index d4ac2d5aa19..bdecce7bb37 100644 --- a/modular_skyrat/modules/encounters/code/nri_raiders.dm +++ b/modular_skyrat/modules/encounters/code/nri_raiders.dm @@ -200,7 +200,7 @@ GLOBAL_VAR(first_officer) /obj/effect/mob_spawn/ghost_role/human/nri_raider/special(mob/living/carbon/human/spawned_human) . = ..() - spawned_human.grant_language(/datum/language/panslavic, source = LANGUAGE_SPAWNER) + spawned_human.grant_language(/datum/language/spinwarder, source = LANGUAGE_SPAWNER) apply_codename(spawned_human) /obj/effect/mob_spawn/ghost_role/human/nri_raider/post_transfer_prefs(mob/living/carbon/human/spawned_human) @@ -233,7 +233,7 @@ GLOBAL_VAR(first_officer) spawned_human.mind.add_antag_datum(/datum/antagonist/cop) spawned_human.grant_language(/datum/language/uncommon, source = LANGUAGE_SPAWNER) spawned_human.grant_language(/datum/language/yangyu, source = LANGUAGE_SPAWNER) - spawned_human.grant_language(/datum/language/panslavic, source = LANGUAGE_SPAWNER) + spawned_human.grant_language(/datum/language/spinwarder, source = LANGUAGE_SPAWNER) // if this is the first officer, keep a reference to them if(!GLOB.first_officer) @@ -576,13 +576,13 @@ GLOBAL_VAR(first_officer) var/mob/living/owner_mob = mob_override || owner.current var/datum/language_holder/holder = owner_mob.get_language_holder() holder.grant_language(/datum/language/uncommon, TRUE, TRUE, LANGUAGE_PIRATE) - holder.grant_language(/datum/language/panslavic, TRUE, TRUE, LANGUAGE_PIRATE) + holder.grant_language(/datum/language/spinwarder, TRUE, TRUE, LANGUAGE_PIRATE) holder.grant_language(/datum/language/yangyu, TRUE, TRUE, LANGUAGE_PIRATE) /datum/antagonist/cop/remove_innate_effects(mob/living/mob_override) var/mob/living/owner_mob = mob_override || owner.current owner_mob.remove_language(/datum/language/uncommon, TRUE, TRUE, LANGUAGE_PIRATE) - owner_mob.remove_language(/datum/language/panslavic, TRUE, TRUE, LANGUAGE_PIRATE) + owner_mob.remove_language(/datum/language/spinwarder, TRUE, TRUE, LANGUAGE_PIRATE) owner_mob.remove_language(/datum/language/yangyu, TRUE, TRUE, LANGUAGE_PIRATE) return ..() diff --git a/modular_skyrat/modules/novaya_ert/code/ert.dm b/modular_skyrat/modules/novaya_ert/code/ert.dm index 9590acfd1bf..20849825bb8 100644 --- a/modular_skyrat/modules/novaya_ert/code/ert.dm +++ b/modular_skyrat/modules/novaya_ert/code/ert.dm @@ -23,7 +23,7 @@ var/mob/living/carbon/human/H = owner.current H.set_species(/datum/species/human) - H.grant_language(/datum/language/panslavic) + H.grant_language(/datum/language/spinwarder) H.grant_language(/datum/language/schechi) return TRUE diff --git a/modular_zubbers/code/modules/languages/_language_holder.dm b/modular_zubbers/code/modules/languages/_language_holder.dm index bb599d92f4c..7075f474c57 100644 --- a/modular_zubbers/code/modules/languages/_language_holder.dm +++ b/modular_zubbers/code/modules/languages/_language_holder.dm @@ -12,19 +12,19 @@ /datum/language_holder/panslavic understood_languages = list( /datum/language/common = list(LANGUAGE_ATOM), - /datum/language/panslavic = list(LANGUAGE_ATOM), + /datum/language/spinwarder = list(LANGUAGE_ATOM), ) spoken_languages = list( /datum/language/common = list(LANGUAGE_ATOM), - /datum/language/panslavic = list(LANGUAGE_ATOM), + /datum/language/spinwarder = list(LANGUAGE_ATOM), ) - selected_language = /datum/language/panslavic + selected_language = /datum/language/spinwarder /datum/language_holder/panslavic_exclusive understood_languages = list( - /datum/language/panslavic = list(LANGUAGE_ATOM), + /datum/language/spinwarder = list(LANGUAGE_ATOM), ) spoken_languages = list( - /datum/language/panslavic = list(LANGUAGE_ATOM), + /datum/language/spinwarder = list(LANGUAGE_ATOM), ) - selected_language = /datum/language/panslavic + selected_language = /datum/language/spinwarder diff --git a/modular_zubbers/code/modules/languages/panslavic.dm b/modular_zubbers/code/modules/languages/panslavic.dm index f0143f0c6ac..3a3514acac8 100644 --- a/modular_zubbers/code/modules/languages/panslavic.dm +++ b/modular_zubbers/code/modules/languages/panslavic.dm @@ -1,3 +1,23 @@ -/datum/language/panslavic +/datum/language/spinwarder name = "Interslavic" - desc = "Originally created on earth in 2006, Interslavic has gone through many reforms during the years, especially after the slavic exodus from Earth and Sol. In the times of the NRI, it has also had components from non-slavic species that exist in the NRI adopted into the language, though the main components derive from Russian, Serbian, and Belarussian." + desc = "An elaborate mix of various Slavic languages with similar properties that has long since become the official language of the NRI, with a steady amount of relevance in TerraGov colonies with Slavic descendants and various types of trading posts and spaceports across Human space - it even managed to find a niche in communication with other species." + key = "P" + flags = TONGUELESS_SPEECH + syllables = list( + "do", "ber", "sve", "tel", "po", "ča", "sen", "jag", "nje", "sla", "do", + "led", "klo", "ba", "sa", "pa", "ra", "diž", "nik", "vol", "ko", "vi", "ži", + "ra", "fa", "zob", "na", "ščet", "ka", "zgo", "do", "vi", "na", "zah", "ra", + "da", "tam", "ten", "led", "nič", "ka", "zá", "pis", "ník", "krá", "va", + "ku", "ku", "ři", "ce", "ve", "přo", "vé", "ma", "so", "mo", "cný", "pi", + "kan", "tní", "o", "ran", "žo", "vý", "vlast", "nos", "ti", "hvi", "li", "na", + "mіs", "ce", "vij", "snі", "da", "nok", "kva", "so", "lja", "char", "ka", "mіs", + "jacj", "gar", "na", "ne", "pra", "vil", "niy", "min", "dal", "io", "lam", "pa", + "i", "zo", "bra", "ze", "ni", "e", "is", "kus", "stvo", "bi", "bli", "o", "te", + "ka", "bas", "se", "in", "fut", "bol", "o", "fis", "po", "che", "mu", "ru", + "bash", "ka", "kuh", "nia", "rech", "nik", "gor", "ko", "pi", "le", "ti", "na", + "ko", "ni", "spa", "va", "ha", "so", "ba", "sve", "ska", "nov", "cha", "nik", + "zem", "lya", "kan", "ce", "la", "ri", "јa", "snezh", "ne", "pa", "da", "vi", "ne" + ) + icon_state = "panslavic" + icon = 'modular_skyrat/master_files/icons/misc/language.dmi' + default_priority = 95 diff --git a/tgstation.dme b/tgstation.dme index 6859817dce0..a65264c430e 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7741,7 +7741,6 @@ #include "modular_skyrat\modules\customization\modules\language\common.dm" #include "modular_skyrat\modules\customization\modules\language\gutter.dm" #include "modular_skyrat\modules\customization\modules\language\mothic.dm" -#include "modular_skyrat\modules\customization\modules\language\panslavic.dm" #include "modular_skyrat\modules\customization\modules\language\piratespeak.dm" #include "modular_skyrat\modules\customization\modules\language\shadowtongue.dm" #include "modular_skyrat\modules\customization\modules\language\skrell.dm"