Skip to content

Commit

Permalink
Language Changes & Lore Pt. 1 (ParadiseSS13#27257)
Browse files Browse the repository at this point in the history
* stage 1

* Fix bundle (TGUI was not rebuilt)

* mr worldwide

* LT galcom suggestion

* period

* bundle

* Update code/modules/mob/language.dm

Co-authored-by: Luc <[email protected]>
Signed-off-by: PopeDaveThe3th <[email protected]>

---------

Signed-off-by: PopeDaveThe3th <[email protected]>
Co-authored-by: DGamerL <[email protected]>
Co-authored-by: Luc <[email protected]>
  • Loading branch information
3 people authored Nov 25, 2024
1 parent 72ae2ed commit 09830b2
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 34 deletions.
4 changes: 2 additions & 2 deletions code/datums/outfits/outfit_admin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -585,8 +585,8 @@
return
H.real_name = "[capitalize(pick(GLOB.first_names_soviet))] [capitalize(pick(GLOB.last_names_soviet))]"
H.name = H.real_name
H.add_language("Neo-Russkiya")
H.set_default_language(GLOB.all_languages["Neo-Russkiya"])
H.add_language("Zvezhan")
H.set_default_language(GLOB.all_languages["Zvezhan"])
var/obj/item/card/id/I = H.wear_id
if(istype(I))
apply_to_card(I, H, list(ACCESS_MAINT_TUNNELS), name)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/salvage.dm
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@

/obj/item/salvage/loot/soviet
name = "\improper Cygni manifesto"
desc = "A small book, written in Neo-Russkyia, detailing the manifesto of Malfoy Ames, father of The Cygni Rebellion. Banned in Federation space, it may fetch a decent price on the black market."
desc = "A small book, written in Zvezhan, detailing the manifesto of Malfoy Ames, father of The Cygni Rebellion. Banned in Federation space, it may fetch a decent price on the black market."
icon_state = "ussp_manual"
hitsound = 'sound/items/handling/paper_pickup.ogg'
pickup_sound = 'sound/items/handling/paper_pickup.ogg'
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/weapons/storage/uplink_kits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@

/obj/item/storage/box/syndie_kit/stechkin
name = "\improper FK-69 Stechkin kit"
desc = "A box marked with Neo-Russkiyan characters. It appears to contain a 10mm pistol and two magazines."
desc = "A box marked with Zvezhan characters. It appears to contain a 10mm pistol and two magazines."

/obj/item/storage/box/syndie_kit/stechkin/populate_contents()
new /obj/item/gun/projectile/automatic/pistol(src)
Expand Down
42 changes: 20 additions & 22 deletions code/modules/mob/language.dm
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@

/datum/language/common
name = "Galactic Common"
desc = "The common galactic tongue."
desc = "Originally a carefully crafted fusion of various Human and Skrell dialects, Galactic Common is the most commonly spoken language in the Sector, and incorporates influences from nearly every known sapient species."
speech_verb = "says"
exclaim_verbs = list("exclaims", "shouts", "yells")
whisper_verb = "whispers"
Expand All @@ -424,15 +424,16 @@

/datum/language/human
name = "Sol Common"
desc = "A bastardized hybrid of informal English and elements of Mandarin Chinese; the common language of the Sol system."
desc = "An artifical language designed by the Trans-Solar Federation for ease of use and concise communication."
speech_verb = "says"
exclaim_verbs = list("exclaims", "shouts", "yells")
exclaim_verbs = list("snaps", "shouts", "barks")
whisper_verb = "whispers"
colour = "solcom"
key = "1"
space_chance = 70
flags = RESTRICTED
syllables = list("tao","shi","tzu","yi","com","be","is","i","op","vi","ed","lec","mo","cle","te","dis","e")
english_names = 1
syllables = list("ba","da","ka","ki","to","ta","sa","so","a","e","i","o","u","am","on","na","in",
"ko",)

// Galactic common languages (systemwide accepted standards).
/datum/language/trader
Expand Down Expand Up @@ -471,25 +472,22 @@
key = "0"
syllables = list ("honk","squeak","bonk","toot","narf","zub","wee","wub","norf")

/datum/language/com_srus
name = "Neo-Russkiya"
desc = "Neo-Russkiya, a bastard mix of Gutter, Sol Common, and old Russian. The official language of the USSP. It has started to see use outside of the fringe in hobby circles and protest groups. The linguistic spirit of Sol-Gov criticisms."
/datum/language/com_zvezhan
name = "Zvezhan"
desc = "The language of revolution across the stars, initially formed as a hybrid of Russian and Mandarin Chinese by early Cygni settlers before incorporating additional influences from across Eurasia."
speech_verb = "articulates"
whisper_verb = "mutters"
exclaim_verbs = list("exaggerates")
colour = "com_srus"
whisper_verb = "murmurs"
exclaim_verbs = list("proclaims", "boasts", "accentuates")
colour = "com_zvezhan"
key = "?"
space_chance = 65
english_names = 1
syllables = list("dyen","bar","bota","vyek","tvo","slov","slav","syen","doup","vah","laz","gloz","yet",
"nyet","da","sky","glav","glaz","netz","doomat","zat","moch","boz",
"comy","vrad","vrade","tay","bli","ay","nov","livn","tolv","glaz","gliz",
"ouy","zet","yevt","dat","botat","nev","novy","vzy","nov","sho","obsh","dasky",
"key","skey","ovsky","skaya","bib","kiev","studen","var","bul","vyan",
"tzion","vaya","myak","gino","volo","olam","miti","nino","menov","perov",
"odasky","trov","niki","ivano","dostov","sokol","oupa","pervom","schel",
"tizan","chka","tagan","dobry","okt","boda","veta","idi","cyk","blyt","hui","na",
"udi","litchki","casa","linka","toly","anatov","vich","vech","vuch","toi","ka","vod")
space_chance = 50
syllables = list("ai","bai","bian","che","chuang","e","fan","gan","huo","jian","jiao","ka","man","mu","nang","nuo","o","pang","pi",
"pou","qian","qiu","rao","re","sa","sai","sheng","song","sui","tui","tu","wai","xi","xiu","xu","yan","yi","yuan","zao",
"zei","zhang","zu","zun","a","be","ve","ge","de","ye","ka","el","em","pe","er","te","oo","kha","tse","sha","ă","â","ê",
"ô","ơ","u","ư","th","tr","nh","yoo","eu","ya","pra","pre","pri","pro","pru","cla","cle","clo","bre","bru","ri","ca","ce",
"po","kać","sza","sze","szo","dza","dze","dzo","","","cieć","sz","sia","sie","sio","siu","zna","zne","zno","lya","lyo",
"lyu","lye","vna","vne","vno","ayat'","shcha","shche","mne","mno","mni","kam","tam","lam","kap","kop","sup","rip","kong",
"tong","aan","aay","aam","klon","chorn")

/datum/language/xenocommon
name = "Xenomorph"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/silicon/ai/ai_mob.dm
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
add_language("Galactic Common", 1)
add_language("Sol Common", 1)
add_language("Tradeband", 1)
add_language("Neo-Russkiya", 1)
add_language("Zvezhan", 1)
add_language("Gutter", 1)
add_language("Sinta'unathi", 1)
add_language("Siik'tajr", 1)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/silicon/pai/software/pai_toggles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
user.add_language("Bubblish")
user.add_language("Orluum")
user.add_language("Clownish")
user.add_language("Neo-Russkiya")
user.add_language("Zvezhan")
user.add_language("Tkachi")
else
user.remove_language("Sinta'unathi")
Expand All @@ -89,7 +89,7 @@
user.remove_language("Bubblish")
user.remove_language("Orluum")
user.remove_language("Clownish")
user.remove_language("Neo-Russkiya")
user.remove_language("Zvezhan")
user.remove_language("Tkachi")

/datum/pai_software/translator/is_active(mob/living/silicon/pai/user)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/silicon/robot/robot_modules.dm
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@
R.add_language("Sol Common", 1)
R.add_language("Tradeband", 1)
R.add_language("Gutter", 0)
R.add_language("Neo-Russkiya", 0)
R.add_language("Zvezhan", 0)
R.add_language("Sinta'unathi", 0)
R.add_language("Siik'tajr", 0)
R.add_language("Canilunzt", 0)
Expand Down Expand Up @@ -687,7 +687,7 @@
R.add_language("Chittin", 1)
R.add_language("Bubblish", 1)
R.add_language("Clownish",1)
R.add_language("Neo-Russkiya", 1)
R.add_language("Zvezhan", 1)
R.add_language("Tkachi", 1)

// Mining
Expand Down
2 changes: 1 addition & 1 deletion interface/skin.dmf
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ window "paramapwindow"
is-default = true
saved-params = "icon-size;zoom-mode"
zoom-mode = "distort"
style = ".center { text-align: center; } .maptext { font-family: 'Small Fonts'; font-size: 7px; -dm-text-outline: 1px black; color: white; line-height: 1.1; } .small { font-size: 6px; } .big { font-size: 8px; } .reallybig { font-size: 8px; } .extremelybig { font-size: 8px; } .clown { color: #FF69Bf;} .tajaran {color: #803B56;} .skrell {color: #00CED1;} .solcom {color: #22228B;} .com_srus {color: #7c4848;} .zombie\t{color: #7c4848;} .soghun {color: #228B22;} .vox {color: #AA00AA;} .diona {color: #804000; font-weight: bold;} .trinary {color: #727272;} .kidan {color: #664205;} .slime {color: #0077AA;} .moth{color: #869b29;} .drask {color: #a3d4eb;} .vulpkanin {color: #B97A57;} .abductor {color: #800080;} .his_grace { color: #15D512; } .hypnophrase { color: #0d0d0d; font-weight: bold; } .yell { font-weight: bold; }"
style = ".center { text-align: center; } .maptext { font-family: 'Small Fonts'; font-size: 7px; -dm-text-outline: 1px black; color: white; line-height: 1.1; } .small { font-size: 6px; } .big { font-size: 8px; } .reallybig { font-size: 8px; } .extremelybig { font-size: 8px; } .clown { color: #FF69Bf;} .tajaran {color: #803B56;} .skrell {color: #00CED1;} .solcom {color: #22228B;} .com_zvezhan {color: #7c4848;} .zombie\t{color: #7c4848;} .soghun {color: #228B22;} .vox {color: #AA00AA;} .diona {color: #804000; font-weight: bold;} .trinary {color: #727272;} .kidan {color: #664205;} .slime {color: #0077AA;} .moth{color: #869b29;} .drask {color: #a3d4eb;} .vulpkanin {color: #B97A57;} .abductor {color: #800080;} .his_grace { color: #15D512; } .hypnophrase { color: #0d0d0d; font-weight: bold; } .yell { font-weight: bold; }"
on-show = ".winset \"menu.statusbar.is-checked=true?paramapwindow.status_bar.is-visible=true:paramapwindow.status_bar.is-visible=false\""
elem "status_bar"
type = LABEL
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui-panel/styles/tgchat/chat-default.scss
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ h2.alert {
color: #8282fb;
}

.com_srus {
.com_zvezhan {
color: #7c4848;
}

Expand Down
2 changes: 1 addition & 1 deletion tgui/public/tgui-panel.bundle.css

Large diffs are not rendered by default.

0 comments on commit 09830b2

Please sign in to comment.