Upstream Merge 2024-10-13 #260
Closed
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
# Description Part 3 of my evil plan to make salvage not suck: Give them a fancy goody, but with a twist. This PR adds the Pathfinder Expedition Vessel from Frontier, which replaces the Shittle as the default salvage shuttle to spawn on each map. I have my own funky reasoning for this. The primary one being, "The Pathfinder is powered by an AME. This means salvage are REQUIRED to periodically return to the station to get fuel. It is impossible for them to refuel themselves away from the station." It also, notably, spawns with an Expedition Console. More on that in a follow-up PR where I rework expeditions to work "More like Frontier". # TODO <details><summary><h1>Media</h1></summary> <p>   </p> </details> # Changelog :cl: - add: The Salvage Shittle has been replaced with the Pathfinder Expedition Vessel from Frontier.
# Description I apparently accidentally removed the Crusher weapons from their spawner. This PR corrects that. Additionally in case this ever happens again, I've also decided to add the Crusher Dagger as a loadout option for salvage techs. # Changelog :cl: - add: Salvage techs can now buy a Crusher Dagger in their loadout. - fix: Re-Added the Crusher weapons to salvage spawners.
<!-- 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 ports the "Gax" map directly from Estação Pirata, making some changes and corrections. This PR ports rbertoche/space-station-14#80 Gax is a recreated ss13 map, originally from YogStation (SS13) --- # 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 --> --- <!-- 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: - add: A new map called NCS Gax has been added to rotation. --------- Signed-off-by: Ichaie <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: VMSolidus <[email protected]>
# Description This PR *significantly* expands upon Loadouts available to the entire Security Department. First to note, is that all security roles no longer automatically spawn with a weapon, instead every security role has a single selection choice from the new Security Duty Weapon group, with many of the options being free or very little points. But it also now features significantly more options available. Players can freely choose whether they want their duty weapon loaded with Lethal vs. Nonlethal, with a modest restriction that Lethals require some Security playtime for Shitter Protection. The basic choices are either a Disabler, a Mk58, or an Inspector revolver, but players can spend loadout points to "Trade up" for a fancier gun. Security equipment now also includes selections of magazines for one's own Duty Weapon(The first magazine is free!), while a spare magazine can also be bought with some loadout points. I didn't forget Oni either, and I know they suck with guns. So Oni have an option of taking a Truncheon as their Duty Weapon. <details><summary><h1>Media</h1></summary> <p> New Duty Weapon selections  More Equipment selections!  </p> </details> # Changelog :cl: - tweak: Almost all security loadout gear is now free. - remove: All Security roles no longer spawn with a pistol by default. This has been moved to Loadouts. - add: Security characters can now choose from a selection of different firearms to use as their Duty Weapon. Disablers, Mk58, and Inspector revolvers are free, fancier weapons such as an N1984 can be bought with loadout points. - add: Oni can opt to take a Truncheon in lieu of a handgun. - add: Security characters can now take handgun magazines and spare magazines in their loadouts. - add: Security Backpacks to loadouts. - fix: Fixed issues with the security belt options(webbing, belt, holster) not correctly replacing the original item, and also not containing items either.
# Description Small fix for the Curadrobe not being accessible by the Librarian/Cataloguer. # Changelog :cl: - fix: Librarian/Cataloguer now correctly has access to his own clothing vendor.
# Description The two Psi-Potential traits are mutually exclusive(Due to adding the same component), but I forgot to add a condition that prevents you from taking both. # Changelog :cl: - fix: Fixed High & Low Psi-Potential traits lacking a requirement that you don't have the opposite trait. The two were mutually exclusive, so taking both caused issues.
# Description Just a small fix for Unathi language localizations. # Changelog :cl: - fix: Fixed localizations for the Sinta'Azaziba language.
# Description This improves the random barks by: - Fully moving the random barks to localization files, with the ability to re-use existing types - Adding many new (english) random bark types - Making the random bark system add a random punctuation mark at the end of a random bark - Adjusting some existing random bark configs This also reparents MobSecurityDog to MobCorgi and MobArcticFox to MobFox because for some reason delta-v decided to copy the original mobs instead of using inheritance??? Either way, laika and siobhan will now also have random barks, can be carried, etc. <details><summary><h1>Media</h1></summary> <p>     </p> </details> # Changelog :cl: - add: Animals now have more unique things to say when not controlled by a player. --------- Signed-off-by: Mnemotechnican <[email protected]> Co-authored-by: FoxxoTrystan <[email protected]>
# Description This significantly improves the quality of the language system by fixing the mistakes I've made almost a year ago while developing it. Mainly, this throws away the old half-broken way of networking in favor of the component state system provided by RT. Language speaker comp is now shared with SendOnlyToOwner = true, and its state is handled manually. In addition to that, this brings the following changes: - UniversalLanguageSpeaker and LanguageKnowledge are now server-side - DetermineLanguagesEvent and LanguagesUpdateEvent are now shared (so that future systems can be built in shared, if needed) - Everything now uses the ProtoId<LanguagePrototype> type instead of raw strings (god, I hated those so much) - The server-side language system now accepts Entity<T?> arguments instead of EntityUid + T - UniversalLanguageSpeaker is now based on DetermineEntityLanguagesEvent and gets an Enabled field, which allows to turn it off. This may have some use in the future. - Some minor cleanup <!-- TODO MEDIA <details><summary><h1>Media</h1></summary> <p>  </p> </details> --> # Changelog No cl --------- Co-authored-by: VMSolidus <[email protected]>
# Description This PR makes it so that Glimmer Mites can only spawn on "The Main Station", as defined by GetSpawnableStations. Yes this is seemingly pretty hardcodey, but because on our codebase it's simply not possible for GetSpawnableStations to ever return anything other than a list with an index of 0, we can extremely reliably count on GetSpawnableStations()[0] to be "THE Station". This fixes an issue whereby Glimmer Mites can spawn in places where it is simply not possible for players to reach them. Such as random asteroids in space, CENTCOMM, Nukie World, or the Syndicate Listening Outpost. # Changelog :cl: - fix: Glimmer Mites can no longer spawn anywhere other than "THE" Station.
<!-- 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]? --> Add a Custom Specie Name for servers that wishes to allow players to have custom names. This simply add some variables to the Profile/Humanoid, meaning copying the profile will keep the custom names. By default its is disabled, for servers owners wishing to enable those please edit the Specie Prototype and add: ``` customName: true ``` Enabling it will make it able for players to edit the specie name of the selected specie, and will have the window enabled. This is my first time fucking with Profile and Database, i fucking hate it. --- <!-- 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: - add: Custom Species Names. --------- Signed-off-by: FoxxoTrystan <[email protected]> Signed-off-by: VMSolidus <[email protected]> Co-authored-by: Mnemotechnican <[email protected]> Co-authored-by: VMSolidus <[email protected]>
# Description This PR adds several hardsuits to a new "hardsuits" category for the cargo menu. This is part of an ongoing effort to provide reworks to Salvage gameplay. This should pair quite well with merging Frontier's changes to Salvage Expeditions, as well as a variety of other changes I've been talking about. My theory is that if Expeditions are changed to provide money rewards deposited directly to the station's account, then Salvage can benefit the station by A: Providing station funds whether they want to or not. And B: Be encouraged to do so because by getting cargo a shitload of money, they will be able to directly buy the equipment needed to go on higher tier expeditions. And to do this without needing to gamble on wrecks for 2 hours straight, desperately hoping you get the specific wreck that contains that security hardsuit. <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog :cl: - add: Logistics can now directly order a variety of hardsuits. "NT In-Network" hardsuits being substantially cheaper thanks to backroom deals. --------- Signed-off-by: VMSolidus <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]>
# Description
This PR resprites the service uniforms with the Aurora variants, as well
as doing minor yaml cleanup for the base_clothinguniforms.yml
Aurora has 2-3 variants for service staff; based on which company
they're associated with. So far I've just picked the Nanotrasen variant,
because SS14 uses Nanotrasen.
My question is:
A) Should I port the extra uniforms and stick them in loadouts, for
variety & drip?
i) Should I keep the company names on these uniforms if I port them, or
should I keep it
Nanotrasen?
This PR also removes in-hand variants; they're not supported in aurora
and it's not critical game info to see someone carrying a shirt & pants.
This PR similarly removes the animal variants; the Vox PR should have
displacement maps to support it.
---
# TODO
- [X] Bartender Jumpsuit
- [X] Bartender Vest
- [X] Bartender Hat
- [X] Janitor Jumpsuit
- [X] Chef Jumpsuit
- [X] Chef Freezer Jacket
- [X] Chef Hat
- [X] Botanist Uniform
- [x] Librarian Uniform
^ Librarian Jumpsuit has been added with four extra variants, some
corporations who do not employ Librarians still have jumpsuit sprites.
---
<details><summary><h1>Media</h1></summary>
<p>
## Nanotrasen Bartender
## Nanotrasen Chef
## Nanotrasen Botanist
## Nanotrasen Janitor
## Nanotrasen Librarian
</p>
</details>
---
# Changelog
:cl: DangerRevolution
- add: Resprited basic Service Staff uniforms
- add: Add rolled sleeve variants for Service Staff uniforms.
# Description This PR adds a new "Head of Security's Antique Weapon Collection" item group to loadouts, which fully replaces the weapons that were originally map-specific entries for the Head of Security. Instead of whatever map giving the HoS a unique weapon in his office(And thus, overloading him with entirely too many guns), all of these weapons(And a few new ones) have been placed in their own special loadout category for the HoS. The HoS is entitled to a single free pick from any of these weapons. Now here's the fun tradeoff. All of them are steal objectives. Since it turns out the game will never give a steal objective to a traitor for an item that doesn't exist, I can actually make steal objectives for items obtainable only via Loadouts. Thus, all of the special weapons that the HoS can spawn with can be targeted by traitors. <details><summary><h1>Media</h1></summary> <p>      </p> </details> # Changelog :cl: - remove: The X-01 multiphase energy gun has been removed from the HoS locker. - add: A new Loadout Item Group, "Head of Security's Antique Weapon Collection" has been added. Rather than being given a unique weapon by whatever map creators put in the HoS Office, each Head of Security is entitled to a single item selected from this new loadout category, free of charge. But beware, whatever item chosen from this list may potentially be used as a Steal Objective for traitors. You may have a fancy new submachine gun, but it also makes you a target. - add: antique Bulldog, antique C-20r submachine gun, x-01 multiphase energy gun, antique energy sword, antique pulse pistol, antique Wt550, and a pair of Katana Sheaths have all been added as loadout options for the Head of Security.
<!-- 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 Port the RadStation map from Estação Pirata RadStation is a map made by CRISO, ported from BeeStation from ss13 to Estação Pirata, I made some updates to make the map playable on EE --- # 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 --> --- <!-- 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: - add: A map called "RadStation" has been added to rotation. - add: A new Evac shuttle called "emergency_neol" has been added to RadStation
# Description So you can actually muzzle a felinid to stop them from meowing. Or a vulp from barking. Or a human from screaming. You get the point. This muzzle part of this PR is a bit hardcode-y, but it's because the muzzle simply adds a replacement accent to the entity instead of using its own system to block speech. <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/0e5e4986-d2a0-471a-a119-579741265178 </p> </details> # Changelog :cl: - add: Sleeping and muzzled entities can no longer use vocal emotes (scream, meow, etc).
FoxxoTrystan
approved these changes
Oct 16, 2024
Yea, one of them is gonna be fixed on EE master, the other is python (pip) being shit. |
|
Okay, how about i just close this and merge latest EE instead, skipping two releases? |
Memeji
requested changes
Oct 19, 2024
Review the changes but also lets keep it the most stable version for the moment. |
Master is now less buggy than Stable. |
Report this here so it will actually be fixed. |
1 was commented out - I don't know why they were even added. |
Memeji
approved these changes
Oct 20, 2024
FoxxoTrystan
requested changes
Oct 20, 2024
Memeji
requested changes
Oct 20, 2024
Ye remove it from map rotation. |
Nah fuck that, I'll fix it myself thank you very much. |
Oops, should be fixed now. |
|
Done. @Memeji Please make sure to report future issues like this to https://github.com/Simple-Station/Einstein-Engines/issues |
Will do |
Memeji
approved these changes
Oct 20, 2024
|
This PR will not be merged, after some talk and request. We will Merge instead the latest "Master" of EE, il making a PR regarding it ASAP. |
|
Yea, by Floofmin's reqest, I have done nothing but fix bugs for 3 days. So EE Master has 3 entire pages of merged PRs that all fix issues reported to the issue tracker.
|
Do fork from this branch because otherwise you will face more merge conflicts. And as obvious as it may sound, do not remove any content that breaks due to the merge. We've already had enough content lost in previous merges (some of it is still not restored - secwatch is still missing, for example). |
|
OR I can do the master merge myself right now. Will be easier that way. |
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
Routine upstream merge. Salvage was given a big ass ship, cargo can now buy hardsuits and mine normality crystals (rest in peace code white, never to be remembered), some fixes, two new maps, and more.
Changelog
🆑