Undone conflciting Language keys and Garou Lang stuff - #1351
Open
TheTrueSilverRat wants to merge 40 commits into
Open
Undone conflciting Language keys and Garou Lang stuff#1351TheTrueSilverRat wants to merge 40 commits into
TheTrueSilverRat wants to merge 40 commits into
Conversation
FalloutFalcon
requested changes
Aug 7, 2026
Comment on lines
+23
to
+26
| blocked_speaking = list( | ||
|
|
||
| ) | ||
|
|
Member
There was a problem hiding this comment.
Not populated with anything?
Contributor
Author
There was a problem hiding this comment.
Originally I was gonna have it so you wouldn't be allowed to use the human tongues until I realized people wouldn't enjoy that? That was for Crinos form at least. I'm still speculating but I'll probably not to allow for Partial-Shapeshifting larp.
Also thank you for showing me how to format the Darkpack updates, Not used to doing edits on an "upstream code" part
Comment on lines
+86
to
+88
| /datum/splat/werewolf/kinfolk/on_gain() //Currently just for granting language Garou Tongue or High Tongue that Kinfolk can learn. | ||
| owner.grant_language(/datum/language/garou_tongue, SPOKEN_LANGUAGE, LANGUAGE_ATOM) //Separated because Spoken and Hearing Components are separated | ||
| owner.grant_language(/datum/language/garou_tongue, UNDERSTOOD_LANGUAGE, LANGUAGE_ATOM) |
Member
There was a problem hiding this comment.
you dont remove on losing kinfolk. You might want to also use a diffrnet source to make it easier to remove tho the sources have specific behavoir for langs unlike traits.
Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
…fera_organs.dm Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
Added the rest (Sorry I didn't know commit suggestion batch was a thing) Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
…t/SecondCity into language-fuckery
…t/SecondCity into language-fuckery
Member
|
Can you uncomment https://github.com/DarkPack13/SecondCity/blob/master/code/modules/unit_tests/language_key_conflicts.dm to ensure you got all of them? |
Contributor
Author
Did that not sure what else to do |
FalloutFalcon
requested changes
Aug 11, 2026
FalloutFalcon
requested changes
Aug 13, 2026
Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
FalloutFalcon
approved these changes
Aug 14, 2026
Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
Contributor
|
by God, thats a lot of linter failures |
Merged
FalloutFalcon
added a commit
that referenced
this pull request
Sep 1, 2026
## About The Pull Request Pulls the latest TGStation commits to keep us up-to-date Please dont squash this one!!! Highlights Include: Tgui verb panel fixes A fix that makes #1351 better Fix Fancy Weather prefrences not being respected (#97555) Anchored items cant be stolen with trashbags. ## Why It's Good For The Game MODERN CODE ## Changelog :cl: Beautiful TG coders code: TG Pull. Thank you TG. /:cl:
Member
|
should pass checks now? |
FalloutFalcon
enabled auto-merge (squash)
September 2, 2026 01:08
FalloutFalcon
disabled auto-merge
September 2, 2026 02:09
Member
|
ah. thats a real fail relating to this.. |
FalloutFalcon
enabled auto-merge (squash)
September 2, 2026 09:34
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
About The Pull Request
Removed a lot of Language keys from ss13 langauges so our new modern languages can be used.
Also made it so that Garou can speak primal tongue in Crinos, Hispos, and Lupus form as like in the Lore.
Also made it so Kinfolk can now finally speak Garou Tongue
Why It's Good For The Game
Bug fixes. can actually use language keys, and more usage of garou tongue stuff.
Changelog
🆑
code: commented out language keys of old ss13 languages
fix: Allows modern language keys to be able to be used
qol: Allow Crinos Hispos and Lupus forms to do primal tongue
qol: Kinfolk can speak Garou tongue now
/:cl: