From f5fc16980c07068a1ce1d3404149a779703ee1d1 Mon Sep 17 00:00:00 2001 From: Nerevar <12636964+Nerev4r@users.noreply.github.com> Date: Sat, 5 Oct 2024 17:13:48 -0600 Subject: [PATCH 01/11] awawawawaaaw --- code/_globalvars/~doppler_globalvars/names.dm | 1 + .../languages/code/language_datums.dm | 12 +++ .../code/aquatic_accessories/aquatic_tail.dm | 7 ++ .../code/lizard_accessories/lizard_tail.dm | 2 + .../code/monkey_accessories/monkey_tail.dm | 2 + .../icons/aquatic/aquatic_tail_big.dmi | Bin 0 -> 780 bytes .../strings/names/ramatan_names.txt | 87 ++++++++++++++++++ tgstation.dme | 1 + 8 files changed, 112 insertions(+) create mode 100644 code/_globalvars/~doppler_globalvars/names.dm create mode 100644 modular_doppler/modular_customization/accessories/icons/aquatic/aquatic_tail_big.dmi create mode 100644 modular_doppler/strings/names/ramatan_names.txt diff --git a/code/_globalvars/~doppler_globalvars/names.dm b/code/_globalvars/~doppler_globalvars/names.dm new file mode 100644 index 0000000000000..6314661bdd8df --- /dev/null +++ b/code/_globalvars/~doppler_globalvars/names.dm @@ -0,0 +1 @@ +GLOBAL_LIST_INIT(ramatan_names, world.file2list("modular_doppler/strings/names/ramatan_names.txt")) diff --git a/modular_doppler/languages/code/language_datums.dm b/modular_doppler/languages/code/language_datums.dm index d687018cab1fe..b0b252b0fad7c 100644 --- a/modular_doppler/languages/code/language_datums.dm +++ b/modular_doppler/languages/code/language_datums.dm @@ -59,6 +59,18 @@ icon_state = "movespeak" default_priority = 93 +/datum/language/movespeak/get_random_name( + gender = NEUTER, + name_count = default_name_count, + syllable_min = default_name_syllable_min, + syllable_max = default_name_syllable_max, + force_use_syllables = FALSE, +) + if(force_use_syllables) + return ..() + + return "The [pick(GLOB.ramatan_names)]" + /datum/language/common name = "Sol Common" desc = "And when contact was established, the Admiral waved at the screen and said, \"Mi parolas la lingvon de la Homines!\" - I speak the language of Mankind. A simplified mix of Esperanto and Modern Latin, and the only recognized official language of the Sol Federation. This peculiar constructed language became popular during SolFed's earliest days, and was almost entirely overtaken by other popular tongues - it became widespread through heavy-handed political maneuvering with the help of corporate bureaucrats and other undesirables. Nowadays, it's a near-universal tongue and a must-know for any sentient being that plans to leap forward into space." diff --git a/modular_doppler/modular_customization/accessories/code/aquatic_accessories/aquatic_tail.dm b/modular_doppler/modular_customization/accessories/code/aquatic_accessories/aquatic_tail.dm index c430eb2f0b780..f7286f05239bc 100644 --- a/modular_doppler/modular_customization/accessories/code/aquatic_accessories/aquatic_tail.dm +++ b/modular_doppler/modular_customization/accessories/code/aquatic_accessories/aquatic_tail.dm @@ -16,3 +16,10 @@ /datum/sprite_accessory/tails/fish/akula name = "Azulean" icon_state = "akula" + +/datum/sprite_accessory/tails/fish/big // big .dmi starts here + name = "Sea Slug" + icon = 'modular_doppler/modular_customization/accessories/icons/aquatic/aquatic_tail_big.dmi' + icon_state = "seaslug" + dimension_x = 64 + center = TRUE diff --git a/modular_doppler/modular_customization/accessories/code/lizard_accessories/lizard_tail.dm b/modular_doppler/modular_customization/accessories/code/lizard_accessories/lizard_tail.dm index f638278203df5..cb77cc7ae1f58 100644 --- a/modular_doppler/modular_customization/accessories/code/lizard_accessories/lizard_tail.dm +++ b/modular_doppler/modular_customization/accessories/code/lizard_accessories/lizard_tail.dm @@ -30,6 +30,8 @@ icon = 'modular_doppler/modular_customization/accessories/icons/lizard/lizard_tail_big.dmi' name = "Shadekin (Big)" icon_state = "shadekin_large" + dimension_x = 64 + center = TRUE /datum/sprite_accessory/tails/lizard/big/shadekin_long name = "Shadekin (Big)(Long)" diff --git a/modular_doppler/modular_customization/accessories/code/monkey_accessories/monkey_tail.dm b/modular_doppler/modular_customization/accessories/code/monkey_accessories/monkey_tail.dm index 048edef071160..30c806571255d 100644 --- a/modular_doppler/modular_customization/accessories/code/monkey_accessories/monkey_tail.dm +++ b/modular_doppler/modular_customization/accessories/code/monkey_accessories/monkey_tail.dm @@ -8,3 +8,5 @@ icon = 'modular_doppler/modular_customization/accessories/icons/monkey/monkey_tail_big.dmi' name = "Ring Tail" icon_state = "bigring" + dimension_x = 64 + center = TRUE diff --git a/modular_doppler/modular_customization/accessories/icons/aquatic/aquatic_tail_big.dmi b/modular_doppler/modular_customization/accessories/icons/aquatic/aquatic_tail_big.dmi new file mode 100644 index 0000000000000000000000000000000000000000..5d5644ad1cdab57efa01eba241db386733b5666f GIT binary patch literal 780 zcmV+n1M~ceP)FMdErKQ5c!nU@y+S=N~!^8go0Q2k-ZvX%Q0d!JMQvg8b*k%9#0F-)E zSad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1?TIL{B=UeG32p z0r^QpK~!jg?U}KToG=iE%|-;JV}=*l0V&s>v0~a3c>tOd?Mar{E0NHy-yrop$3122 zY(kNAzndsGzXYP0kFg8>--9tKmFhi<%F0_qEn0iN-$t;7*T)U`0~*A|28I`DuR{^FA?xi|x5DmRH{PWkn9%yomn|JF}Fe|8=6b7I{&7tdD=;cLkSE*G0 zgz_O39-NzeN@Xq~oM@nAY54S?`iIF;FK7!V+1^ zTiYD>5K5dqS^LeG9rMi+i^`22^Z(Y{A5wq<6rcbFC_n-KJ>Un#sGV5ir;|zm0000< KMNUMnLSTXsYHo`F literal 0 HcmV?d00001 diff --git a/modular_doppler/strings/names/ramatan_names.txt b/modular_doppler/strings/names/ramatan_names.txt new file mode 100644 index 0000000000000..2c32a8d6f47e1 --- /dev/null +++ b/modular_doppler/strings/names/ramatan_names.txt @@ -0,0 +1,87 @@ +Sage +Archivist +Justice +Kind +Magician +Reclaimer +Vessel +Fool +Hermit +Wanderer +Nomad +Itinerant +Mendicant +Errant +Seer +Rider +Purifier +Porter +Monk +Corsair +Mercurial +Martyr +Lover +Fighter +Machinist +Keeper +Jester +Enkindler +Duelist +Hunter +Hunted +Demolitionist +Cursed +Alchemist +Brawler +Apostle +Evoker +Driver +Hollow +Shifter +Other +Fixer +Silent +Stranger +Bearer +Devourer +Ascetic +Dancer +Vagabond +Wayfarer +Thief +Harbinger +Intertwined +Weaver +Luminate +Marionette +Mystic +Penitent +Drifter +Sage +Masked +Hidden +Occult +Archon +Blessed +Multitude +Indolent +Evergreen +Preserver +Butcher +Frenzied +Tempest +Healer +Poisonous +Watcher +Seeker +Iron +Psychic +Sleeper +Severed +Veiled +Witch +Untethered +Vestige +Traveler +Speaker +Gunslinger \ No newline at end of file diff --git a/tgstation.dme b/tgstation.dme index 44ba38ac36df0..3e9dd9da1197a 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -605,6 +605,7 @@ #include "code\_globalvars\traits\admin_tooling.dm" #include "code\_globalvars\~doppler_globalvars\bitfields.dm" #include "code\_globalvars\~doppler_globalvars\configuration.dm" +#include "code\_globalvars\~doppler_globalvars\names.dm" #include "code\_globalvars\~doppler_globalvars\objective.dm" #include "code\_globalvars\~doppler_globalvars\religion.dm" #include "code\_js\byjax.dm" From 29b0c9bfc221fc383b8d4935c01ebb62e6f49df7 Mon Sep 17 00:00:00 2001 From: Nerevar <12636964+Nerev4r@users.noreply.github.com> Date: Sat, 5 Oct 2024 23:00:06 -0600 Subject: [PATCH 02/11] try this --- modular_doppler/languages/code/language_datums.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_doppler/languages/code/language_datums.dm b/modular_doppler/languages/code/language_datums.dm index b0b252b0fad7c..2ce7a0183fff6 100644 --- a/modular_doppler/languages/code/language_datums.dm +++ b/modular_doppler/languages/code/language_datums.dm @@ -61,7 +61,7 @@ /datum/language/movespeak/get_random_name( gender = NEUTER, - name_count = default_name_count, + name_count = 1, syllable_min = default_name_syllable_min, syllable_max = default_name_syllable_max, force_use_syllables = FALSE, From 3fa3740393e36e45c5225a8cb640f81bd0cefc49 Mon Sep 17 00:00:00 2001 From: Nerevar <12636964+Nerev4r@users.noreply.github.com> Date: Sun, 6 Oct 2024 22:20:20 -0600 Subject: [PATCH 03/11] it took me ten years to find the answer to something, i forgot about it in two seconds --- .../languages/code/language_datums.dm | 2 +- .../strings/names/ramatan_names.txt | 173 +++++++++--------- 2 files changed, 87 insertions(+), 88 deletions(-) diff --git a/modular_doppler/languages/code/language_datums.dm b/modular_doppler/languages/code/language_datums.dm index 2ce7a0183fff6..df323b095a5b1 100644 --- a/modular_doppler/languages/code/language_datums.dm +++ b/modular_doppler/languages/code/language_datums.dm @@ -69,7 +69,7 @@ if(force_use_syllables) return ..() - return "The [pick(GLOB.ramatan_names)]" + return "[pick(GLOB.ramatan_names)]" /datum/language/common name = "Sol Common" diff --git a/modular_doppler/strings/names/ramatan_names.txt b/modular_doppler/strings/names/ramatan_names.txt index 2c32a8d6f47e1..17363c6b01d1f 100644 --- a/modular_doppler/strings/names/ramatan_names.txt +++ b/modular_doppler/strings/names/ramatan_names.txt @@ -1,87 +1,86 @@ -Sage -Archivist -Justice -Kind -Magician -Reclaimer -Vessel -Fool -Hermit -Wanderer -Nomad -Itinerant -Mendicant -Errant -Seer -Rider -Purifier -Porter -Monk -Corsair -Mercurial -Martyr -Lover -Fighter -Machinist -Keeper -Jester -Enkindler -Duelist -Hunter -Hunted -Demolitionist -Cursed -Alchemist -Brawler -Apostle -Evoker -Driver -Hollow -Shifter -Other -Fixer -Silent -Stranger -Bearer -Devourer -Ascetic -Dancer -Vagabond -Wayfarer -Thief -Harbinger -Intertwined -Weaver -Luminate -Marionette -Mystic -Penitent -Drifter -Sage -Masked -Hidden -Occult -Archon -Blessed -Multitude -Indolent -Evergreen -Preserver -Butcher -Frenzied -Tempest -Healer -Poisonous -Watcher -Seeker -Iron -Psychic -Sleeper -Severed -Veiled -Witch -Untethered -Vestige -Traveler -Speaker -Gunslinger \ No newline at end of file +The Alchemist +The Apostle +The Archivist +The Archon +The Ascetic +The Bearer +The Blessed +The Brawler +The Butcher +The Corsair +The Cursed +The Dancer +The Demolitionist +The Devourer +The Drifter +The Driver +The Duelist +The Enkindler +The Errant +The Evergreen +The Evoker +The Fighter +The Fixer +The Fool +The Frenzied +The Gunslinger +The Harbinger +The Healer +The Hermit +The Hidden +The Hollow +The Hunted +The Hunter +The Indolent +The Intertwined +The Iron +The Itinerant +The Jester +The Justice +The Keeper +The Kind +The Lover +The Luminate +The Machinist +The Magician +The Marionette +The Martyr +The Masked +The Mendicant +The Mercurial +The Monk +The Multitude +The Mystic +The Nomad +The Occult +The Other +The Penitent +The Poisonous +The Porter +The Preserver +The Psychic +The Purifier +The Reclaimer +The Rider +The Sage +The Seeker +The Seer +The Severed +The Shifter +The Silent +The Sleeper +The Speaker +The Stranger +The Tempest +The Thief +The Traveler +The Untethered +The Vagabond +The Veiled +The Vessel +The Vestige +The Wanderer +The Watcher +The Wayfarer +The Weaver +The Witch \ No newline at end of file From 5abf35c7b4de345474f6dd7a07e7f4f06bb42ff4 Mon Sep 17 00:00:00 2001 From: Nerevar <12636964+Nerev4r@users.noreply.github.com> Date: Sun, 6 Oct 2024 22:27:41 -0600 Subject: [PATCH 04/11] try that --- modular_doppler/languages/code/language_datums.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modular_doppler/languages/code/language_datums.dm b/modular_doppler/languages/code/language_datums.dm index df323b095a5b1..68fde4c7a2288 100644 --- a/modular_doppler/languages/code/language_datums.dm +++ b/modular_doppler/languages/code/language_datums.dm @@ -61,14 +61,13 @@ /datum/language/movespeak/get_random_name( gender = NEUTER, - name_count = 1, + name_count = default_name_count, syllable_min = default_name_syllable_min, syllable_max = default_name_syllable_max, force_use_syllables = FALSE, ) if(force_use_syllables) return ..() - return "[pick(GLOB.ramatan_names)]" /datum/language/common From eec85814a13320d4855a37f56a08a7e1dfbe68ef Mon Sep 17 00:00:00 2001 From: Nerevar <12636964+Nerev4r@users.noreply.github.com> Date: Sun, 6 Oct 2024 22:39:05 -0600 Subject: [PATCH 05/11] if this don't work i'm dying --- code/_globalvars/~doppler_globalvars/names.dm | 3 +- .../languages/code/language_datums.dm | 3 +- .../strings/names/ramatan_first.txt | 1 + .../strings/names/ramatan_last.txt | 86 +++++++++ .../strings/names/ramatan_names.txt | 172 +++++++++--------- 5 files changed, 177 insertions(+), 88 deletions(-) create mode 100644 modular_doppler/strings/names/ramatan_first.txt create mode 100644 modular_doppler/strings/names/ramatan_last.txt diff --git a/code/_globalvars/~doppler_globalvars/names.dm b/code/_globalvars/~doppler_globalvars/names.dm index 6314661bdd8df..a8488395130a1 100644 --- a/code/_globalvars/~doppler_globalvars/names.dm +++ b/code/_globalvars/~doppler_globalvars/names.dm @@ -1 +1,2 @@ -GLOBAL_LIST_INIT(ramatan_names, world.file2list("modular_doppler/strings/names/ramatan_names.txt")) +GLOBAL_LIST_INIT(ramatan_first, world.file2list("modular_doppler/strings/names/ramatan_first.txt")) +GLOBAL_LIST_INIT(ramatan_last, world.file2list("modular_doppler/strings/names/ramatan_last.txt")) diff --git a/modular_doppler/languages/code/language_datums.dm b/modular_doppler/languages/code/language_datums.dm index 68fde4c7a2288..533c2c4ae8ac7 100644 --- a/modular_doppler/languages/code/language_datums.dm +++ b/modular_doppler/languages/code/language_datums.dm @@ -68,7 +68,8 @@ ) if(force_use_syllables) return ..() - return "[pick(GLOB.ramatan_names)]" + + return "[pick(GLOB.ramatan_first)] [pick(GLOB.ramatan_last)]" /datum/language/common name = "Sol Common" diff --git a/modular_doppler/strings/names/ramatan_first.txt b/modular_doppler/strings/names/ramatan_first.txt new file mode 100644 index 0000000000000..f1b83a027dbdc --- /dev/null +++ b/modular_doppler/strings/names/ramatan_first.txt @@ -0,0 +1 @@ +The \ No newline at end of file diff --git a/modular_doppler/strings/names/ramatan_last.txt b/modular_doppler/strings/names/ramatan_last.txt new file mode 100644 index 0000000000000..b521ce15ca296 --- /dev/null +++ b/modular_doppler/strings/names/ramatan_last.txt @@ -0,0 +1,86 @@ +Alchemist +Apostle +Archivist +Archon +Ascetic +Bearer +Blessed +Brawler +Butcher +Corsair +Cursed +Dancer +Demolitionist +Devourer +Drifter +Driver +Duelist +Enkindler +Errant +Evergreen +Evoker +Fighter +Fixer +Fool +Frenzied +Gunslinger +Harbinger +Healer +Hermit +Hidden +Hollow +Hunted +Hunter +Indolent +Intertwined +Iron +Itinerant +Jester +Justice +Keeper +Kind +Lover +Luminate +Machinist +Magician +Marionette +Martyr +Masked +Mendicant +Mercurial +Monk +Multitude +Mystic +Nomad +Occult +Other +Penitent +Poisonous +Porter +Preserver +Psychic +Purifier +Reclaimer +Rider +Sage +Seeker +Seer +Severed +Shifter +Silent +Sleeper +Speaker +Stranger +Tempest +Thief +Traveler +Untethered +Vagabond +Veiled +Vessel +Vestige +Wanderer +Watcher +Wayfarer +Weaver +Witch \ No newline at end of file diff --git a/modular_doppler/strings/names/ramatan_names.txt b/modular_doppler/strings/names/ramatan_names.txt index 17363c6b01d1f..b521ce15ca296 100644 --- a/modular_doppler/strings/names/ramatan_names.txt +++ b/modular_doppler/strings/names/ramatan_names.txt @@ -1,86 +1,86 @@ -The Alchemist -The Apostle -The Archivist -The Archon -The Ascetic -The Bearer -The Blessed -The Brawler -The Butcher -The Corsair -The Cursed -The Dancer -The Demolitionist -The Devourer -The Drifter -The Driver -The Duelist -The Enkindler -The Errant -The Evergreen -The Evoker -The Fighter -The Fixer -The Fool -The Frenzied -The Gunslinger -The Harbinger -The Healer -The Hermit -The Hidden -The Hollow -The Hunted -The Hunter -The Indolent -The Intertwined -The Iron -The Itinerant -The Jester -The Justice -The Keeper -The Kind -The Lover -The Luminate -The Machinist -The Magician -The Marionette -The Martyr -The Masked -The Mendicant -The Mercurial -The Monk -The Multitude -The Mystic -The Nomad -The Occult -The Other -The Penitent -The Poisonous -The Porter -The Preserver -The Psychic -The Purifier -The Reclaimer -The Rider -The Sage -The Seeker -The Seer -The Severed -The Shifter -The Silent -The Sleeper -The Speaker -The Stranger -The Tempest -The Thief -The Traveler -The Untethered -The Vagabond -The Veiled -The Vessel -The Vestige -The Wanderer -The Watcher -The Wayfarer -The Weaver -The Witch \ No newline at end of file +Alchemist +Apostle +Archivist +Archon +Ascetic +Bearer +Blessed +Brawler +Butcher +Corsair +Cursed +Dancer +Demolitionist +Devourer +Drifter +Driver +Duelist +Enkindler +Errant +Evergreen +Evoker +Fighter +Fixer +Fool +Frenzied +Gunslinger +Harbinger +Healer +Hermit +Hidden +Hollow +Hunted +Hunter +Indolent +Intertwined +Iron +Itinerant +Jester +Justice +Keeper +Kind +Lover +Luminate +Machinist +Magician +Marionette +Martyr +Masked +Mendicant +Mercurial +Monk +Multitude +Mystic +Nomad +Occult +Other +Penitent +Poisonous +Porter +Preserver +Psychic +Purifier +Reclaimer +Rider +Sage +Seeker +Seer +Severed +Shifter +Silent +Sleeper +Speaker +Stranger +Tempest +Thief +Traveler +Untethered +Vagabond +Veiled +Vessel +Vestige +Wanderer +Watcher +Wayfarer +Weaver +Witch \ No newline at end of file From 6f82d04ae5daef6fcd96eedafc4f87fc28d478b1 Mon Sep 17 00:00:00 2001 From: Nerevar <12636964+Nerev4r@users.noreply.github.com> Date: Sun, 6 Oct 2024 22:53:45 -0600 Subject: [PATCH 06/11] please god please --- code/_globalvars/lists/names.dm | 2 + code/_globalvars/~doppler_globalvars/names.dm | 2 - .../strings/names/ramatan_names.txt | 86 ------------------- tgstation.dme | 1 - 4 files changed, 2 insertions(+), 89 deletions(-) delete mode 100644 code/_globalvars/~doppler_globalvars/names.dm delete mode 100644 modular_doppler/strings/names/ramatan_names.txt diff --git a/code/_globalvars/lists/names.dm b/code/_globalvars/lists/names.dm index f9f70a2c7069f..2043cff36e358 100644 --- a/code/_globalvars/lists/names.dm +++ b/code/_globalvars/lists/names.dm @@ -32,6 +32,8 @@ GLOBAL_LIST_INIT(guardian_tech_surnames, world.file2list("strings/names/guardian GLOBAL_LIST_INIT(guardian_fantasy_surnames, world.file2list("strings/names/guardian_tarot.txt")) GLOBAL_LIST_INIT(operative_aliases, world.file2list("strings/names/operative_alias.txt")) GLOBAL_LIST_INIT(voidwalker_names, world.file2list("strings/names/voidwalker.txt")) +GLOBAL_LIST_INIT(ramatan_first, world.file2list("modular_doppler/strings/names/ramatan_first.txt")) //DOPPLER EDIT ADDITION +GLOBAL_LIST_INIT(ramatan_last, world.file2list("modular_doppler/strings/names/ramatan_last.txt")) //DOPPLER EDIT ADDITION GLOBAL_LIST_INIT(verbs, world.file2list("strings/names/verbs.txt")) GLOBAL_LIST_INIT(ing_verbs, world.file2list("strings/names/ing_verbs.txt")) diff --git a/code/_globalvars/~doppler_globalvars/names.dm b/code/_globalvars/~doppler_globalvars/names.dm deleted file mode 100644 index a8488395130a1..0000000000000 --- a/code/_globalvars/~doppler_globalvars/names.dm +++ /dev/null @@ -1,2 +0,0 @@ -GLOBAL_LIST_INIT(ramatan_first, world.file2list("modular_doppler/strings/names/ramatan_first.txt")) -GLOBAL_LIST_INIT(ramatan_last, world.file2list("modular_doppler/strings/names/ramatan_last.txt")) diff --git a/modular_doppler/strings/names/ramatan_names.txt b/modular_doppler/strings/names/ramatan_names.txt deleted file mode 100644 index b521ce15ca296..0000000000000 --- a/modular_doppler/strings/names/ramatan_names.txt +++ /dev/null @@ -1,86 +0,0 @@ -Alchemist -Apostle -Archivist -Archon -Ascetic -Bearer -Blessed -Brawler -Butcher -Corsair -Cursed -Dancer -Demolitionist -Devourer -Drifter -Driver -Duelist -Enkindler -Errant -Evergreen -Evoker -Fighter -Fixer -Fool -Frenzied -Gunslinger -Harbinger -Healer -Hermit -Hidden -Hollow -Hunted -Hunter -Indolent -Intertwined -Iron -Itinerant -Jester -Justice -Keeper -Kind -Lover -Luminate -Machinist -Magician -Marionette -Martyr -Masked -Mendicant -Mercurial -Monk -Multitude -Mystic -Nomad -Occult -Other -Penitent -Poisonous -Porter -Preserver -Psychic -Purifier -Reclaimer -Rider -Sage -Seeker -Seer -Severed -Shifter -Silent -Sleeper -Speaker -Stranger -Tempest -Thief -Traveler -Untethered -Vagabond -Veiled -Vessel -Vestige -Wanderer -Watcher -Wayfarer -Weaver -Witch \ No newline at end of file diff --git a/tgstation.dme b/tgstation.dme index 3e9dd9da1197a..44ba38ac36df0 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -605,7 +605,6 @@ #include "code\_globalvars\traits\admin_tooling.dm" #include "code\_globalvars\~doppler_globalvars\bitfields.dm" #include "code\_globalvars\~doppler_globalvars\configuration.dm" -#include "code\_globalvars\~doppler_globalvars\names.dm" #include "code\_globalvars\~doppler_globalvars\objective.dm" #include "code\_globalvars\~doppler_globalvars\religion.dm" #include "code\_js\byjax.dm" From 70d863fabaaceec1eef5aceeed3c1112f30256bd Mon Sep 17 00:00:00 2001 From: Nerevar <12636964+Nerev4r@users.noreply.github.com> Date: Sun, 6 Oct 2024 23:09:02 -0600 Subject: [PATCH 07/11] i'm crucified --- modular_doppler/languages/code/language_datums.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modular_doppler/languages/code/language_datums.dm b/modular_doppler/languages/code/language_datums.dm index 533c2c4ae8ac7..175e42a53f788 100644 --- a/modular_doppler/languages/code/language_datums.dm +++ b/modular_doppler/languages/code/language_datums.dm @@ -59,6 +59,9 @@ icon_state = "movespeak" default_priority = 93 + default_name_syllable_min = 5 + default_name_syllable_max = 10 + /datum/language/movespeak/get_random_name( gender = NEUTER, name_count = default_name_count, From 48d46ccd78d98a681b0a1218f229bb2ffc344749 Mon Sep 17 00:00:00 2001 From: Nerevar <12636964+Nerev4r@users.noreply.github.com> Date: Sun, 6 Oct 2024 23:19:40 -0600 Subject: [PATCH 08/11] a --- modular_doppler/strings/names/ramatan_first.txt | 2 +- modular_doppler/strings/names/ramatan_last.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_doppler/strings/names/ramatan_first.txt b/modular_doppler/strings/names/ramatan_first.txt index f1b83a027dbdc..992724478ddfc 100644 --- a/modular_doppler/strings/names/ramatan_first.txt +++ b/modular_doppler/strings/names/ramatan_first.txt @@ -1 +1 @@ -The \ No newline at end of file +The diff --git a/modular_doppler/strings/names/ramatan_last.txt b/modular_doppler/strings/names/ramatan_last.txt index b521ce15ca296..ba523cffad2fa 100644 --- a/modular_doppler/strings/names/ramatan_last.txt +++ b/modular_doppler/strings/names/ramatan_last.txt @@ -83,4 +83,4 @@ Wanderer Watcher Wayfarer Weaver -Witch \ No newline at end of file +Witch From bb6d79dafcdfab6578e6909a0e58e5b7605818ca Mon Sep 17 00:00:00 2001 From: Nerevar <12636964+Nerev4r@users.noreply.github.com> Date: Mon, 7 Oct 2024 14:40:25 -0600 Subject: [PATCH 09/11] flawed checkpoint --- .../code/language menu/client_languages.dm | 7 +++++++ .../species_types/ramatae/ramatan.dm | 17 ++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/modular_doppler/languages/code/language menu/client_languages.dm b/modular_doppler/languages/code/language menu/client_languages.dm index a937f51d60725..41fdcbb96fd6b 100644 --- a/modular_doppler/languages/code/language menu/client_languages.dm +++ b/modular_doppler/languages/code/language menu/client_languages.dm @@ -48,12 +48,16 @@ var/datum/language_holder/lang_holder = new species.species_language_holder() for(var/language in preferences.get_adjusted_language_holder()) preferences.languages[language] = LANGUAGE_SPOKEN + preferences.languages[language] = LANGUAGE_UNDERSTOOD qdel(lang_holder) qdel(species) for(var/language in lang_holder.spoken_languages) preferences.languages[language] = LANGUAGE_SPOKEN + for(var/language in lang_holder.understood_languages) + preferences.languages[language] = LANGUAGE_UNDERSTOOD + qdel(lang_holder) qdel(species) @@ -73,6 +77,7 @@ preferences.languages = list() for(var/language in lang_holder.spoken_languages) preferences.languages[language] = LANGUAGE_SPOKEN + preferences.languages[language] = LANGUAGE_UNDERSTOOD var/list/selected_languages = list() var/list/unselected_languages = list() @@ -85,6 +90,8 @@ if(species.always_customizable && !(language.type in lang_holder.spoken_languages)) // For the ghostrole species. We don't want ashwalkers speaking beachtongue now. continue + if(species.always_customizable && !(language.type in lang_holder.understood_languages)) // For the ghostrole species. We don't want ashwalkers speaking beachtongue now. + continue if(preferences.languages[language.type]) selected_languages += list(list( "description" = language.desc, diff --git a/modular_doppler/modular_species/species_types/ramatae/ramatan.dm b/modular_doppler/modular_species/species_types/ramatae/ramatan.dm index 16d2264c07873..0a909d4caaa3d 100644 --- a/modular_doppler/modular_species/species_types/ramatae/ramatan.dm +++ b/modular_doppler/modular_species/species_types/ramatae/ramatan.dm @@ -1,12 +1,15 @@ /// Ramatan language holder - they are adept in understanding machines, though unable to speak the tongue themselves. /datum/language_holder/ramatan - understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM), - /datum/language/movespeak = list(LANGUAGE_ATOM), - /datum/language/machine = list(LANGUAGE_ATOM), - /datum/language/drone = list(LANGUAGE_ATOM)) - spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM), - /datum/language/movespeak = list(LANGUAGE_ATOM)) - + understood_languages = list( + /datum/language/common = list(LANGUAGE_ATOM), + /datum/language/movespeak = list(LANGUAGE_ATOM), + /datum/language/machine = list(LANGUAGE_ATOM), + /datum/language/drone = list(LANGUAGE_ATOM), + ) + spoken_languages = list( + /datum/language/common = list(LANGUAGE_ATOM), + /datum/language/movespeak = list(LANGUAGE_ATOM), + ) /mob/living/carbon/human/species/ramatan race = /datum/species/ramatan From 84354b0b26b30b1914ff89a201adc9b16fc93c94 Mon Sep 17 00:00:00 2001 From: Nerevar <12636964+Nerev4r@users.noreply.github.com> Date: Mon, 7 Oct 2024 19:12:23 -0600 Subject: [PATCH 10/11] dry test run --- code/_globalvars/lists/names.dm | 4 +- strings/names/ramatan_first.txt | 1 + strings/names/ramatan_last.txt | 86 +++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 strings/names/ramatan_first.txt create mode 100644 strings/names/ramatan_last.txt diff --git a/code/_globalvars/lists/names.dm b/code/_globalvars/lists/names.dm index 2043cff36e358..42a8dbeaaab04 100644 --- a/code/_globalvars/lists/names.dm +++ b/code/_globalvars/lists/names.dm @@ -32,8 +32,8 @@ GLOBAL_LIST_INIT(guardian_tech_surnames, world.file2list("strings/names/guardian GLOBAL_LIST_INIT(guardian_fantasy_surnames, world.file2list("strings/names/guardian_tarot.txt")) GLOBAL_LIST_INIT(operative_aliases, world.file2list("strings/names/operative_alias.txt")) GLOBAL_LIST_INIT(voidwalker_names, world.file2list("strings/names/voidwalker.txt")) -GLOBAL_LIST_INIT(ramatan_first, world.file2list("modular_doppler/strings/names/ramatan_first.txt")) //DOPPLER EDIT ADDITION -GLOBAL_LIST_INIT(ramatan_last, world.file2list("modular_doppler/strings/names/ramatan_last.txt")) //DOPPLER EDIT ADDITION +GLOBAL_LIST_INIT(ramatan_first, world.file2list("strings/names/ramatan_first.txt")) //DOPPLER EDIT ADDITION +GLOBAL_LIST_INIT(ramatan_last, world.file2list("strings/names/ramatan_last.txt")) //DOPPLER EDIT ADDITION GLOBAL_LIST_INIT(verbs, world.file2list("strings/names/verbs.txt")) GLOBAL_LIST_INIT(ing_verbs, world.file2list("strings/names/ing_verbs.txt")) diff --git a/strings/names/ramatan_first.txt b/strings/names/ramatan_first.txt new file mode 100644 index 0000000000000..992724478ddfc --- /dev/null +++ b/strings/names/ramatan_first.txt @@ -0,0 +1 @@ +The diff --git a/strings/names/ramatan_last.txt b/strings/names/ramatan_last.txt new file mode 100644 index 0000000000000..ba523cffad2fa --- /dev/null +++ b/strings/names/ramatan_last.txt @@ -0,0 +1,86 @@ +Alchemist +Apostle +Archivist +Archon +Ascetic +Bearer +Blessed +Brawler +Butcher +Corsair +Cursed +Dancer +Demolitionist +Devourer +Drifter +Driver +Duelist +Enkindler +Errant +Evergreen +Evoker +Fighter +Fixer +Fool +Frenzied +Gunslinger +Harbinger +Healer +Hermit +Hidden +Hollow +Hunted +Hunter +Indolent +Intertwined +Iron +Itinerant +Jester +Justice +Keeper +Kind +Lover +Luminate +Machinist +Magician +Marionette +Martyr +Masked +Mendicant +Mercurial +Monk +Multitude +Mystic +Nomad +Occult +Other +Penitent +Poisonous +Porter +Preserver +Psychic +Purifier +Reclaimer +Rider +Sage +Seeker +Seer +Severed +Shifter +Silent +Sleeper +Speaker +Stranger +Tempest +Thief +Traveler +Untethered +Vagabond +Veiled +Vessel +Vestige +Wanderer +Watcher +Wayfarer +Weaver +Witch From fce3269657a374cda2ddb4ef01d421536e96a637 Mon Sep 17 00:00:00 2001 From: Nerevar <12636964+Nerev4r@users.noreply.github.com> Date: Mon, 7 Oct 2024 19:43:44 -0600 Subject: [PATCH 11/11] jesus please just stop me pain --- code/_globalvars/lists/names.dm | 1 - .../code/language menu/client_languages.dm | 7 -- .../languages/code/language_datums.dm | 2 +- .../strings/names/ramatan_first.txt | 1 - .../strings/names/ramatan_last.txt | 86 ------------------- strings/names/ramatan_first.txt | 1 - strings/names/ramatan_last.txt | 2 +- 7 files changed, 2 insertions(+), 98 deletions(-) delete mode 100644 modular_doppler/strings/names/ramatan_first.txt delete mode 100644 modular_doppler/strings/names/ramatan_last.txt delete mode 100644 strings/names/ramatan_first.txt diff --git a/code/_globalvars/lists/names.dm b/code/_globalvars/lists/names.dm index 42a8dbeaaab04..201c58843dc61 100644 --- a/code/_globalvars/lists/names.dm +++ b/code/_globalvars/lists/names.dm @@ -32,7 +32,6 @@ GLOBAL_LIST_INIT(guardian_tech_surnames, world.file2list("strings/names/guardian GLOBAL_LIST_INIT(guardian_fantasy_surnames, world.file2list("strings/names/guardian_tarot.txt")) GLOBAL_LIST_INIT(operative_aliases, world.file2list("strings/names/operative_alias.txt")) GLOBAL_LIST_INIT(voidwalker_names, world.file2list("strings/names/voidwalker.txt")) -GLOBAL_LIST_INIT(ramatan_first, world.file2list("strings/names/ramatan_first.txt")) //DOPPLER EDIT ADDITION GLOBAL_LIST_INIT(ramatan_last, world.file2list("strings/names/ramatan_last.txt")) //DOPPLER EDIT ADDITION GLOBAL_LIST_INIT(verbs, world.file2list("strings/names/verbs.txt")) diff --git a/modular_doppler/languages/code/language menu/client_languages.dm b/modular_doppler/languages/code/language menu/client_languages.dm index 41fdcbb96fd6b..a937f51d60725 100644 --- a/modular_doppler/languages/code/language menu/client_languages.dm +++ b/modular_doppler/languages/code/language menu/client_languages.dm @@ -48,16 +48,12 @@ var/datum/language_holder/lang_holder = new species.species_language_holder() for(var/language in preferences.get_adjusted_language_holder()) preferences.languages[language] = LANGUAGE_SPOKEN - preferences.languages[language] = LANGUAGE_UNDERSTOOD qdel(lang_holder) qdel(species) for(var/language in lang_holder.spoken_languages) preferences.languages[language] = LANGUAGE_SPOKEN - for(var/language in lang_holder.understood_languages) - preferences.languages[language] = LANGUAGE_UNDERSTOOD - qdel(lang_holder) qdel(species) @@ -77,7 +73,6 @@ preferences.languages = list() for(var/language in lang_holder.spoken_languages) preferences.languages[language] = LANGUAGE_SPOKEN - preferences.languages[language] = LANGUAGE_UNDERSTOOD var/list/selected_languages = list() var/list/unselected_languages = list() @@ -90,8 +85,6 @@ if(species.always_customizable && !(language.type in lang_holder.spoken_languages)) // For the ghostrole species. We don't want ashwalkers speaking beachtongue now. continue - if(species.always_customizable && !(language.type in lang_holder.understood_languages)) // For the ghostrole species. We don't want ashwalkers speaking beachtongue now. - continue if(preferences.languages[language.type]) selected_languages += list(list( "description" = language.desc, diff --git a/modular_doppler/languages/code/language_datums.dm b/modular_doppler/languages/code/language_datums.dm index 175e42a53f788..d084e709b4f89 100644 --- a/modular_doppler/languages/code/language_datums.dm +++ b/modular_doppler/languages/code/language_datums.dm @@ -72,7 +72,7 @@ if(force_use_syllables) return ..() - return "[pick(GLOB.ramatan_first)] [pick(GLOB.ramatan_last)]" + return "The [pick(GLOB.ramatan_last)]" /datum/language/common name = "Sol Common" diff --git a/modular_doppler/strings/names/ramatan_first.txt b/modular_doppler/strings/names/ramatan_first.txt deleted file mode 100644 index 992724478ddfc..0000000000000 --- a/modular_doppler/strings/names/ramatan_first.txt +++ /dev/null @@ -1 +0,0 @@ -The diff --git a/modular_doppler/strings/names/ramatan_last.txt b/modular_doppler/strings/names/ramatan_last.txt deleted file mode 100644 index ba523cffad2fa..0000000000000 --- a/modular_doppler/strings/names/ramatan_last.txt +++ /dev/null @@ -1,86 +0,0 @@ -Alchemist -Apostle -Archivist -Archon -Ascetic -Bearer -Blessed -Brawler -Butcher -Corsair -Cursed -Dancer -Demolitionist -Devourer -Drifter -Driver -Duelist -Enkindler -Errant -Evergreen -Evoker -Fighter -Fixer -Fool -Frenzied -Gunslinger -Harbinger -Healer -Hermit -Hidden -Hollow -Hunted -Hunter -Indolent -Intertwined -Iron -Itinerant -Jester -Justice -Keeper -Kind -Lover -Luminate -Machinist -Magician -Marionette -Martyr -Masked -Mendicant -Mercurial -Monk -Multitude -Mystic -Nomad -Occult -Other -Penitent -Poisonous -Porter -Preserver -Psychic -Purifier -Reclaimer -Rider -Sage -Seeker -Seer -Severed -Shifter -Silent -Sleeper -Speaker -Stranger -Tempest -Thief -Traveler -Untethered -Vagabond -Veiled -Vessel -Vestige -Wanderer -Watcher -Wayfarer -Weaver -Witch diff --git a/strings/names/ramatan_first.txt b/strings/names/ramatan_first.txt deleted file mode 100644 index 992724478ddfc..0000000000000 --- a/strings/names/ramatan_first.txt +++ /dev/null @@ -1 +0,0 @@ -The diff --git a/strings/names/ramatan_last.txt b/strings/names/ramatan_last.txt index ba523cffad2fa..eda2057ac877c 100644 --- a/strings/names/ramatan_last.txt +++ b/strings/names/ramatan_last.txt @@ -52,6 +52,7 @@ Monk Multitude Mystic Nomad +Obsessed Occult Other Penitent @@ -64,7 +65,6 @@ Reclaimer Rider Sage Seeker -Seer Severed Shifter Silent