forked from Simple-Station/Einstein-Engines
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
another draft pr for plasmaman #2
Open
angelofallars
wants to merge
209
commits into
master
Choose a base branch
from
plasmaman
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
github-actions
bot
added
Changes: C#
Changes: Localization
Changes: YML
Changes: Sprite
labels
Nov 23, 2024
RSI Diff Bot; head commit f19ec98 merging into 5476ee0 Resources/Textures/Clothing/Head/Envirohelms/plain.rsi
Resources/Textures/Clothing/Uniforms/Envirosuits/plain.rsi
Resources/Textures/Effects/speech.rsi
Resources/Textures/Mobs/Species/Plasmaman/organs.rsi
Resources/Textures/Mobs/Species/Plasmaman/parts.rsi
|
TODO: add plasmaman eyes sprite
When there are not enough items in a group, the loadout system will load the default items. When the selected items in a group exceeds the maximum amount allowed, the system will just reduce the amount of items to the max amount instead of not loading anything at all. TODO: Backend is fine, need to handle the client UI stuff of this
Internals are still turned off by toggling the envirosuit tho so might need to cherry pick #28595 from wizden
plasmillions must endure 3 leading spaces on an empty lline Signed-off-by: Skubman <[email protected]>
Signed-off-by: Skubman <[email protected]>
Signed-off-by: Skubman <[email protected]>
…Simple-Station#1378) # Description Fixes Simple-Station#1374 I'm not sure exactly when this changed, but you now have to specify which solution you want to inject. Also inject on hit defaults to ignoring clothing, so I removed the redundant set. --- # Changelog :cl: - fix: Fixed mindbreaker and soulbreaker cartridges not injecting their solutions. Co-authored-by: sleepyyapril <[email protected]>
Ports Goob-Station/Suspicion-on-Space-Station#47 Thanks Goob for helping out. Co-authored-by: Icepick <[email protected]> # Description By request from OldDanceJacket and the SiN Mapping Team <details><summary><h1>Media</h1></summary> <p> </p> </details> # Changelog :cl: - add: Ported several metric tons of mapping assets from Nuclear14 Co-authored-by: Aiden <[email protected]> Co-authored-by: Icepick <[email protected]>
Lots of stuff. Also moved everything I could to the _Shitmed namespace as I do in Goob. Will make future ports way faster # Changelog :cl: Mocho - add: Added some fun organs and other thingies, check out the Goob PRs if you want more details. - fix: Fixed tons of issues with shitmed. Too many for the changelog in fact.
# Description I broke some things # Changelog :cl: Mocho - fix: Fixed heights/widths being broken due to the shitmed patch.
# Description They say Rome wasn't built in a day, well this entire PR was coded in a single 6 hour Adderall binge. This PR represents the next big leap in code capability for the PsionicSystem, completely reworking how Psionic Powers are added and removed, such that like the TraitSystem, they utilize modular functions governing how they work. Instead of there being only 5 different hardcoded things that Psi Powers can do, there is now a library containing 21 different modular functions, which are slotted as desired into the power prototypes. Additionally, a significant improvement in the logical flow of this is that since each power is responsible for its own "removal codepath", it's now possible to remove individual powers from a character, as opposed to always needing to wipe the slate clean entirely. I'm not going to add any new powers in this PR, nor am I touching the code for the Psionic Actions themselves, that'll come in Part 2, in which I refactor the Psionic-Actions so that they also operate on similar stacks of modular functions. This PR also makes extensive refactors to the PsionicPowerPrototype, as well as PsionicAbilitiesSystem, so that it has all new hooks and datafields for other systems to be able to modify a psion. It is now entirely feasible to create unique "Types" of Psions, with their own distinct power lists. It's also now possible to create "Tech Trees" of powers, by setting up powers such that they write to and modify the personalized pool of available powers to generate. For example, Xenoglossy and Psychognomy are now dependent on Telepathy, and simply won't appear in the list of available powers if a Psion doesn't first have Telepathy. # Changelog :cl: - add: Psionic Refactor V3 is here! No new powers are added in this update, but the options for creating new powers has been SIGNIFICANTLY EXPANDED. - add: Xenoglossy and Psychognomy now can only be rolled if you first have the Telepathy power. - add: Breath of Life can now only be rolled if you first have the Healing Word power - add: Pyrokinesis and Summon Imp now require the Pyroknetic Flare power - add: All new Psychognomy descriptors for many pre-existing powers. Have fun being unintentionally screamed at telepathically by someone with the POWER OVERWHELMING trait.
# Description The slider would jump around to fix the constraints because a division symbol was mistakenly replaced with a multiplication symbol, this fixes that. --- <details><summary><h1>Media</h1></summary> <p> ![edf53e72db6e17d97df08940f04e72d7](https://github.com/user-attachments/assets/b4ebcca5-e56b-41ab-8200-a2235d9b6f7c) </p> </details> --- # Changelog :cl: - fix: The width slider in the profile editor view now moves correctly regarding the height slider. Co-authored-by: sleepyyapril <[email protected]>
# Description Cherry picks space-wizards/space-station-14#29678 Needed for emotes to not be packed tightly together, also need this for a future PR where I will be fixing emotes in general ◕‿◕) --- <details><summary><h1>Media</h1></summary> <p> ![image](https://github.com/user-attachments/assets/bc58aee6-f615-4f6d-ad9a-793c482f3da6) </p> </details> --- # Changelog :cl: - fix: Fixed radial menus overlapping where there's many icons. Co-authored-by: Rinary <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: sleepyyapril <[email protected]>
<!-- 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 the adding AI is now up to y'all because i'm not touching loadout code for name datasets, but it shouldn't be too bad from here --------- Signed-off-by: sleepyyapril <[email protected]> Signed-off-by: SolStar <[email protected]> Signed-off-by: deltanedas <[email protected]> Co-authored-by: themias <[email protected]> Co-authored-by: Verm <[email protected]> Co-authored-by: DrSmugleaf <[email protected]> Co-authored-by: Sphiral <[email protected]> Co-authored-by: Ed <[email protected]> Co-authored-by: Mr. 27 <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: Alzore <[email protected]> Co-authored-by: ravage <[email protected]> Co-authored-by: slarticodefast <[email protected]> Co-authored-by: Intoxicating-Innocence <[email protected]> Co-authored-by: Saphire <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: Errant <[email protected]> Co-authored-by: Tayrtahn <[email protected]> Co-authored-by: CaasGit <[email protected]> Co-authored-by: BramvanZijp <[email protected]> Co-authored-by: Boaz1111 <[email protected]> Co-authored-by: NakataRin <[email protected]> Co-authored-by: Kara <[email protected]> Co-authored-by: Plykiya <[email protected]> Co-authored-by: SlamBamActionman <[email protected]> Co-authored-by: Doomsdrayk <[email protected]> Co-authored-by: Brandon Hu <[email protected]> Co-authored-by: SlamBamActionman <[email protected]> Co-authored-by: ElectroJr <[email protected]> Co-authored-by: Pieter-Jan Briers <[email protected]> Co-authored-by: DrSmugleaf <[email protected]> Co-authored-by: Julian Giebel <[email protected]> Co-authored-by: nikthechampiongr <[email protected]> Co-authored-by: Repo <[email protected]> Co-authored-by: Chief-Engineer <[email protected]> Co-authored-by: icekot8 <[email protected]> Co-authored-by: AJCM-git <[email protected]> Co-authored-by: Leon Friedrich <[email protected]> Co-authored-by: no <[email protected]> Co-authored-by: Tornado Tech <[email protected]> Co-authored-by: osjarw <[email protected]> Co-authored-by: Simon <[email protected]> Co-authored-by: TGRCDev <[email protected]> Co-authored-by: Milon <[email protected]> Co-authored-by: deltanedas <[email protected]> Co-authored-by: ShadowCommander <[email protected]> Co-authored-by: Fildrance <[email protected]> Co-authored-by: pa.pecherskij <[email protected]> Co-authored-by: chavonadelal <[email protected]> Co-authored-by: SolStar <[email protected]> Co-authored-by: K-Dynamic <[email protected]> Co-authored-by: lzk <[email protected]> Co-authored-by: ArchRBX <[email protected]> Co-authored-by: archrbx <[email protected]> Co-authored-by: Radezolid <[email protected]> Co-authored-by: Nemanja <[email protected]> Co-authored-by: EmoGarbage404 <[email protected]> Co-authored-by: MilenVolf <[email protected]> Co-authored-by: Velcroboy <[email protected]> Co-authored-by: Velcroboy <[email protected]> Co-authored-by: neuPanda <[email protected]> Co-authored-by: neuPanda <[email protected]> Co-authored-by: Dvir <[email protected]> Co-authored-by: Whatstone <[email protected]> Co-authored-by: VideoKompany <[email protected]>
# Description This PR adds three new admin commands that make use of the new functionality available to Psionics V3. These commands are: - addrandompsionicpower This takes a Uid and throws it at the random psi power generation code. Which gives it a random psi power that is available in its list of rollable powers. - removepsionicpower This takes a Uid and a PsionicPower prototype ID, and attempts to remove that power from said entity. It does nothing if the entity doesn't have that power. - removeallpsionicpowers As above, but instead of needing to declare a power prototype, it just removes ALL powers that the entity has, if any. # Changelog :cl: - add: Added new admin commands AddRandomPsionicPower, RemovePsionicPower, and RemoveAllPsionicPowers. --------- Signed-off-by: VMSolidus <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]>
# Description I might've missed a few things but my eyes hurt from staring at emote prototypes and the emote wheel so this is complete! Fixes emotes showing for species that can't use them, animated emotes now working, cherry picked emote icons from wizden and goob station, and added IPC emotes onto borgs. --- <details><summary><h1>Media</h1></summary> <p> I'm not taking videos of every species emoting with each emotes, so have a picture of the vocal emotes on a harpy :3 ![image](https://github.com/user-attachments/assets/f1f3d94d-6173-46bf-88fd-c9b146a2a768) </p> </details> --- # Changelog :cl: - add: Borgs can now use IPC emote - add: All species missing sounds for vocal emotes have generic sounds - tweak: Emote Icons resprited in the style of twemoji - fix: *flips *spins *jumps emotes now work - fix: Emote wheel now shows the right emotes for your species --------- Signed-off-by: VMSolidus <[email protected]> Co-authored-by: Rinary <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: BombasterDS <[email protected]> Co-authored-by: Rouge2t7 <[email protected]> Co-authored-by: lzk <[email protected]> Co-authored-by: VMSolidus <[email protected]>
Unneeded after the wizmerge
TODO: CC plasmaman outfits, ghost role outfits, nukie outfits, dead corpse outfits
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.
Description
Description.
TODO
Media
Changelog
🆑