Merge upstream 09.11.24 part 2 #670
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
## About The Pull Request fix blade ascension not giving you the ring of blades ## Why It's Good For The Game Bugfix Closes tgstation#87344 Closes tgstation#85635 ## Changelog :cl: fix: fix blade ascension not giving you the ring of blades /:cl:
…ation#87706) ## About The Pull Request It turns out the "shapeshifted from spell" status ejects everything inside the shapeshifted mob when removed. That's been causing a little issue with the fishing rod from the profound_fisher component, which a few mobs have. This PR fixes just that. ## Why It's Good For The Game   ## Changelog :cl: fix: Fixed fishing rod duping with poly belts and shapeshift spells. spellcheck: Fixed a small typo when examining fishing rods. /:cl:
## About The Pull Request grabs the icon for the item correctly. also typescripts the interface because blessed type safety would've prevented it being missing in the first place. and clears some random deprecations ## Why It's Good For The Game pretty icons 👍 loading icons 👎  ## Changelog :cl: fix: the abductor console now correctly loads images of equipment /:cl: closes tgstation#87565
## About The Pull Request You can now add `unit test` anywhere in your PR title to specify if you are adding/modifying unit tests for your code. It's worth 6 GBP (It Always has and wasn't changed here) For when you want some extra GBP for your unit tests that sometimes go un-noticed by maintainer's when reviewing large changes. It will encourage people to write unit tests so they can get the extra points ## Changelog N/A /:cl:
## About The Pull Request Let's admins add/remove `TRAIT_EVIL` from mobs. ## Why It's Good For The Game Useful for debugging. ## Changelog :cl: admin: Admins can now add/remove TRAIT_EVIL from mobs. /:cl:
## About The Pull Request `// Remove these once we have Byond implementation.` Well guess what we have now? Altho sadly we still lack a native `isfinite`, so we still use a define for that. ## Why It's Good For The Game Native BYOND impls have better performance usually, due to them compiling down to instructions, avoiding proc overhead. ## Changelog No user-facing changes.
…ng doors (tgstation#87741) ## About The Pull Request I hate this timeline. What title says, makes jetpacks and wings allow you to bump into things you're moving into. ## Why It's Good For The Game This feels awful and requires you to stop pressing movement keys for a moment before resuming movement to get out of the "stuck" state ## Changelog :cl: fix: Fixed wings and jetpacks sometimes preventing you from opening doors /:cl:
## About The Pull Request This was meant to be just fixing the missing pixel... then it turned to redoing all the glasses in all the basic sprites so they'd match... then redoing sprites that were outdated... And THEN I realized that drinking glasses can be using the same auto-sprite system beakers have and oh man it's spiraling. As for the (hopefully) full list of changes: - Removes all `glass_[color]` icons. Any drink that fell under these will now use the fill_icon and their reagent color. As such, a lot of reagent colors have been tweaked for readability/realism/lemons don't have red juice what the hell man (Some colors shown are outdated. It is very annoying to tweak these. I don't know how to in-game, if I even can. Relaunching several times is painful.)  - Resprites the base `glass_empty`; now it is very visibly empty. The overlay being slightly transparent actually works pretty well with this. (Old / New)  - Full resprite of Curaçao (now it's actually its beautiful blue instead of gray)  - Minor resprites Beer/Green Beer/Iced Beer/Ale (Yes, Beer/Green Beer have little animated bubbles)   - Minor resprite of Monkey Energy (It's animated now too but otherwise about the same sprite)  - Minor resprites to Pina Olivida, Banana Juice, Lemon Juice, Carrot Juice - mostly just color tweaks so that they look more believable and the banana juice is less green - Fixes small nits in the sodas so that they are all consistent ## Why It's Good For The Game Sprite maintenance and (hopefully) improvements - we've got a lot of drinks in the Bars and the base foundation of that whole system deserves a bit of love as well ## Changelog :cl: image: redid most basic drinking glass sprites, and moved several drinks to use the same color system as beakers. Please bug report any incorrect colored drinks or juices! /:cl:
…87758) ## About The Pull Request Turns out using dream daemon isn't the only way to run unit tests. You can do it from VS code itself & can see the output of each test in the fancy chat window.  With the added advantage of using your debugger to step through each line of code this should be the preferred way so I've updated the read me file of the unit tests folder to specify that You can also check the runtimes log in your game to see the output of each unit test ## Changelog :cl: N/A /:cl:
## About The Pull Request mistakes were made ## Why It's Good For The Game god it's horrible, not only is it happening way too often because it's every glove, but also it doesn't fit any other glove other than insuls really, maybe nitriles but gosh just get rid of it for now, maybe later I will make a better sound for other gloves. ## Changelog :cl: grungussuss sound: only insulated,nitrile, enhanced retrieval, latex, boxing, improvised gripper gloves have an equip sound /:cl:
## About The Pull Request all hunting subtrees were sharing a singular cooldown. this makes it so each subtree has its own cooldown ## Why It's Good For The Game fixes hunting subtree cooldowns affecting other subtrees. ## Changelog :cl: /:cl:
…it (tgstation#87684) ## Why It's Good For The Game Clarity and consistency regarding DM's systems. Internally, `eye` is used for anything that controls the client's view.  How `eye` is used in DM is consistent with how we use the term, so I figured this would add clarity. Being named mob/camera also makes it unclear exactly what it's doing. The name implies that it would function similar to how mob/camera/ai_eye does, but most of the time it's only used as... an eye. My ulterior reason for this PR is that I want to clean up mob/camera/ai_eye and it's subtypes after this. ## Changelog :cl: server: mob/camera has been renamed to mob/eye, which may break downstreams /:cl: --------- Co-authored-by: Ghom <[email protected]>
github-actions
bot
added
Документация
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
🎸 Инструменты
Мы выдаем себя за реальное сообщество разработчиков.
Документация
Некоторые просто любят писать тонну текста, которую никто не будет читать.
🖌️ Спрайты
Вы заработали свою миска-рис и кошко-жена. Партия гордится вами!
🙏 Слияние с восходящим потоком
О великий восходящий поток, спасибо что приносишь нам свои дары контента и багфиксов
TGUI
Добавление или изменение существующего интерфейса на базе фреймворка TGUI
Документация
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
Вышли еще фиксики