-
Notifications
You must be signed in to change notification settings - Fork 19
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
EE Merge + Station AI #148
Merged
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
* 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: - #8 - #31 - #108 - #116 - #117 - #123 - #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]>
# Description Fixes face markings rendering above clothing, most noticeably eye-wear by moving the Face layer below the Eyes layer on all species. ## Media Before (red markings rendering above sunglasses): ![image](https://github.com/user-attachments/assets/cd8979e0-7d0b-4fb6-a83f-00e9a2d6a2ce) After: ![image](https://github.com/user-attachments/assets/e3181616-fb0d-4a2c-9998-180bf6d3ad2d) # Changelog :cl: Skubman - fix: Fixed face markings showing up above eye-wear.
# Description Adds a prisoner headset box for warden's locker Reason: There's too much chaos in security and making radio headsets with pure encryption keys takes time and tools. More so cause by the time someone gets a perma punishment, its gonna be most likely late in the round and sec department will be dealing with a lot of things at the same time. --- <details><summary><h1>Media</h1></summary> <p> ![Content Client_LlH3OUGtCU](https://github.com/user-attachments/assets/ea20a648-9606-4104-9787-0766966bd358) ![Example Media Embed](https://example.com/thisimageisntreal.png) </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 prisoner headset box to warden's locker.
<!-- 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]? --> N1984 exists, but you can't print more ammo reliably. You can refill them, sure, but the moment you lose a magazine, it's gone forever. This adds the magazines and adds the unique mags to the research. Edit: Turns out there's like a lot missing in the lathe, so I decided to just add the missing ones I found. --- <!-- 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> Nothing here </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 missing lathe recipes
<!-- 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]? --> When attempting to insert an organ, a check is now performed to ensure a container exists for it. Skeletons can now lie down, and nymphs can now be subject to surgery. --- # 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: Nymphs are now operable. - fix: Skeletons can now lie down. - fix: It is no longer possible to insert an organ into a body if the required space is unavailable.
(cherry picked from commit 07dfefc4a29927aa74cfd5c7e75c6cb344d713f6)
* Fixup playerspawn stuff - Also removed arrivals forcing, this should just turn containerspawnpoint off. * fix this one * test fix * really fix
… is radio-ed too (#31170) * feat: now when research is unlocked in console, approver of reasearch is radio-ed too * refactor: now most of events that require actor name to be radio-ed or logged use TryGetIdentityShortInfoEvent which is subscibed by id-card system and borg system (to work for both carbon and synthetic life-forms) * refactor: moved TryGetIdentityShortInfoEvent on id card system to shared, fixed cargo cent-com-originated orders * remove unused check * refactor: decoupled systems from IdCardSystem (those that are not dependent on it anymore) * refactor: removed unuseed usings * feat: emagged cargo/research consoles wont radio messages on buy/research confirm anymore --------- Co-authored-by: pa.pecherskij <[email protected]>
* add LoggingDisabled to AccessReader * add LogWireAction * -m give everything besides high-security door a log wire * make LogAccess public and support string arg * add log when pulsing * m * l --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
# Description Howdy y'all. I'm making some changes at the Meta station. I'm adding AI to the station, with a laws circuit board. I've also increased the materials in the Engineering Department and assigned a station anchor. Finally, I've placed two MedicalBorgs in the Medical Department. These changes include several senior positions: Senior Researcher, Senior Engineer, Senior Physician, and Senior Officer. <details><summary><h1>Media</h1></summary> <p> ![Screenshot 2025-01-11 054623](https://github.com/user-attachments/assets/05b602ca-276c-4da9-883b-29e6502e7674) ![Screenshot 2025-01-11 052913](https://github.com/user-attachments/assets/5322c547-2555-41cf-9d44-b1149dd36fee) ![Screenshot 2025-01-11 052901](https://github.com/user-attachments/assets/e9c0e1e2-c8b9-46f4-898a-b74ffc64d8ec) ![Screenshot 2025-01-11 052702](https://github.com/user-attachments/assets/319c69c6-73e6-41fd-83e6-76a67b6cca8e) ![Screenshot 2025-01-11 051528](https://github.com/user-attachments/assets/31205880-65b9-428d-b14b-5a369390dfff) ![Screenshot 2025-01-11 051317](https://github.com/user-attachments/assets/89096722-f416-4952-93b5-b186eec1a6c8) ![Screenshot 2025-01-11 051309](https://github.com/user-attachments/assets/dd06c3aa-905c-4809-9c9d-7496948f0758) ![Screenshot 2025-01-11 051302](https://github.com/user-attachments/assets/31483e70-16c7-458a-a9b2-8de3143975df) ![Screenshot 2025-01-11 051253](https://github.com/user-attachments/assets/2da49edd-cdb2-4e5c-952d-2926cd52ab6e) ![Screenshot 2025-01-11 051244](https://github.com/user-attachments/assets/85df2add-1b45-4da6-a39c-65738f146325) ![Screenshot 2025-01-11 051234](https://github.com/user-attachments/assets/45fc37e9-0079-41a5-81ec-629debb9fac3) ![Screenshot 2025-01-11 032021](https://github.com/user-attachments/assets/f6e85fe5-2131-4211-8a3e-ebb900f9cc91) ![Screenshot 2025-01-11 031741](https://github.com/user-attachments/assets/cbec5afb-82fb-4303-a026-d80bba6be1ea) ![Screenshot 2025-01-11 031730](https://github.com/user-attachments/assets/5698b1b3-a2d9-4f25-8394-3103cd1d18ab) ![Screenshot 2025-01-11 054735](https://github.com/user-attachments/assets/89474011-f744-49ec-b9ee-ee3570266f57) </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 - add: Meta Station, added Station AI - add: Meta Station, added station anchor - add: Meta Station, added senior positions: Senior Researcher, Senior Engineer, Senior Physician, and Senior Officer. - tweak: Meta Station, tweaked Engineering Department
(cherry picked from commit 07dfefc4a29927aa74cfd5c7e75c6cb344d713f6) <!-- 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]? --> Allows hiding of departments by a bool. Tested on Nuclear14 as working. Pertinent code is around line 710 of humanoidprofileeditor.xaml.cs. This was the only file to conflict and the conflicts were overwritten with our code. --- # 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 --> - [ ] Task - [x] Completed Task --- <!-- 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> ![Example Media Embed](https://example.com/thisimageisntreal.png) </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 -->
# Description This fixes the bug where consoles that are whitelisted by AI can only be accessed by AI. It does so by cherrypicking space-wizards/space-station-14#32012 and space-wizards/space-station-14#31170 (which the first cherrypick requires) and now space-wizards/space-station-14#29094 Also fixes AI Speech/Languages issue DO NOT SQUASH THIS, IT'S THREE PRS.
# Description Gax Station already had a fully functional AI Satellite ready to go for us, all it needed was to have the spawner added (And two spare EMPTY Ai cores that it has room for), as well as a job slot! <details><summary><h1>Media</h1></summary> <p> ![image](https://github.com/user-attachments/assets/6d64492e-6f74-4f70-b2fb-838b662aeb36) </p> </details> # Changelog :cl: - add: Added Station AI to GaxStation
# Description Senior Physician wasn't included in the list of jobs that can't take CPR Training, but they already have CPR training, thus allowing players who don't know this to waste 4 points on a trait they get for free.
classic this also adds a respiratorcomponent to shadowkin
# Description This PR adds a Station AI to Radstation! Also cleans up some of the camera coverage. Since it's a mid to highpop map, this core is a bit better protected with the addition of blast doors to the windows that the AI can shut with a button. Also two cyborg spawners in the AI room, because I know for a fact we'll want them for any future malf/traitor AI implementation. :) <details><summary><h1>Media</h1></summary> <p> ![image](https://github.com/user-attachments/assets/8a530f9a-c8d4-4469-81e9-a2d1be15bba1) </p> </details> # Changelog :cl: - add: Station AI has been added to Radstation
porting over my cruise control code from frontier with some minor bug fixes. also had to fuck with the passive dampening system because the notsorobust toolbox has hurt its self in confusion Description. redid the port from frontier removing unnecessary complicated and confusing content. replaced hard coded values with cvars patched issues with the passive dampener system causing dampener states to reset added regions to cvar file to make it easier to look threw reverted text so that its more ship based, your not driving a car this is my original work so re-licensed my work under my name rather than frontier blanket who is licensed to use edit agpl3 :cl: - tweak: tweaked friction remover system - fix: fixed inertia dampening system resetting or effecting the wrong grid - remove: Removed overcomplicated alterations Co-authored-by: neuPanda <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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.
🆑 TCJ, sleepyyapril