Upstream merge 6/10/2024 #22
Merged
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
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
…/Einstein-Engines into Psionic-Power-Refactor
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 <69920617+Mnemotechnician@users.noreply.github.com> Signed-off-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Co-authored-by: fox <daytimer253@gmail.com> Co-authored-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> Co-authored-by: Pspritechologist <81725545+Pspritechologist@users.noreply.github.com> Co-authored-by: Lincoln McQueen <lincoln.mcqueen@gmail.com> Co-authored-by: Arkyfloof <Marvinlinke08@gmail.com> Co-authored-by: reese1243 <ber23027@byui.edu> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Eagle-0 <114363363+Eagle-0@users.noreply.github.com> Co-authored-by: BlitzDev <145472107+Reese1243@users.noreply.github.com> Co-authored-by: Arkyfloof <161242062+Arkyfloof@users.noreply.github.com> Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
…/Einstein-Engines into Psionic-Power-Refactor
…o upstream-merge-6/10/2024
…am-merge-6/10/2024
|
RSI Diff Bot; head commit 68c8a3a merging into 2633ac1 Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi
Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi
Resources/Textures/Clothing/OuterClothing/Armor/security.rsi
Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi
Resources/Textures/Objects/Misc/fire_extinguisher.rsi
Resources/Textures/Objects/Misc/stock_parts.rsi
Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi
Resources/Textures/Structures/Decoration/banner.rsi
Resources/Textures/Structures/Furniture/furniture.rsi
Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi
Resources/Textures/Structures/Wallmounts/screen.rsi
Resources/Textures/Structures/Walls/solid_rust.rsi
Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi
Resources/Textures/Mobs/Customization/spidereyes.rsi
Resources/Textures/Mobs/Species/arachne.rsi
Resources/Textures/Mobs/Species/eyes.rsi
Resources/Textures/Nyanotrasen/Structures/cocoon.rsi
|
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> This PR add a bunch of Misc Repsrites and others fixes that i have missed. This PR will avoid ALL .yml changes and will focus on only "Sprites" changes. Here is the following list of Changed Sprites: • Rust Solid/Reinforced Walls • Stunbaton • Banners • Radiation Collector • Riot Suit • Bulletproof Vest • Armor Vest • Slim Armor Vest • Fire Extinguisher • Stock Parts • Rack • Screen # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Port/Resprites. --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - tweak: Rust Walls Sprites. - tweak: Armor, Bulletproof, Riot Suit Resprites. - tweak: New Banners Sprites. - tweak: Stunbaton, Fire Extinguisher New Sprites. - tweak: Rack/WallScreen resprites. - tweak: Stock Parts new sprites! - tweak: Radiation Collector has now a new sprite!
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.
About the PR
This merges the most up to date version of Psionics, which fixes a MULTITUDE of bugs reported by Deep Station 14. I'd like to thank everyone involved in playtesting for reporting these! As a show of my appreciation, have some fun new content. I've gone ahead and added Arachne and Oneirophages to the playtest, the former is a new playable species! And the latter is a new midround event monster!
Oneirophages are quite special in this case, as they are Psychic giant spiders! I'm quite excited to get feedback from them, and see how they do with the Psychic Refactor!