Upstream Sync #43
Merged
Upstream Sync #43
Conversation
This file contains 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
Co-authored-by: IamVelcroboy<>
Co-authored-by: IamVelcroboy<>
* Map Edits: Hammurabi * add psionic mantis --------- Co-authored-by: Velcroboy <>
Co-authored-by: Velcroboy <>
* Update Rules.txt * Update Rules.txt
Co-authored-by: Jeff <>
* Prevent zombies from becoming psionic, and remove existing powers. * Minor spelling mistake
Set vis flags to cyborgs, silicon, ghost
* Fixes mantis not spawnin with their respective bag. A small thing but somethin to note nontheless. * Fixes it as I didnt notice that there was already yml for the other ones, eeh * Update backpack.yml
Update heads.yml I forgor Signed-off-by: Debug <[email protected]>
* CLAOK TO BRRR * Correct cloak placement * more corrections * removed unwanted code * Update Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml Co-authored-by: Colin-Tel <[email protected]> Signed-off-by: lleftTheDragon <[email protected]> * Update Resources/Prototypes/Catalog/Fills/Crates/salvage.yml Co-authored-by: Colin-Tel <[email protected]> Signed-off-by: lleftTheDragon <[email protected]> * Update Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml Co-authored-by: Colin-Tel <[email protected]> Signed-off-by: lleftTheDragon <[email protected]> --------- Signed-off-by: lleftTheDragon <[email protected]> Co-authored-by: Colin-Tel <[email protected]>
* Allow voting for the extended and survival gamemode These votes shouldn't be called ever anyways, so might aswell use them for the adminless server * Update periapsis.toml
* Map Hotfix: Hammurabi * fix corpsman's airlock --------- Co-authored-by: Velcroboy <>
* Implement gridinv, 1500 squashed commits :elp: * Me when * Linter errors * Fix katana belts
…to upstream-sync-2
DEATHB4DEFEAT
added
Size: 1-Very Large
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
Changes: C#
…n-Friendly-Chainsaw into upstream-sync-2
DEATHB4DEFEAT
added a commit
that referenced
this pull request
Aug 19, 2024
Resolves Simple-Station/Einstein-Engines#37 # Description This PR adds languages. Every entity who can speak now speaks a specific language (or Universal, for entities that are not supposed to speak, which is understood by everyone). Other entities who do not understand this language will see gibberish (it's possible to learn how certain induvidual words are spelled. But the spelling changes between rounds). This means that certain creatures, like xenos, cats, vulps, can communicate within their species in their own languages. Similarly, it means that xenos, cats and other things cannot understand GalacticCommon speakers without a translator or cognization. An entity may be able to speak multiple languages, or understand a language but be unable to speak it. Thi PR was orignally made for Frontier but is now being ported and will be maintain here. Orignal PR: new-frontiers-14/frontier-station-14#671 This PR was made orignally by Mnemotechnician and FoxxoTrystan. --- # TODO - [x] Language System. (Check Frontier PR for all the compleated todo list) - [x] Port PR from Frontier. - [x] QOL Changes. - [x] Missing Default Languages. (Missing default langauges for some roundstart species) - [x] Animals Languages. --- <details><summary><h1>Media</h1></summary> <p>    </p> </details> --- # Changelog :cl: FoxxoTrystan / Mnemotechnician - add: All species can now bring their own cultures and languages --------- Signed-off-by: Mnemotechnican <[email protected]> Signed-off-by: FoxxoTrystan <[email protected]> Co-authored-by: fox <[email protected]> Co-authored-by: Mnemotechnican <[email protected]> Co-authored-by: Pspritechologist <[email protected]> Co-authored-by: Lincoln McQueen <[email protected]> Co-authored-by: Arkyfloof <[email protected]> Co-authored-by: reese1243 <[email protected]> Co-authored-by: VMSolidus <[email protected]> Co-authored-by: Eagle-0 <[email protected]> Co-authored-by: BlitzDev <[email protected]> Co-authored-by: Arkyfloof <[email protected]> Co-authored-by: Danger Revolution! <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]>
DEATHB4DEFEAT
pushed a commit
that referenced
this pull request
Aug 19, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What? No conflicts? (other than maps)