Upstream update #4903
Merged
Upstream update #4903
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
* Fix advanced disease runtiming with invalid severity (#85465) ## About The Pull Request Fixes runtime in /mob/living/carbon/human/Life() proc when a mob has a disease that failed to have a severity string assigned. ## Why It's Good For The Game Runtime in life proc bad ## Changelog :cl: LT3 fix: Fixed players being incorrectly immune to certain virus severities /:cl: * Automatic changelog for PR #85465 [ci skip] --------- Co-authored-by: orange man <[email protected]> Co-authored-by: Bloop <[email protected]>
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> See title Closes #85542 ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> Pretty self-explanatory ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and its effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: fix: Fixed an infinite TC glitch dupe /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> Co-authored-by: Watermelon914 <[email protected]>
…s logging runtimes (#85502) ## About The Pull Request I was so focused on the ui code that I forgot that I didn't make the `supress_runtimes` var do anything. ## Why It's Good For The Game Things should do what they were made to do. ## Changelog :cl: admin: The "Suppress Runtime Logging" toggle in the lua editor actually does what it says /:cl:
## About The Pull Request I forgot some of the quirks regarding looking for external libraries on production tgs linux servers. This PR accounts for those. ## Why It's Good For The Game external libraries should work on both types of system ## Changelog :cl: fix: lua scripting now works on linux /:cl:
juvenile lobstrosities would constantly runtime as chasm crabs delete their ai after growth and replace it with a new one, meaning blackboard keys arent set correctly
## About The Pull Request Closes #85533 in 2564 dubstep isn't the hype it used to be ## Changelog :cl: fix: Elevator music no longer restarts when you take a step /:cl:
## About The Pull Request Remove narsie and ratvar plushies from loadout Originally this were added in this [pull request](tgstation/tgstation#83521) @MrMelbert was this intended or where you just adding all the plushies and didn't know of their rarity and special feature?Thanks for loadout btw. Also, should I write a migration script to update preferences? Loadouts are sanitized on load, so there will be no bugs, but If I have to, I will do it. ## Why It's Good For The Game Those plushies are meant to be rare and only are accessible in hacked chaplain wardrobe, received in mail by chaplain or spawn very infrequently by `/obj/effect/spawner/random/entertainment/plushie_delux` spawner. But this is not the main problem, the main one is, that everyone can have roundstart small bomb, because ratvar and narsie have special feature - they fight and explosion occurs when one of them wins. This is fun and interesting feature for sure, but not when this happens frequently. ## Changelog :cl: del: Remove narsie and ratvar plushies from loadout /:cl:
## About The Pull Request Doubletapping (potentially) expensive procs is bad, etc etc. Reverse of void storm fiasco. ## Changelog :cl: code: Removed multiple cases of unnecessary updatehealth /:cl:
## About The Pull Request Closes #85469 These should probably never be destroyed, not sure if comsigs are passed down to the new turf but players get confused either way if the turf is broken. ## Changelog :cl: fix: Bitrunning crate capture zones can no longer be destroyed /:cl:
## About The Pull Request refactors pet behaviors, such as collars and pet cultists into elements. also this is a first step to completely removing the pet subtype ## Why It's Good For The Game this means itll be alot easier for coders to make their tameable mobs able to wear pet collars without having to make them of the pet subtype, which i also plan to do ## Changelog :cl: refactor: refactors pet collars and cultist pets into elements /:cl:
…ycans (#85614) They lacked code to add smiles to their sprite despite having those textures, resulting in them only displaying on-mob. Also converted it to use item_interact so spraycans also can be used to paint the smileys.
…n-game (#85606) ## About The Pull Request Spans was shared between all players which caused everyone's hearing to get affected when someone ingested tinacusiate ## Changelog :cl: fix: Tinacusiate no longer changes hearing spans for every single person in-game /:cl:
…blank (#85576) ## About The Pull Request because of a mixup between min and max all gunpoint shots are currently point blank. Point blank code is a nightmare. guns were a mistake can we return to toolbox-only days thanks to Melbert for finding this ## Changelog :cl: MrMelbert, SmArtKar fix: Holding someone at gunpoint no longer makes all shots count as point blank /:cl:
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->
## About The Pull Request
While this runtime log is from MonkeStation, the associated code is the
same on /tg/, and thus the bugfix applies to both
```
[2024-08-02 22:29:45.372] runtime error: addtimer called with a callback assigned to a qdeleted object. In the future such timers will not be supported and may refuse to run or run with a 0 wait
- proc name: stack trace (/proc/_stack_trace)
- source file: code/__HELPERS/stack_trace.dm,4
- usr: Macie Carmichael (/mob/living/carbon/human)
- src: null
- usr.loc: the floor (102,80,2) (/turf/open/floor/iron/dark)
- call stack:
- stack trace("addtimer called with a callbac...", "code/controllers/subsystem/tim...", 621)
- addtimer(/datum/callback (/datum/callback), 12.45, 0, null, "code/modules/balloon_alert/bal...", 89)
- the rising blemish (/obj/effect/heretic_influence): balloon alert perform(Macie Carmichael (/mob/living/carbon/human), "influence drained")
- the rising blemish (/obj/effect/heretic_influence): balloon alert(Macie Carmichael (/mob/living/carbon/human), "influence drained")
```
## Why It's Good For The Game
bugfix, nya~
## Changelog
<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and its effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->
:cl:
fix: Fixed a runtime error after draining a heretic influence.
/:cl:
<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
…d/sci and security (#85468)
There's no SO bundled we need to build it for campbell
## About The Pull Request This removes the pickup/drop sounds from zipties, inherited from handcuffs. I elected to keep the `cuffsuccesssound` the same, as I feel like the sound is appropriate for conveying zipties being tightened off. ## Why It's Good For The Game Closes #85616, I hope. The issue report wasn't very descriptive so I'm not sure if I've missed anything here. ## Changelog :cl: Rhials sound: Zipties no longer make handcuff noises when picked up or dropped. /:cl:
…GBP] (#85538) ## About The Pull Request Added `replacetext` to clean it up before the comparison. ## Why It's Good For The Game Fix ## Changelog :cl: fix: Smartfridges properly dispense `\Improper` items /:cl:
* 'Cybersun Training Sim' DM arena * deco update * lol oops * make it prettier * One Lattice * floor prettier * last thing probably * embarrassing dont open * medkits actually are full * why did this have so many issues
added wirecutters to the electrician toolset implant, with appropriate flavourtext(this is my first commit! :D)
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.
ecea5447c941c940d78e92bd662e29d8b9b9910e
до
16c5200fd2d48984b3f6d3b332b25d0804b76b0b
Чейнджлоги включены