forked from tgstation/tgstation
-
Notifications
You must be signed in to change notification settings - Fork 49
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
Merge upstream #240
Merged
Merged
Merge upstream #240
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
## About The Pull Request I was trying to fix a bug with ejecting from mechs as malf AI and the more I looked the worse it seemed to get? So I'm putting in this PR with the intent to refactor AI code to not be a Byzantine nightmare of new objects referencing each other incompletely or with buggy behavior. Finished PR for #82579 because I didn't want to clutter the comments with commits of me trying to fix shit with git restore and revert ## Why It's Good For The Game Fixes #81877 Fixes #82524 Mech dominating now just works off (and integrates with) similar code for APC shunting The cores left behind by AIs shunting or controlling mechs now properly reference the AI instead of only the other way around Some of these refactors slightly change how malf works; I think most of it was unintended behavior in the first place, let me know in review if not ## Changelog The code for AIs remoting out of their shell has been refactored. :cl: fix: Mech domination now properly integrates with shunting. fix: Combat upgraded AIs no longer get two buggy malf ability pickers if they also become malfunctioning refactor: Refactored most of the functionality around malf AI shunting, mech control /:cl: --------- Co-authored-by: MrMelbert <[email protected]>
Fixes #82890 In some cases an alert poll had no role, like the monkey helmet, and because of that it skipped the eligibility check ## Changelog :cl: fix: All alert polls ignore option works /:cl:
## About The Pull Request re-adds the check that they are actually being moved to a new z level in the update z level proc so it doesn't check null z level for cliented mobs and ai controllers. ## Why It's Good For The Game Saw this runtime on moth.fans and thought i should fix it. ## Changelog Nothing player-facing.
## About The Pull Request Turns out I fucked up the os walk stuff so this never actually did anything. (also a broken param but at this point does it even matter) More then that, it wasn't build to handle being called by something not in its folder. This fixed that, so the lint like actually works.
## About The Pull Request This PR adds tinyfans all arrivals shuttles ## Why It's Good For The Game Sometimes arrivals shuttle gets depressurized due the state of the arrivals wings and air going out of doors this means if a new player joins the game they are immediatly met with the suffocation indictator while a veteran might know his way around it a new player would not this gives them a little more breathing space in to whats supposed to be a non griefable area :cl: qol: Arrivals shuttle is now more player friendly /:cl:
## About The Pull Request This fixes the materials box (part of the debug box/admin outfit) dropping its contents everywhere. The issue is that these stacks will merge during `PopulateContents` as part of the parent call to `/obj/item/storage/Initialize` before `/obj/item/storage/box/material/Initialize` has a chance to change the size of the box. ## Why It's Good For The Game Fixes #82705 ## Changelog :cl: VexingRaven fix: The debug box no longer spills its contents everywhere /:cl:
## About The Pull Request Unarmed attacks, aka punching people, now is a list and supports having multiple verbs ## Why It's Good For The Game More flavor, RP, realism Lizard claws used to only "slash", now they can "slash" "scratch" "claw" Ethereals have "singe" in addition to "burn" Podmen can "lash" in addition to "slash" Heads can "chomp" in addition to "bite" ## Changelog :cl: code: Unarmed attacks (punches, etc.) now support multiple attack verbs instead of only one /:cl:
## About The Pull Request https://github.com/tgstation/tgstation/assets/137328283/979231c3-70cd-49dd-8d4d-2a8554adfbb3 ## Why It's Good For The Game This PR makes getting the “Ordeal of Sisyphus” extremely pointless by teleporting carried boulder and spessman back to the Lavaland. In my opinion, this feature is funny and suits the spirit of this achievement. ## Changelog :cl: add: Added a short scene when getting an Ordeal of Sisyphus achievement. /:cl:
## About The Pull Request ![image](https://github.com/tgstation/tgstation/assets/7483112/730a8d16-6489-4c7f-8c82-ae0d07598913) This gives the Netguardian Prime mob a little bit of darkvision. Reasoning: Some of these netrunning maps (like the alien hive) are very dark, and this is a robot. At the same time I added some emissives to its glowing eye and thrusters to make them appear to emit light, and I removed the bobbing animation we automate on flying mobs because its icon state has one already. ## Why It's Good For The Game If we're going to spawn a mob in the dark it should probably be able to see where it is. ## Changelog :cl: balance: Netguardian Prime can see in the dark. image: You can see Netguardian Prime in the dark. /:cl:
…ude coroners and heretic paths instead. (#82923) ## About The Pull Request Recently had the virologist tip show up before the round and people on OOC flared that "there's no such thing anymore!". Quite an easy thing to fix, so I thought I'll get to it, and added tips describing heretic paths and for coroners while I was at it. ## Why It's Good For The Game Virologists are no longer in the game, so tips for them are of no much use. More tips don't hurt, and Coroner and Heretic had none up to this point which seems bit like an overseight. ## Changelog :cl: fix: The start-of-the-round tips will no longer feature virologists, but will, however, start featuring heretics and coroners. /:cl: --------- Co-authored-by: John Willard <[email protected]> Co-authored-by: MrMelbert <[email protected]>
## About The Pull Request - Fixes #82921. Closets that are not linked by the closet anomaly station trait will be tainted blue, show sparks & do all that jazz once again. In other words they are not subtle - Closes #82353. Duplicate of the above. Sprays work since the above issue is fixed ## Changelog :cl: fix: Eigenstasium exposed & Anomaly station trait affected closets work again. Eigenstasium closets are tainted blue /:cl:
## About The Pull Request Spellbook entries' categories now use defines ## Why It's Good For The Game Prettier Less of a chance for misspelling a category Renaming a category is easier (for localized downstreams especially less strain)
larentoun
approved these changes
Apr 29, 2024
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.
About The Pull Request
Merge upstream
Why It's Good For The Game
New fixes and features