Merge Upstream #41
Closed
Merge Upstream #41
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
* Station AI overlay * implement * Bunch of ports * Fix a heap of bugs and basic scouting * helldivers * Shuffle interactions a bit * navmap stuff * Revert "navmap stuff" This reverts commit d1f89dd4be83233e22cf5dd062b2581f3c6da062. * AI wires implemented * Fix examines * Optimise the overlay significantly * Back to old static * BUI radial working * lots of work * Saving work * thanks fork * alright * pc * AI upload console * AI upload * stuff * Fix copy-paste shitcode * AI actions * navmap work * Fixes * first impressions * a * reh * Revert "navmap work" This reverts commit 6f63fea6e9245e189f368f97be3e32e9b210580e. * OD * radar * weh * Fix examines * scoop mine eyes * fixes * reh * Optimise * Final round of optimisations * Fixes * fixes
* Verb tweaks Remove the LOS check because this is already done above in CanExamine. * Fix outlines * import
* ItemToggle + slots stuff - Add component for itemslot locks to match LockComponent (surprised this didn't exist). - Add thing for pointlight to match itemtoggle. In future should be used for PDAs and stuff but need to fix some other stuff first. * Also this * grill
* Station AI overlay * implement * Bunch of ports * Fix a heap of bugs and basic scouting * helldivers * Shuffle interactions a bit * navmap stuff * Revert "navmap stuff" This reverts commit d1f89dd4be83233e22cf5dd062b2581f3c6da062. * AI wires implemented * Fix examines * Optimise the overlay significantly * Back to old static * BUI radial working * lots of work * Saving work * thanks fork * alright * pc * AI upload console * AI upload * stuff * Fix copy-paste shitcode * AI actions * navmap work * Fixes * first impressions * a * reh * Revert "navmap work" This reverts commit 6f63fea6e9245e189f368f97be3e32e9b210580e. * OD * radar * weh * Fix examines * scoop mine eyes * fixes * reh * Optimise * Final round of optimisations * Fixes * fixes
* Move SleepingSystem to Shared & cleanup * Remove empty OnShutdown handler
Applies EntProtoId changes upon insertion / removal from container. Can also be useful for borgs / mechs / vehicles in future but atm I just used it for AI.
Co-authored-by: slarticodefast <[email protected]>
* Re-add improved random sentience event * Make randomly sentient PDA more likely * Make vending machine sentience less likely * Make requested changes * Make randomly sentient captain's gear more likely * Sentient captain sabre has pirate accent * Tweak new random sentient object a bit more * Sentient PDA improvements * Apply recommended fixes * Add requested changes * Fix merge conflict
# Description **(Use a MERGE COMMIT, not squash if possible to ~~avoid~~ reduce merge conflicts for our downstream)** Cherry-picks some PRs from The Den: - TheDenSS14/TheDen#8 - TheDenSS14/TheDen#31 - TheDenSS14/TheDen#108 - TheDenSS14/TheDen#116 - TheDenSS14/TheDen#117 - TheDenSS14/TheDen#123 - TheDenSS14/TheDen#124 # 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: The Den Contributors - fix: Put actual prescription lenses in the prescription medhuds and sechuds (by KyuPolaris) - add: Added the CMO turtleneck and head mirror to the CMO loadouts. (by sleepyyapril, KyuPolaris) - add: Added an armored trenchcoat for the Captain. Enjoy your swag! (by Rosycup) - fix: Fixed uneven pants leg on summer security uniforms. (by Rosycup) - add: Added the Captain's Combat Gas Mask, for those more fond of close encounters. (by Rosycup) - tweak: Added the Captain's Trenchcoat to the other captain locker variants. (by Rosycup) - fix: Fixed they/them pronouns being displayed for it/its characters in the character preview. (by Azzy) --------- Co-authored-by: flyingkarii <[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 <!-- 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]? --> Port from [WWDP](WWhiteDreamProject/wwdpublic#212) --- <!-- 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> How it was before:  How is it now:  </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: Spatison - fix: Humanoid color in the spawn panel is now correct. - fix: IPCs can no longer spawn invisible.
<!-- 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]? --> Makes non-verbal languages no longer emit speech sounds. Ported from [Goob-Station-MRP#29](Goob-Station#29) at @angelofallars's request. --- <!-- 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: Languages that don't require speech (I.E. Sign Language) will no longer play speech sounds. --------- Signed-off-by: RadsammyT <[email protected]> Co-authored-by: Skubman <[email protected]> Co-authored-by: flyingkarii <[email protected]> Co-authored-by: sleepyyapril <[email protected]> Co-authored-by: SimpleStation Changelogs <[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 This adds the Time Transfer Panel that Goobstation uses. This panel enables Admins to do Time Transfers without commands and makes their lives easier. This immediately has access to all playtime trackers and allows an Admin to Add Time and/or Set Time (overwriting the previous time) for any job role. It also enables extra strings since I ported from Wizden upstream as well, which can be seen in the commit history. A thing of note when testing this and using it in a server: the times **DO NOT UPDATE** for Client until your **RELOG**. This is how it works on Goobstation as well. The time adding process is faster and will be easier tool. This is tied to the AdminFlags.Admin so it can be customized on a per-server basis if a custom flag is added. --- # TODO - [x] Port Upstream Role Define. - [x] Port string extras for playtime commands. - [x] Port Time Transfer Panel - [x] Remove Overall (it just doesn't work on Goob either). --- <details><summary><h1>Media</h1></summary> <p>          </p> </details> --- # Changelog :cl: ADMIN: - add: Add Time Transfer Panel --------- Co-authored-by: BombasterDS <[email protected]> Co-authored-by: Leon Friedrich <[email protected]> Co-authored-by: flyingkarii <[email protected]>
I'm not fully confident in this fix, I can't test it right now. closes #1409 1409 --------- Co-authored-by: Leon Friedrich <[email protected]>
# Description Fixes notifications so that they always trigger when the chat is not open, fixes a possible exploit where a user can send a message that is longer than the max message length, and improves the UX of NanoChat in a few areas. Original message from Goob-Station/Goob-Station#1313: > Fixed NanoChat message notifications not showing up in situations where you'd definitely expect them to occur. > > Now, for a chat to not send a notification upon a new message, three conditions need to be fulfilled: > - You don't have the chat muted > - Your PDA UI is open > - You have NanoChat as your open program > - Your currently-selected chat is the aforementioned chat More changes: - Validate NanoChat message length & chat name/job title length on the server Goob-Station/Goob-Station@c063001. -If they are too long, they will be truncated to the maximum length. - Improve the UI for editing a chat: - Added a proper icon (used to be the letter E) for the Edit Chat button.  - The Edit Chat popup now has correct text: the title is now "Edit a contact", not "Add a new chat" and the Create button has been renamed to the Confirm button.  - Editing a chat no longer deselects the current chat. - This is done by adding a new NanoChatUiMessageType entry, `EditChat` and a new server-side handler function just for chat edits. The previous edit chat method simply *deleted* the chat from the client and created a new one. - Form validation is now more robust: you can now only submit the edit if you've made changes to the name or job title. - Fixed NanoChat not appearing in PDAs with more than 5 pre-installed programs by increasing the PDA disk space (max program count) from 5 to 8, the current disk space in Wizden.  - The job title now appears on the notification title.  - The title will be truncated if it's too long.  - Improved form validation on the New Chat popup by only allowing users to submit if the Number field is 4 numbers long. Previously, inputs like "0" "12" "289" were valid which is ultimately incorrect as phone numbers function more like strings that just happen to be digit-only and less like actual numbers.  - The left chat list will now truncate names and job titles if they're too long.  ## Changelog :cl: Skubman - add: NanoChat message notifications will now show you the job title of the sender alongside their name. - add: The NanoChat edit button now has a proper icon. - tweak: The disk space (max amount of installable programs) on PDAs has been increased from 5 to 8. This also fixes a bug where NanoChat was not being installed on PDAs with more than 5 pre-installed cartridges. - tweak: The character limit for names and job titles in NanoChat has been increased to their actual limit on ID cards (30 characters). - tweak: NanoChat chat list names/titles and notification titles that are too long will be shortened, indicated with "..." at the end. - tweak: The NanoChat edit popup now displays the correct text, instead of appearing identical to the new chat popup. - fix: NanoChat will now send a new message notification no matter what if you don't have the chat open. - fix: Editing a chat in NanoChat no longer deselects that chat. - fix: Fixed a issue where users could potentially send NanoChat messages longer than the maximum allowed message length. - fix: Fixed being able to create a new chat when you haven't typed in 4 digits in the number field.
Found it. Had to trace everything calling the Ai Whitelist component, and found this system was closing all UIs if you weren't an AI and were trying to interact with a computer with said whitelist component.
<!-- 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]? --> Shadow shackles should not bind the target instantly. --- # 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: Spatison - tweak: Shadow shackles now have a delay before binding - fix: Shadow shackles can now be removed --------- Signed-off-by: Spatison <[email protected]>
…noid Spawner (#1497) # Description Title. Refers to [this](https://github.com/Simple-Station/Einstein-Engines/actions/runs/12688697909/job/35365794632?pr=1466) --- # Changelog no cl no fun --------- Signed-off-by: Remuchi <[email protected]> Signed-off-by: Remuchi <[email protected]>
# Description This PR adds an Ore Silo to every map in rotation. It also adds a station AI to (almost) every map. A decent number of the maps had to have a shitton of cameras added to make AI actually playable. In particular Glacier is/was/probablystillis pretty bad for AI. <details><summary><h1>Media</h1></summary> <p> </p> </details> # Changelog :cl: - add: Added Station AI to (almost) every map in rotation. - add: Added Ore Silos to every map in rotation.
# Description Fixes Simple-Station/Einstein-Engines#1498 Funny trig errors go brrr. :cl: - fix: Fixed an issue where ranged NPCs were incapable of aiming.
# Description Pretty simple fix, just tell the weather system "If there's already a weather sound playing, stop.". I have infact tested this, and verified that this fix does work. Fixes Simple-Station/Einstein-Engines#1285 # Changelog :cl: - fix: Fixed a crash caused by Weather System creating millions of sounds.
<!-- 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]? --> Adds a command that adds the playtime requirements of a job. --- # 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: ADMIN: - add: Added a command to easily allow for adding a jobs playtime requirements. (playtime_unlock)
yeag --------- Co-authored-by: Pieter-Jan Briers <[email protected]> Co-authored-by: Leon Friedrich <[email protected]>
…ngines into merge-upstream
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.
No description provided.