Merge Upstream and Enable Sneks #21
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
<!-- 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]? --> There are a _lot_ of issues surrounding Europa, which include, but the big two are: - How many complaints I'm receiving about it in general. - Engineering issues, including a lack of an alternative beyond an SM (supposedly) - Lacking a cryosleep area. - Distro air and waste are connected together. - More here Simple-Station/Einstein-Engines#1379 (comment) Is there a way we can add people to review maps specifically? I'm not a mapper, but the last few maps that have gotten through have been _bad_ at the start. --- # 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: - remove: *Temporarily* removed Europa from map pool, pending some refurbishing.
<!-- 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 compleatly rework shadowkins, slightly been forced this makes shadowkins more "psionic creature" then anything else. This is a WIP, but in general this PR make Shadowkin "Psionic" and fall under the same rule. RIP Shadowkin for me but ye. CHANGES TO SHADOWKINS: Shadowkins now follow the laws of psionic, they will always spawn with DarkSwapPower but can generate others power, they do not spawn with Shadeskip by default anymore, Mana has been lower from 250 to 200; they can now pick normal psionic jobs. Changes to DarkSwap: DarkSwap cost 30 Mana and will raise glimmer on use, its will drain 1 Mana/Sec, will eject the user when mana is fully drained. DarkSwap is now a random roll. Changes to Psionics: Added the Mana Alert for all psionics --- # 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] Psionic Mana Alert - [x] DarkSwap Rework - [x] Remove Unique Shadowkin Psionic Changes - [x] Import bugs fixes/QOL changes. --- <!-- 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> N/A </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: Shadowkins has returned and has been reworked. - add: DarkSwap is now in the Psionic Power Pool. - tweak: Psionics can now see their mana pools. --------- Signed-off-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
# Description Simple-Station/Parkstation-Friendly-Chainsaw#2 space-wizards/space-station-14#21352 --- <details><summary><h1>Media</h1></summary> <p> <!-- https://github.com/user-attachments/assets/701512ce-1bf2-4020-a2eb-ba1e35b18669 --> https://github.com/user-attachments/assets/d01f01b9-dae7-4d05-91db-ac6e3de30e9f </p> </details> --- # Changelog :cl: - tweak: Added back support for the action bar to have "loadouts" or quick layouts of actions (man, how many things are called loadouts?)
# Description Arrivals spawns have been limited to only the massive cryogenics bay, and impassable barriers have been added that block access to the deeper parts of Terminal. I've also modified the admeme items that were in displays so that they are now fake items that can't actually be used by players even if they SOMEHOW smash their way in and defeat the turrets. I have photo evidence of people doing this. Just in case, I also made arrivals a ProtectedGrid. # Changelog :cl: - tweak: Tweaked arrivals to reduce the playable area, and some concessions have been made to prevent access to admeme items that were on display. These changes are pending a later update where we port Arrivals Job Spawns.
<!-- 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]? --> Long story short, cargo and command abuses the new reverse-engineered suits and warning them as admins about it is getting quite tiring. So I decided to put my hand to the craft and comment them out for now, until a better way for them to be gotten is made. I have also taken this opportunity to fix some of the longstanding issues with cargo I have had, such as there missing sec masks in the riot crate or there not being a way to get the swat items. While I am still missing the properly developed versions with space proofing and minor cold/head protection, the old non ARCS riot suit will do for now. This PR fixes Simple-Station/Einstein-Engines#1376 --- # 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] Remove problematic items from cargo - [x] Add proper swat crate Opt: - [x] Make proper swat set (soon:tm:) - [x] Adjust the armor values to fit better (can be delayed) --- <!-- 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> I ain't got nothing chief. </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: - add: Added swat suit - add: Added swat crate - add: Added new crate category for secure reinforced crates - tweak: Tweaked security supplies and crates - tweak: Tweaked the price of Cybersun's tacsuits because apparently they weren't charging enough to properly scam salvage techs. - tweak: Tweaked `StructuralMetallicStrong` structural protection from 10 to 80 --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com>
# Description THESE GUYS CAN AND DID SOLO ENTIRE STATIONS, WHAT THE HELL? # Changelog :cl: - tweak: NERFED WISPS, A LOT.
… (#1378) # Description Fixes #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 <123355664+sleepyyapril@users.noreply.github.com>
Ports Goob-Station/Suspicion-on-Space-Station#47 Thanks Goob for helping out. Co-authored-by: Icepick <122653407+Icepicked@users.noreply.github.com> # 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 <aiden@djkraz.com> Co-authored-by: Icepick <122653407+Icepicked@users.noreply.github.com>
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>  </p> </details> --- # Changelog :cl: - fix: The width slider in the profile editor view now moves correctly regarding the height slider. Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
# 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>  </p> </details> --- # Changelog :cl: - fix: Fixed radial menus overlapping where there's many icons. Co-authored-by: Rinary <72972221+Rinary1@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
<!-- 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 <123355664+sleepyyapril@users.noreply.github.com> Signed-off-by: SolStar <44028047+ewokswagger@users.noreply.github.com> Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: themias <89101928+themias@users.noreply.github.com> Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com> Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com> Co-authored-by: ravage <142820619+ravage123321@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Intoxicating-Innocence <188202277+Intoxicating-Innocence@users.noreply.github.com> Co-authored-by: Saphire <lattice@saphi.re> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: CaasGit <87243814+CaasGit@users.noreply.github.com> Co-authored-by: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com> Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com> Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: SlamBamActionman <slambamactionman@gmail.com> Co-authored-by: Doomsdrayk <robotdoughnut@comcast.net> Co-authored-by: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Co-authored-by: ElectroJr <leonsfriedrich@gmail.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> Co-authored-by: Julian Giebel <juliangiebel@live.de> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com> Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com> Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: no <165581243+pissdemon@users.noreply.github.com> Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com> Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com> Co-authored-by: TGRCDev <tgrc@tgrc.dev> Co-authored-by: Milon <milonpl.git@proton.me> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Co-authored-by: Fildrance <fildrance@gmail.com> Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru> Co-authored-by: chavonadelal <156101927+chavonadelal@users.noreply.github.com> Co-authored-by: SolStar <44028047+ewokswagger@users.noreply.github.com> Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: ArchRBX <5040911+ArchRBX@users.noreply.github.com> Co-authored-by: archrbx <punk.gear5260@fastmail.com> Co-authored-by: Radezolid <snappednexus@gmail.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: EmoGarbage404 <retron404@gmail.com> Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Co-authored-by: Velcroboy <velcroboy333@hotmail.com> Co-authored-by: neuPanda <chriseparton@gmail.com> Co-authored-by: neuPanda <spainman0@yahoo.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone <whatston3@gmail.com> Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com>
# 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 <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
# 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  </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 <evilexecutive@gmail.com> Co-authored-by: Rinary <72972221+Rinary1@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: BombasterDS <115770678+BombasterDS@users.noreply.github.com> Co-authored-by: Rouge2t7 <81053047+Sarahon@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com>
# Description Red Shirt and BBD didn't follow the pattern of disallowing their opposite traits from being equipped (I.e. tenacity v glass jaw, will to live v will to die, amplification v dampening traits). --- :cl: - tweak: You can no longer simultaneously equip Red Shirt and Brittle Bones Disease and their positive counterparts, Will To Live and Tenacity. Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
# Description I'll add the missing localization strings in a separate PR. --- <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
# Description Actual localization strings added in different PR. --- <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
# Description Ifrit originally had no name and description for it's ghost role, so it appeared as "Unknown". I also went ahead and added rules for it, and made the wizard summon of ifrit distinct. Solves #855 --- # Changelog :cl: - fix: Ifrit name and description now show up properly in ghost roles Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
# Description Hardsuits are base set to deal 30 damage when colliding with someone, which makes sense if you assume they are fucking heavy. But they currently weigh 5kg. After a quick google search, I found that the Apollo Program EVA Suits weighed 68kg. So to make this simple, I set the weight of the Vacsuit Parent to 68kg, and the Hardsuit Parent to 100kg. My assumption is that Hardsuits and Tacsuits are typically armored, either with radiation shieleding or ballistic plates, so they should be MUCH heavier. This has a desired effect that Space Wind is significantly less likely to throw hardsuits at people. I wrote this calculator to automate solving for density. https://www.desmos.com/calculator/xniuqcjmfe Part of Simple-Station/Einstein-Engines#460 # Changelog :cl: - tweak: Vacsuits now weigh 68kg instead of 5kg. This matters for Space Wind being a lot less likely to throw them at people. - tweak: Hardsuits and Tacsuits now weigh 100kg instead of 5kg. Also for space wind. They deal 30 damage on throw collision, so it's pretty important that space wind needs a lot of oomph to throw them across the room.
# Description Chatstack. Can be changed/disabled in settings, and the chat automatically updates to reflect the change. Does not interfere with filters, etc. Also updated ChatMessage class and serverside IChatManager with a new IgnoreChatStack bool option, default false. Currently is limited to looking up to 3 messages behind, only because I feel off adding a textbox to the options. --- # TODO - [x] Make sure it works - [x] Add it to settings --- <details><summary><h1>Media</h1></summary> <p>  [ee.webm](https://github.com/user-attachments/assets/bf1c92f0-b52a-47a0-b142-70b1ee5003cc) </p> </details> --- # Changelog :cl: - add: Chatstack. Look for it in Options under "General - Accessibility". --------- Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
<!-- 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]? --> Howdy Folks, sorry it took a while but here's Meta with the emergency shuttle. My biggest change was logistics for Salvage so they could fit their Salvage shuttle. I also increase each department's materials steel glass and plastic. <!-- 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: Mike32oz - added: Meta-Station - added: jobs slots robotics, MailCarrier, PrisonGuard, Prisoner,Brigmedic, ForensicMantis - increased: Jobs slots - added: Spare ID in vault - fix: Warden has a shotgun in the locker. - remove: AI, AI/cyborgs upload, and laws cards.
|
I was going to do this either way later tonight so thanks for doing my job for me :godo: I'll wait for checks to pass before merging. |
GoobBot
added a commit
that referenced
this pull request
Jan 4, 2025
YIPPEEE |
|
yeah this is fuckin broken as hell 👎 |
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
I want to play snek :3
Changelog
🆑